mirror of
https://github.com/python/cpython.git
synced 2025-07-24 03:35:53 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r46755 | brett.cannon | 2006-06-08 18:23:04 +0200 (Thu, 08 Jun 2006) | 4 lines Make binascii.hexlify() use s# for its arguments instead of t# to actually match its documentation stating it accepts any read-only buffer. ........ r46757 | brett.cannon | 2006-06-08 19:00:45 +0200 (Thu, 08 Jun 2006) | 8 lines Buffer objects would return the read or write buffer for a wrapped object when the char buffer was requested. Now it actually returns the char buffer if available or raises a TypeError if it isn't (as is raised for the other buffer types if they are not present but requested). Not a backport candidate since it does change semantics of the buffer object (although it could be argued this is enough of a bug to bother backporting). ........ r46760 | andrew.kuchling | 2006-06-09 03:10:17 +0200 (Fri, 09 Jun 2006) | 1 line Update functools section ........ r46762 | tim.peters | 2006-06-09 04:11:02 +0200 (Fri, 09 Jun 2006) | 6 lines Whitespace normalization. Since test_file is implicated in mysterious test failures when followed by test_optparse, if I had any brains I'd look at the checkin that last changed test_file ;-) ........ r46763 | tim.peters | 2006-06-09 05:09:42 +0200 (Fri, 09 Jun 2006) | 5 lines To boost morale :-), force test_optparse to run immediately after test_file until we can figure out how to fix it. (See python-dev; at the moment we don't even know which checkin caused the problem.) ........ r46764 | tim.peters | 2006-06-09 05:51:41 +0200 (Fri, 09 Jun 2006) | 6 lines AutoFileTests.tearDown(): Removed mysterious undocumented try/except. Remove TESTFN. Throughout: used open() instead of file(), and wrapped long lines. ........ r46765 | tim.peters | 2006-06-09 06:02:06 +0200 (Fri, 09 Jun 2006) | 8 lines testUnicodeOpen(): I have no idea why, but making this test clean up after itself appears to fix the test failures when test_optparse follows test_file. test_main(): Get rid of TESTFN no matter what. That's also enough to fix the mystery failures. Doesn't hurt to fix them twice :-) ........ r46766 | tim.peters | 2006-06-09 07:12:40 +0200 (Fri, 09 Jun 2006) | 6 lines Remove the temporary hack to force test_optparse to run immediately after test_file. At least 8 buildbot boxes passed since the underlying problem got fixed, and they all failed before the fix, so there's no point to this anymore. ........ r46767 | neal.norwitz | 2006-06-09 07:54:18 +0200 (Fri, 09 Jun 2006) | 1 line Fix grammar and reflow ........ r46769 | andrew.kuchling | 2006-06-09 12:22:35 +0200 (Fri, 09 Jun 2006) | 1 line Markup fix ........ r46773 | andrew.kuchling | 2006-06-09 15:15:57 +0200 (Fri, 09 Jun 2006) | 1 line [Bug #1472827] Make saxutils.XMLGenerator handle \r\n\t in attribute values by escaping them properly. 2.4 bugfix candidate. ........ r46778 | kristjan.jonsson | 2006-06-09 18:28:01 +0200 (Fri, 09 Jun 2006) | 2 lines Turn off warning about deprecated CRT functions on for VisualStudio .NET 2005. Make the definition #ARRAYSIZE conditional. VisualStudio .NET 2005 already has it defined using a better gimmick. ........ r46779 | phillip.eby | 2006-06-09 18:40:18 +0200 (Fri, 09 Jun 2006) | 2 lines Import wsgiref into the stdlib, as of the external version 0.1-r2181. ........ r46783 | andrew.kuchling | 2006-06-09 18:44:40 +0200 (Fri, 09 Jun 2006) | 1 line Add note about XMLGenerator bugfix ........ r46784 | andrew.kuchling | 2006-06-09 18:46:51 +0200 (Fri, 09 Jun 2006) | 1 line Add note about wsgiref ........ r46785 | brett.cannon | 2006-06-09 19:05:48 +0200 (Fri, 09 Jun 2006) | 2 lines Fix inconsistency in naming within an enum. ........ r46787 | tim.peters | 2006-06-09 19:47:00 +0200 (Fri, 09 Jun 2006) | 2 lines Whitespace normalization. ........ r46792 | georg.brandl | 2006-06-09 20:29:52 +0200 (Fri, 09 Jun 2006) | 3 lines Test file.__exit__. ........ r46794 | brett.cannon | 2006-06-09 20:40:46 +0200 (Fri, 09 Jun 2006) | 2 lines svn:ignore .pyc and .pyo files. ........ r46795 | georg.brandl | 2006-06-09 20:45:48 +0200 (Fri, 09 Jun 2006) | 3 lines RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. ........ r46798 | andrew.kuchling | 2006-06-09 21:03:16 +0200 (Fri, 09 Jun 2006) | 1 line Describe startswith()/endswiith() change; add reminder about wsgiref ........ r46799 | tim.peters | 2006-06-09 21:24:44 +0200 (Fri, 09 Jun 2006) | 11 lines Implementing a happy idea from Georg Brandl: make runtest() try to clean up files and directories the tests often leave behind by mistake. This is the first time in history I don't have a bogus "db_home" directory after running the tests ;-) Also worked on runtest's docstring, to say something about all the arguments, and to document the non-obvious return values. New functions runtest_inner() and cleanup_test_droppings() in support of the above. ........ r46800 | andrew.kuchling | 2006-06-09 21:43:25 +0200 (Fri, 09 Jun 2006) | 1 line Remove unused variable ........ r46801 | andrew.kuchling | 2006-06-09 21:56:05 +0200 (Fri, 09 Jun 2006) | 1 line Add some wsgiref text ........ r46803 | thomas.heller | 2006-06-09 21:59:11 +0200 (Fri, 09 Jun 2006) | 1 line set eol-style svn property ........ r46804 | thomas.heller | 2006-06-09 22:01:01 +0200 (Fri, 09 Jun 2006) | 1 line set eol-style svn property ........ r46805 | georg.brandl | 2006-06-09 22:43:48 +0200 (Fri, 09 Jun 2006) | 3 lines Make use of new str.startswith/endswith semantics. Occurences in email and compiler were ignored due to backwards compat requirements. ........ r46806 | brett.cannon | 2006-06-10 00:31:23 +0200 (Sat, 10 Jun 2006) | 4 lines An object with __call__ as an attribute, when called, will have that attribute checked for __call__ itself, and will continue to look until it finds an object without the attribute. This can lead to an infinite recursion. Closes bug #532646, again. Will be backported. ........ r46808 | brett.cannon | 2006-06-10 00:45:54 +0200 (Sat, 10 Jun 2006) | 2 lines Fix bug introduced in rev. 46806 by not having variable declaration at the top of a block. ........ r46812 | georg.brandl | 2006-06-10 08:40:50 +0200 (Sat, 10 Jun 2006) | 4 lines Apply perky's fix for #1503157: "/".join([u"", u""]) raising OverflowError. Also improve error message on overflow. ........ r46817 | martin.v.loewis | 2006-06-10 10:14:03 +0200 (Sat, 10 Jun 2006) | 2 lines Port cygwin kill_python changes from 2.4 branch. ........ r46818 | armin.rigo | 2006-06-10 12:57:40 +0200 (Sat, 10 Jun 2006) | 4 lines SF bug #1503294. PyThreadState_GET() complains if the tstate is NULL, but only in debug mode. ........ r46819 | martin.v.loewis | 2006-06-10 14:23:46 +0200 (Sat, 10 Jun 2006) | 4 lines Patch #1495999: Part two of Windows CE changes. - update header checks, using autoconf - provide dummies for getenv, environ, and GetVersion - adjust MSC_VER check in socketmodule.c ........ r46820 | skip.montanaro | 2006-06-10 16:09:11 +0200 (Sat, 10 Jun 2006) | 1 line document the class, not its initializer ........ r46821 | greg.ward | 2006-06-10 18:40:01 +0200 (Sat, 10 Jun 2006) | 4 lines Sync with Optik docs (rev 518): * restore "Extending optparse" section * document ALWAYS_TYPED_ACTIONS (SF #1449311) ........ r46824 | thomas.heller | 2006-06-10 21:51:46 +0200 (Sat, 10 Jun 2006) | 8 lines Upgrade to ctypes version 0.9.9.7. Summary of changes: - support for 'variable sized' data - support for anonymous structure/union fields - fix severe bug with certain arrays or structures containing more than 256 fields ........ r46825 | thomas.heller | 2006-06-10 21:55:36 +0200 (Sat, 10 Jun 2006) | 8 lines Upgrade to ctypes version 0.9.9.7. Summary of changes: - support for 'variable sized' data - support for anonymous structure/union fields - fix severe bug with certain arrays or structures containing more than 256 fields ........ r46826 | fred.drake | 2006-06-10 22:01:34 +0200 (Sat, 10 Jun 2006) | 4 lines SF patch #1303595: improve description of __builtins__, explaining how it varies between __main__ and other modules, and strongly suggest not touching it but using __builtin__ if absolutely necessary ........ r46827 | fred.drake | 2006-06-10 22:02:58 +0200 (Sat, 10 Jun 2006) | 1 line credit for SF patch #1303595 ........ r46831 | thomas.heller | 2006-06-10 22:29:34 +0200 (Sat, 10 Jun 2006) | 2 lines New docs for ctypes. ........ r46834 | thomas.heller | 2006-06-10 23:07:19 +0200 (Sat, 10 Jun 2006) | 1 line Fix a wrong printf format. ........ r46835 | thomas.heller | 2006-06-10 23:17:58 +0200 (Sat, 10 Jun 2006) | 1 line Fix the second occurrence of the problematic printf format. ........ r46837 | thomas.heller | 2006-06-10 23:56:03 +0200 (Sat, 10 Jun 2006) | 1 line Don't use C++ comment. ........ r46838 | thomas.heller | 2006-06-11 00:01:50 +0200 (Sun, 11 Jun 2006) | 1 line Handle failure of PyMem_Realloc. ........ r46839 | skip.montanaro | 2006-06-11 00:38:13 +0200 (Sun, 11 Jun 2006) | 2 lines Suppress warning on MacOSX about possible use before set of proc. ........ r46840 | tim.peters | 2006-06-11 00:51:45 +0200 (Sun, 11 Jun 2006) | 8 lines shuffle() doscstring: Removed warning about sequence length versus generator period. While this was a real weakness of the older WH generator for lists with just a few dozen elements, and so could potentially bite the naive ;-), the Twister should show excellent behavior up to at least 600 elements. Module docstring: reflowed some jarringly short lines. ........ r46844 | greg.ward | 2006-06-11 02:40:49 +0200 (Sun, 11 Jun 2006) | 4 lines Bug #1361643: fix textwrap.dedent() so it handles tabs appropriately, i.e. do *not* expand tabs, but treat them as whitespace that is not equivalent to spaces. Add a couple of test cases. Clarify docs. ........ r46850 | neal.norwitz | 2006-06-11 07:44:18 +0200 (Sun, 11 Jun 2006) | 5 lines Fix Coverity # 146. newDBSequenceObject would deref dbobj, so it can't be NULL. We know it's not NULL from the ParseTuple and DbObject_Check will verify it's not NULL. ........ r46851 | neal.norwitz | 2006-06-11 07:45:25 +0200 (Sun, 11 Jun 2006) | 4 lines Wrap some long lines Top/Bottom factor out some common expressions Add a XXX comment about widing offset. ........ r46852 | neal.norwitz | 2006-06-11 07:45:47 +0200 (Sun, 11 Jun 2006) | 1 line Add versionadded to doc ........ r46853 | neal.norwitz | 2006-06-11 07:47:14 +0200 (Sun, 11 Jun 2006) | 3 lines Update doc to make it agree with code. Bottom factor out some common code. ........ r46854 | neal.norwitz | 2006-06-11 07:48:14 +0200 (Sun, 11 Jun 2006) | 3 lines f_code can't be NULL based on Frame_New and other code that derefs it. So there doesn't seem to be much point to checking here. ........ r46855 | neal.norwitz | 2006-06-11 09:26:27 +0200 (Sun, 11 Jun 2006) | 1 line Fix errors found by pychecker ........ r46856 | neal.norwitz | 2006-06-11 09:26:50 +0200 (Sun, 11 Jun 2006) | 1 line warnings was imported at module scope, no need to import again ........ r46857 | neal.norwitz | 2006-06-11 09:27:56 +0200 (Sun, 11 Jun 2006) | 5 lines Fix errors found by pychecker. I think these changes are correct, but I'm not sure. Could someone who knows how this module works test it? It can at least start on the cmd line. ........ r46858 | neal.norwitz | 2006-06-11 10:35:14 +0200 (Sun, 11 Jun 2006) | 1 line Fix errors found by pychecker ........ r46859 | ronald.oussoren | 2006-06-11 16:33:36 +0200 (Sun, 11 Jun 2006) | 4 lines This patch improves the L&F of IDLE on OSX. The changes are conditionalized on being in an IDLE.app bundle on darwin. This does a slight reorganisation of the menus and adds support for file-open events. ........ r46860 | greg.ward | 2006-06-11 16:42:41 +0200 (Sun, 11 Jun 2006) | 1 line SF #1366250: optparse docs: fix inconsistency in variable name; minor tweaks. ........ r46861 | greg.ward | 2006-06-11 18:24:11 +0200 (Sun, 11 Jun 2006) | 3 lines Bug #1498146: fix optparse to handle Unicode strings in option help, description, and epilog. ........ r46862 | thomas.heller | 2006-06-11 19:04:22 +0200 (Sun, 11 Jun 2006) | 2 lines Release the GIL during COM method calls, to avoid deadlocks in Python coded COM objects. ........ r46863 | tim.peters | 2006-06-11 21:42:51 +0200 (Sun, 11 Jun 2006) | 2 lines Whitespace normalization. ........ r46864 | tim.peters | 2006-06-11 21:43:49 +0200 (Sun, 11 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46865 | ronald.oussoren | 2006-06-11 21:45:57 +0200 (Sun, 11 Jun 2006) | 2 lines Remove message about using make frameworkinstall, that's no longer necesssary ........ r46866 | ronald.oussoren | 2006-06-11 22:23:29 +0200 (Sun, 11 Jun 2006) | 2 lines Use configure to substitute the correct prefix instead of hardcoding ........ r46867 | ronald.oussoren | 2006-06-11 22:24:45 +0200 (Sun, 11 Jun 2006) | 4 lines - Change fixapplepython23.py to ensure that it will run with /usr/bin/python on intel macs. - Fix some minor problems in the installer for OSX ........ r46868 | neal.norwitz | 2006-06-11 22:25:56 +0200 (Sun, 11 Jun 2006) | 5 lines Try to fix several networking tests. The problem is that if hosts have a search path setup, some of these hosts resolve to the wrong address. By appending a period to the hostname, the hostname should only resolve to what we want it to resolve to. Hopefully this doesn't break different bots. ........ r46869 | neal.norwitz | 2006-06-11 22:42:02 +0200 (Sun, 11 Jun 2006) | 7 lines Try to fix another networking test. The problem is that if hosts have a search path setup, some of these hosts resolve to the wrong address. By appending a period to the hostname, the hostname should only resolve to what we want it to resolve to. Hopefully this doesn't break different bots. Also add more info to failure message to aid debugging test failure. ........ r46870 | neal.norwitz | 2006-06-11 22:46:46 +0200 (Sun, 11 Jun 2006) | 4 lines Fix test on PPC64 buildbot. It raised an IOError (really an URLError which derives from an IOError). That seems valid. Env Error includes both OSError and IOError, so this seems like a reasonable fix. ........ r46871 | tim.peters | 2006-06-11 22:52:59 +0200 (Sun, 11 Jun 2006) | 10 lines compare_generic_iter(): Fixed the failure of test_wsgiref's testFileWrapper when running with -O. test_simple_validation_error still fails under -O. That appears to be because wsgiref's validate.py uses `assert` statements all over the place to check arguments for sanity. That should all be changed (it's not a logical error in the software if a user passes bogus arguments, so this isn't a reasonable use for `assert` -- checking external preconditions should generally raise ValueError or TypeError instead, as appropriate). ........ r46872 | neal.norwitz | 2006-06-11 23:38:38 +0200 (Sun, 11 Jun 2006) | 1 line Get test to pass on S/390. Shout if you think this change is incorrect. ........ r46873 | neal.norwitz | 2006-06-12 04:05:55 +0200 (Mon, 12 Jun 2006) | 1 line Cleanup Py_ssize_t a little (get rid of second #ifdef) ........ r46874 | neal.norwitz | 2006-06-12 04:06:17 +0200 (Mon, 12 Jun 2006) | 1 line Fix some Py_ssize_t issues ........ r46875 | neal.norwitz | 2006-06-12 04:06:42 +0200 (Mon, 12 Jun 2006) | 1 line Fix some Py_ssize_t issues ........ r46876 | neal.norwitz | 2006-06-12 04:07:24 +0200 (Mon, 12 Jun 2006) | 2 lines Cleanup: Remove import of types to get StringTypes, we can just use basestring. ........ r46877 | neal.norwitz | 2006-06-12 04:07:57 +0200 (Mon, 12 Jun 2006) | 1 line Don't truncate if size_t is bigger than uint ........ r46878 | neal.norwitz | 2006-06-12 04:08:41 +0200 (Mon, 12 Jun 2006) | 1 line Don't leak the list object if there's an error allocating the item storage. Backport candidate ........ r46879 | neal.norwitz | 2006-06-12 04:09:03 +0200 (Mon, 12 Jun 2006) | 1 line Fix typo. Backport if anyone cares. :-) ........ r46880 | neal.norwitz | 2006-06-12 04:09:34 +0200 (Mon, 12 Jun 2006) | 1 line Fix indentation of case and a Py_ssize_t issue. ........ r46881 | neal.norwitz | 2006-06-12 04:11:18 +0200 (Mon, 12 Jun 2006) | 3 lines Get rid of f_restricted too. Doc the other 4 ints that were already removed at the NeedForSpeed sprint. ........ r46882 | neal.norwitz | 2006-06-12 04:13:21 +0200 (Mon, 12 Jun 2006) | 1 line Fix the socket tests so they can be run concurrently. Backport candidate ........ r46883 | neal.norwitz | 2006-06-12 04:16:10 +0200 (Mon, 12 Jun 2006) | 1 line i and j are initialized below when used. No need to do it twice ........ r46884 | neal.norwitz | 2006-06-12 05:05:03 +0200 (Mon, 12 Jun 2006) | 1 line Remove unused import ........ r46885 | neal.norwitz | 2006-06-12 05:05:40 +0200 (Mon, 12 Jun 2006) | 1 line Impl ssize_t ........ r46886 | neal.norwitz | 2006-06-12 05:33:09 +0200 (Mon, 12 Jun 2006) | 6 lines Patch #1503046, Conditional compilation of zlib.(de)compressobj.copy copy is only in newer versions of zlib. This should allow zlibmodule to work with older versions like the Tru64 buildbot. ........ r46887 | phillip.eby | 2006-06-12 06:04:32 +0200 (Mon, 12 Jun 2006) | 2 lines Sync w/external release 0.1.2. Please see PEP 360 before making changes to external packages. ........ r46888 | martin.v.loewis | 2006-06-12 06:26:31 +0200 (Mon, 12 Jun 2006) | 2 lines Get rid of function pointer cast. ........ r46889 | thomas.heller | 2006-06-12 08:05:57 +0200 (Mon, 12 Jun 2006) | 3 lines I don't know how that happend, but the entire file contents was duplicated. Thanks to Simon Percivall for the heads up. ........ r46890 | nick.coghlan | 2006-06-12 10:19:37 +0200 (Mon, 12 Jun 2006) | 1 line Fix site module docstring to match the code ........ r46891 | nick.coghlan | 2006-06-12 10:23:02 +0200 (Mon, 12 Jun 2006) | 1 line Fix site module docstring to match the code for Mac OSX, too ........ r46892 | nick.coghlan | 2006-06-12 10:27:13 +0200 (Mon, 12 Jun 2006) | 1 line The site module documentation also described the Windows behaviour incorrectly. ........ r46893 | nick.coghlan | 2006-06-12 12:17:11 +0200 (Mon, 12 Jun 2006) | 1 line Make the -m switch conform to the documentation of sys.path by behaving like the -c switch ........ r46894 | kristjan.jonsson | 2006-06-12 17:45:12 +0200 (Mon, 12 Jun 2006) | 2 lines Fix the CRT argument error handling for VisualStudio .NET 2005. Install a CRT error handler and disable the assertion for debug builds. This causes CRT to set errno to EINVAL. This update fixes crash cases in the test suite where the default CRT error handler would cause process exit. ........ r46899 | thomas.heller | 2006-06-12 22:56:48 +0200 (Mon, 12 Jun 2006) | 1 line Add pep-291 compatibility markers. ........ r46901 | ka-ping.yee | 2006-06-13 01:47:52 +0200 (Tue, 13 Jun 2006) | 5 lines Add the uuid module. This module has been tested so far on Windows XP (Python 2.4 and 2.5a2), Mac OS X (Python 2.3, 2.4, and 2.5a2), and Linux (Python 2.4 and 2.5a2). ........ r46902 | tim.peters | 2006-06-13 02:30:01 +0200 (Tue, 13 Jun 2006) | 2 lines Whitespace normalization. ........ r46903 | tim.peters | 2006-06-13 02:30:50 +0200 (Tue, 13 Jun 2006) | 2 lines Added missing svn:eol-style property to text files. ........ r46905 | tim.peters | 2006-06-13 05:30:07 +0200 (Tue, 13 Jun 2006) | 5 lines get_matching_blocks(): rewrote code & comments so they match; added more comments about why it's this way at all; and removed what looked like needless expense (sorting (i, j, k) triples directly should give exactly the same order as sorting (i, (i, j, k)) pairs). ........ r46906 | neal.norwitz | 2006-06-13 06:08:53 +0200 (Tue, 13 Jun 2006) | 1 line Don't fail if another process is listening on our port. ........ r46908 | neal.norwitz | 2006-06-13 10:28:19 +0200 (Tue, 13 Jun 2006) | 2 lines Initialize the type object so pychecker can't crash the interpreter. ........ r46909 | neal.norwitz | 2006-06-13 10:41:06 +0200 (Tue, 13 Jun 2006) | 1 line Verify the crash due to EncodingMap not initialized does not return ........ r46910 | thomas.heller | 2006-06-13 10:56:14 +0200 (Tue, 13 Jun 2006) | 3 lines Add some windows datatypes that were missing from this file, and add the aliases defined in windows header files for the structures. ........ r46911 | thomas.heller | 2006-06-13 11:40:14 +0200 (Tue, 13 Jun 2006) | 3 lines Add back WCHAR, UINT, DOUBLE, _LARGE_INTEGER, _ULARGE_INTEGER. VARIANT_BOOL is a special _ctypes data type, not c_short. ........ r46912 | ronald.oussoren | 2006-06-13 13:19:56 +0200 (Tue, 13 Jun 2006) | 4 lines Linecache contains support for PEP302 loaders, but fails to deal with loaders that return None to indicate that the module is valid but no source is available. This patch fixes that. ........ r46913 | andrew.kuchling | 2006-06-13 13:57:04 +0200 (Tue, 13 Jun 2006) | 1 line Mention uuid module ........ r46915 | walter.doerwald | 2006-06-13 14:02:12 +0200 (Tue, 13 Jun 2006) | 2 lines Fix passing errors to the encoder and decoder functions. ........ r46917 | walter.doerwald | 2006-06-13 14:04:43 +0200 (Tue, 13 Jun 2006) | 3 lines errors is an attribute in the incremental decoder not an argument. ........ r46919 | andrew.macintyre | 2006-06-13 17:04:24 +0200 (Tue, 13 Jun 2006) | 11 lines Patch #1454481: Make thread stack size runtime tunable. Heavily revised, comprising revisions: 46640 - original trunk revision (backed out in r46655) 46647 - markup fix (backed out in r46655) 46692:46918 merged from branch aimacintyre-sf1454481 branch tested on buildbots (Windows buildbots had problems not related to these changes). ........ r46920 | brett.cannon | 2006-06-13 18:06:55 +0200 (Tue, 13 Jun 2006) | 2 lines Remove unused variable. ........ r46921 | andrew.kuchling | 2006-06-13 18:41:41 +0200 (Tue, 13 Jun 2006) | 1 line Add ability to set stack size ........ r46923 | marc-andre.lemburg | 2006-06-13 19:04:26 +0200 (Tue, 13 Jun 2006) | 2 lines Update pybench to version 2.0. ........ r46924 | marc-andre.lemburg | 2006-06-13 19:07:14 +0200 (Tue, 13 Jun 2006) | 2 lines Revert wrong svn copy. ........ r46925 | andrew.macintyre | 2006-06-13 19:14:36 +0200 (Tue, 13 Jun 2006) | 2 lines fix exception usage ........ r46927 | tim.peters | 2006-06-13 20:37:07 +0200 (Tue, 13 Jun 2006) | 2 lines Whitespace normalization. ........ r46928 | marc-andre.lemburg | 2006-06-13 20:56:56 +0200 (Tue, 13 Jun 2006) | 9 lines Updated to pybench 2.0. See svn.python.org/external/pybench-2.0 for the original import of that version. Note that platform.py was not copied over from pybench-2.0 since it is already part of Python 2.5. ........ r46929 | andrew.macintyre | 2006-06-13 21:02:35 +0200 (Tue, 13 Jun 2006) | 5 lines Increase the small thread stack size to get the test to pass reliably on the one buildbot that insists on more than 32kB of thread stack. ........ r46930 | marc-andre.lemburg | 2006-06-13 21:20:07 +0200 (Tue, 13 Jun 2006) | 2 lines Whitespace normalization. ........ r46931 | thomas.heller | 2006-06-13 22:18:43 +0200 (Tue, 13 Jun 2006) | 2 lines More docs for ctypes. ........ r46932 | brett.cannon | 2006-06-13 23:34:24 +0200 (Tue, 13 Jun 2006) | 2 lines Ignore .pyc and .pyo files in Pybench. ........ r46933 | brett.cannon | 2006-06-13 23:46:41 +0200 (Tue, 13 Jun 2006) | 7 lines If a classic class defined a __coerce__() method that just returned its two arguments in reverse, the interpreter would infinitely recourse trying to get a coercion that worked. So put in a recursion check after a coercion is made and the next call to attempt to use the coerced values. Fixes bug #992017 and closes crashers/coerce.py . ........ r46936 | gerhard.haering | 2006-06-14 00:24:47 +0200 (Wed, 14 Jun 2006) | 3 lines Merged changes from external pysqlite 2.3.0 release. Documentation updates will follow in a few hours at the latest. Then we should be ready for beta1. ........ r46937 | brett.cannon | 2006-06-14 00:26:13 +0200 (Wed, 14 Jun 2006) | 2 lines Missed test for rev. 46933; infinite recursion from __coerce__() returning its arguments reversed. ........ r46938 | gerhard.haering | 2006-06-14 00:53:48 +0200 (Wed, 14 Jun 2006) | 2 lines Updated documentation for pysqlite 2.3.0 API. ........ r46939 | tim.peters | 2006-06-14 06:09:25 +0200 (Wed, 14 Jun 2006) | 10 lines SequenceMatcher.get_matching_blocks(): This now guarantees that adjacent triples in the result list describe non-adjacent matching blocks. That's _nice_ to have, and Guido said he wanted it. Not a bugfix candidate: Guido or not ;-), this changes visible endcase semantics (note that some tests had to change), and nothing about this was documented before. Since it was working as designed, and behavior was consistent with the docs, it wasn't "a bug". ........ r46940 | tim.peters | 2006-06-14 06:13:00 +0200 (Wed, 14 Jun 2006) | 2 lines Repaired typo in new comment. ........ r46941 | tim.peters | 2006-06-14 06:15:27 +0200 (Wed, 14 Jun 2006) | 2 lines Whitespace normalization. ........ r46942 | fred.drake | 2006-06-14 06:25:02 +0200 (Wed, 14 Jun 2006) | 3 lines - make some disabled tests run what they intend when enabled - remove some over-zealous triple-quoting ........ r46943 | fred.drake | 2006-06-14 07:04:47 +0200 (Wed, 14 Jun 2006) | 3 lines add tests for two cases that are handled correctly in the current code, but that SF patch 1504676 as written mis-handles ........ r46944 | fred.drake | 2006-06-14 07:15:51 +0200 (Wed, 14 Jun 2006) | 1 line explain an XXX in more detail ........ r46945 | martin.v.loewis | 2006-06-14 07:21:04 +0200 (Wed, 14 Jun 2006) | 1 line Patch #1455898: Incremental mode for "mbcs" codec. ........ r46946 | georg.brandl | 2006-06-14 08:08:31 +0200 (Wed, 14 Jun 2006) | 3 lines Bug #1339007: Shelf objects now don't raise an exception in their __del__ method when initialization failed. ........ r46948 | thomas.heller | 2006-06-14 08:18:15 +0200 (Wed, 14 Jun 2006) | 1 line Fix docstring. ........ r46949 | georg.brandl | 2006-06-14 08:29:07 +0200 (Wed, 14 Jun 2006) | 2 lines Bug #1501122: mention __gt__ &co in description of comparison order. ........ r46951 | thomas.heller | 2006-06-14 09:08:38 +0200 (Wed, 14 Jun 2006) | 1 line Write more docs. ........ r46952 | georg.brandl | 2006-06-14 10:31:39 +0200 (Wed, 14 Jun 2006) | 3 lines Bug #1153163: describe __add__ vs __radd__ behavior when adding objects of same type/of subclasses of the other. ........ r46954 | georg.brandl | 2006-06-14 10:42:11 +0200 (Wed, 14 Jun 2006) | 3 lines Bug #1202018: add some common mime.types locations. ........ r46955 | georg.brandl | 2006-06-14 10:50:03 +0200 (Wed, 14 Jun 2006) | 3 lines Bug #1117556: SimpleHTTPServer now tries to find and use the system's mime.types file for determining MIME types. ........ r46957 | thomas.heller | 2006-06-14 11:09:08 +0200 (Wed, 14 Jun 2006) | 1 line Document paramflags. ........ r46958 | thomas.heller | 2006-06-14 11:20:11 +0200 (Wed, 14 Jun 2006) | 1 line Add an __all__ list, since this module does 'from ctypes import *'. ........ r46959 | andrew.kuchling | 2006-06-14 15:59:15 +0200 (Wed, 14 Jun 2006) | 1 line Add item ........ r46961 | georg.brandl | 2006-06-14 18:46:43 +0200 (Wed, 14 Jun 2006) | 3 lines Bug #805015: doc error in PyUnicode_FromEncodedObject. ........ r46962 | gerhard.haering | 2006-06-15 00:28:37 +0200 (Thu, 15 Jun 2006) | 10 lines - Added version checks in C code to make sure we don't trigger bugs in older SQLite versions. - Added version checks in test suite so that we don't execute tests that we know will fail with older (buggy) SQLite versions. Now, all tests should run against all SQLite versions from 3.0.8 until 3.3.6 (latest one now). The sqlite3 module can be built against all these SQLite versions and the sqlite3 module does its best to not trigger bugs in SQLite, but using SQLite 3.3.3 or later is recommended. ........ r46963 | tim.peters | 2006-06-15 00:38:13 +0200 (Thu, 15 Jun 2006) | 2 lines Whitespace normalization. ........ r46964 | neal.norwitz | 2006-06-15 06:54:29 +0200 (Thu, 15 Jun 2006) | 9 lines Speculative checkin (requires approval of Gerhard Haering) This backs out the test changes in 46962 which prevented crashes by not running the tests via a version check. All the version checks added in that rev were removed from the tests. Code was added to the error handler in connection.c that seems to work with older versions of sqlite including 3.1.3. ........ r46965 | neal.norwitz | 2006-06-15 07:55:49 +0200 (Thu, 15 Jun 2006) | 1 line Try to narrow window of failure on slow/busy boxes (ppc64 buildbot) ........ r46966 | martin.v.loewis | 2006-06-15 08:45:05 +0200 (Thu, 15 Jun 2006) | 2 lines Make import/lookup of mbcs fail on non-Windows systems. ........ r46967 | ronald.oussoren | 2006-06-15 10:14:18 +0200 (Thu, 15 Jun 2006) | 2 lines Patch #1446489 (zipfile: support for ZIP64) ........ r46968 | neal.norwitz | 2006-06-15 10:16:44 +0200 (Thu, 15 Jun 2006) | 6 lines Re-revert this change. Install the version check and don't run the test until Gerhard has time to fully debug the issue. This affects versions before 3.2.1 (possibly only versions earlier than 3.1.3). Based on discussion on python-checkins. ........ r46969 | gregory.p.smith | 2006-06-15 10:52:32 +0200 (Thu, 15 Jun 2006) | 6 lines - bsddb: multithreaded DB access using the simple bsddb module interface now works reliably. It has been updated to use automatic BerkeleyDB deadlock detection and the bsddb.dbutils.DeadlockWrap wrapper to retry database calls that would previously deadlock. [SF python bug #775414] ........ r46970 | gregory.p.smith | 2006-06-15 11:23:52 +0200 (Thu, 15 Jun 2006) | 2 lines minor documentation cleanup. mention the bsddb.db interface explicitly by name. ........ r46971 | neal.norwitz | 2006-06-15 11:57:03 +0200 (Thu, 15 Jun 2006) | 5 lines Steal the trick from test_compiler to print out a slow msg. This will hopefully get the buildbots to pass. Not sure this test will be feasible or even work. But everything is red now, so it can't get much worse. ........ r46972 | neal.norwitz | 2006-06-15 12:24:49 +0200 (Thu, 15 Jun 2006) | 1 line Print some more info to get an idea of how much longer the test will last ........ r46981 | tim.peters | 2006-06-15 20:04:40 +0200 (Thu, 15 Jun 2006) | 6 lines Try to reduce the extreme peak memory and disk-space use of this test. It probably still requires more disk space than most buildbots have, and in any case is still so intrusive that if we don't find another way to test this I'm taking my buildbot offline permanently ;-) ........ r46982 | tim.peters | 2006-06-15 20:06:29 +0200 (Thu, 15 Jun 2006) | 2 lines Whitespace normalization. ........ r46983 | tim.peters | 2006-06-15 20:07:28 +0200 (Thu, 15 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46984 | tim.peters | 2006-06-15 20:38:19 +0200 (Thu, 15 Jun 2006) | 2 lines Oops -- I introduced an off-by-6436159488 error. ........ r46990 | neal.norwitz | 2006-06-16 06:30:34 +0200 (Fri, 16 Jun 2006) | 1 line Disable this test until we can determine what to do about it ........ r46991 | neal.norwitz | 2006-06-16 06:31:06 +0200 (Fri, 16 Jun 2006) | 1 line Param name is dir, not directory. Update docstring. Backport candidate ........ r46992 | neal.norwitz | 2006-06-16 06:31:28 +0200 (Fri, 16 Jun 2006) | 1 line Add missing period in comment. ........ r46993 | neal.norwitz | 2006-06-16 06:32:43 +0200 (Fri, 16 Jun 2006) | 1 line Fix whitespace, there are memory leaks in this module. ........ r46995 | fred.drake | 2006-06-17 01:45:06 +0200 (Sat, 17 Jun 2006) | 3 lines SF patch 1504676: Make sgmllib char and entity references pluggable (implementation/tests contributed by Sam Ruby) ........ r46996 | fred.drake | 2006-06-17 03:07:54 +0200 (Sat, 17 Jun 2006) | 1 line fix change that broke the htmllib tests ........ r46998 | martin.v.loewis | 2006-06-17 11:15:14 +0200 (Sat, 17 Jun 2006) | 3 lines Patch #763580: Add name and value arguments to Tkinter variable classes. ........ r46999 | martin.v.loewis | 2006-06-17 11:20:41 +0200 (Sat, 17 Jun 2006) | 2 lines Patch #1096231: Add default argument to wm_iconbitmap. ........ r47000 | martin.v.loewis | 2006-06-17 11:25:15 +0200 (Sat, 17 Jun 2006) | 2 lines Patch #1494750: Destroy master after deleting children. ........ r47003 | george.yoshida | 2006-06-17 18:31:52 +0200 (Sat, 17 Jun 2006) | 2 lines markup fix ........ r47005 | george.yoshida | 2006-06-17 18:39:13 +0200 (Sat, 17 Jun 2006) | 4 lines Update url. Old url returned status code:301 Moved permanently. ........ r47007 | martin.v.loewis | 2006-06-17 20:44:27 +0200 (Sat, 17 Jun 2006) | 2 lines Patch #812986: Update the canvas even if not tracing. ........ r47008 | martin.v.loewis | 2006-06-17 21:03:26 +0200 (Sat, 17 Jun 2006) | 2 lines Patch #815924: Restore ability to pass type= and icon= ........ r47009 | neal.norwitz | 2006-06-18 00:37:45 +0200 (Sun, 18 Jun 2006) | 1 line Fix typo in docstring ........ r47010 | neal.norwitz | 2006-06-18 00:38:15 +0200 (Sun, 18 Jun 2006) | 1 line Fix memory leak reported by valgrind while running test_subprocess ........ r47011 | fred.drake | 2006-06-18 04:57:35 +0200 (Sun, 18 Jun 2006) | 1 line remove unnecessary markup ........ r47013 | neal.norwitz | 2006-06-18 21:35:01 +0200 (Sun, 18 Jun 2006) | 7 lines Prevent spurious leaks when running regrtest.py -R. There may be more issues that crop up from time to time, but this change seems to have been pretty stable (no spurious warnings) for about a week. Other modules which use threads may require similar use of threading_setup/threading_cleanup from test_support. ........ r47014 | neal.norwitz | 2006-06-18 21:37:40 +0200 (Sun, 18 Jun 2006) | 9 lines The hppa ubuntu box sometimes hangs forever in these tests. My guess is that the wait is failing for some reason. Use WNOHANG, so we won't wait until the buildbot kills the test suite. I haven't been able to reproduce the failure, so I'm not sure if this will help or not. Hopefully, this change will cause the test to fail, rather than hang. That will be better since we will get the rest of the test results. It may also help us debug the real problem. ........ r47015 | neal.norwitz | 2006-06-18 22:10:24 +0200 (Sun, 18 Jun 2006) | 1 line Revert 47014 until it is more robust ........ r47016 | thomas.heller | 2006-06-18 23:27:04 +0200 (Sun, 18 Jun 2006) | 6 lines Fix typos. Fix doctest example. Mention in the tutorial that 'errcheck' is explained in the ref manual. Use better wording in some places. Remoce code examples that shouldn't be in the tutorial. Remove some XXX notices. ........ r47017 | georg.brandl | 2006-06-19 00:17:29 +0200 (Mon, 19 Jun 2006) | 3 lines Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c. ........ r47018 | neal.norwitz | 2006-06-19 07:40:44 +0200 (Mon, 19 Jun 2006) | 1 line Use Py_ssize_t ........ r47019 | georg.brandl | 2006-06-19 08:35:54 +0200 (Mon, 19 Jun 2006) | 3 lines Add news entry about error msg improvement. ........ r47020 | thomas.heller | 2006-06-19 09:07:49 +0200 (Mon, 19 Jun 2006) | 2 lines Try to repair the failing test on the OpenBSD buildbot. Trial and error... ........ r47021 | tim.peters | 2006-06-19 09:45:16 +0200 (Mon, 19 Jun 2006) | 2 lines Whitespace normalization. ........ r47022 | walter.doerwald | 2006-06-19 10:07:50 +0200 (Mon, 19 Jun 2006) | 4 lines Patch #1506645: add Python wrappers for the curses functions is_term_resized, resize_term and resizeterm. This uses three separate configure checks (one for each function). ........ r47023 | walter.doerwald | 2006-06-19 10:14:09 +0200 (Mon, 19 Jun 2006) | 2 lines Make check order match in configure and configure.in. ........ r47024 | tim.peters | 2006-06-19 10:14:28 +0200 (Mon, 19 Jun 2006) | 3 lines Repair KeyError when running test_threaded_import under -R, as reported by Neal on python-dev. ........ r47025 | thomas.heller | 2006-06-19 10:32:46 +0200 (Mon, 19 Jun 2006) | 3 lines Next try to fix the OpenBSD buildbot tests: Use ctypes.util.find_library to locate the C runtime library on platforms where is returns useful results. ........ r47026 | tim.peters | 2006-06-19 11:09:44 +0200 (Mon, 19 Jun 2006) | 13 lines TestHelp.make_parser(): This was making a permanent change to os.environ (setting envar COLUMNS), which at least caused test_float_default() to fail if the tests were run more than once. This repairs the test_optparse -R failures Neal reported on python-dev. It also explains some seemingly bizarre test_optparse failures we saw a couple weeks ago on the buildbots, when test_optparse failed due to test_file failing to clean up after itself, and then test_optparse failed in an entirely different way when regrtest's -w option ran test_optparse a second time. It's now obvious that make_parser() permanently changing os.environ was responsible for the second half of that. ........ r47027 | anthony.baxter | 2006-06-19 14:04:15 +0200 (Mon, 19 Jun 2006) | 2 lines Preparing for 2.5b1. ........ r47029 | fred.drake | 2006-06-19 19:31:16 +0200 (Mon, 19 Jun 2006) | 1 line remove non-working document formats from edist ........ r47030 | gerhard.haering | 2006-06-19 23:17:35 +0200 (Mon, 19 Jun 2006) | 5 lines Fixed a memory leak that was introduced with incorrect usage of the Python weak reference API in pysqlite 2.2.1. Bumbed pysqlite version number to upcoming pysqlite 2.3.1 release. ........ r47032 | ka-ping.yee | 2006-06-20 00:49:36 +0200 (Tue, 20 Jun 2006) | 2 lines Remove Python 2.3 compatibility comment. ........ r47033 | trent.mick | 2006-06-20 01:21:25 +0200 (Tue, 20 Jun 2006) | 2 lines Upgrade pyexpat to expat 2.0.0 (http://python.org/sf/1462338). ........ r47034 | trent.mick | 2006-06-20 01:57:41 +0200 (Tue, 20 Jun 2006) | 3 lines [ 1295808 ] expat symbols should be namespaced in pyexpat (http://python.org/sf/1295808) ........ r47039 | andrew.kuchling | 2006-06-20 13:52:16 +0200 (Tue, 20 Jun 2006) | 1 line Uncomment wsgiref section ........ r47040 | andrew.kuchling | 2006-06-20 14:15:09 +0200 (Tue, 20 Jun 2006) | 1 line Add four library items ........ r47041 | andrew.kuchling | 2006-06-20 14:19:54 +0200 (Tue, 20 Jun 2006) | 1 line Terminology and typography fixes ........ r47042 | andrew.kuchling | 2006-06-20 15:05:12 +0200 (Tue, 20 Jun 2006) | 1 line Add introductory paragraphs summarizing the release; minor edits ........ r47043 | andrew.kuchling | 2006-06-20 15:11:29 +0200 (Tue, 20 Jun 2006) | 1 line Minor edits and rearrangements; markup fix ........ r47044 | andrew.kuchling | 2006-06-20 15:20:30 +0200 (Tue, 20 Jun 2006) | 1 line [Bug #1504456] Mention xml -> xmlcore change ........ r47047 | brett.cannon | 2006-06-20 19:30:26 +0200 (Tue, 20 Jun 2006) | 2 lines Raise TestSkipped when the test socket connection is refused. ........ r47049 | brett.cannon | 2006-06-20 21:20:17 +0200 (Tue, 20 Jun 2006) | 2 lines Fix typo of exception name. ........ r47053 | brett.cannon | 2006-06-21 18:57:57 +0200 (Wed, 21 Jun 2006) | 5 lines At the C level, tuple arguments are passed in directly to the exception constructor, meaning it is treated as *args, not as a single argument. This means using the 'message' attribute won't work (until Py3K comes around), and so one must grab from 'arg' to get the error number. ........ r47054 | andrew.kuchling | 2006-06-21 19:10:18 +0200 (Wed, 21 Jun 2006) | 1 line Link to LibRef module documentation ........ r47055 | andrew.kuchling | 2006-06-21 19:17:10 +0200 (Wed, 21 Jun 2006) | 1 line Note some of Barry's work ........ r47056 | andrew.kuchling | 2006-06-21 19:17:28 +0200 (Wed, 21 Jun 2006) | 1 line Bump version ........ r47057 | georg.brandl | 2006-06-21 19:45:17 +0200 (Wed, 21 Jun 2006) | 3 lines fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally ........ r47058 | georg.brandl | 2006-06-21 19:52:36 +0200 (Wed, 21 Jun 2006) | 3 lines Make test_fcntl aware of netbsd3. ........ r47059 | georg.brandl | 2006-06-21 19:53:17 +0200 (Wed, 21 Jun 2006) | 3 lines Patch #1509001: expected skips for netbsd3. ........ r47060 | gerhard.haering | 2006-06-21 22:55:04 +0200 (Wed, 21 Jun 2006) | 2 lines Removed call to enable_callback_tracebacks that slipped in by accident. ........ r47061 | armin.rigo | 2006-06-21 23:58:50 +0200 (Wed, 21 Jun 2006) | 13 lines Fix for an obscure bug introduced by revs 46806 and 46808, with a test. The problem of checking too eagerly for recursive calls is the following: if a RuntimeError is caused by recursion, and if code needs to normalize it immediately (as in the 2nd test), then PyErr_NormalizeException() needs a call to the RuntimeError class to instantiate it, and this hits the recursion limit again... causing PyErr_NormalizeException() to never finish. Moved this particular recursion check to slot_tp_call(), which is not involved in instantiating built-in exceptions. Backport candidate. ........ r47064 | neal.norwitz | 2006-06-22 08:30:50 +0200 (Thu, 22 Jun 2006) | 3 lines Copy the wsgiref package during make install. ........ r47065 | neal.norwitz | 2006-06-22 08:35:30 +0200 (Thu, 22 Jun 2006) | 1 line Reset the doc date to today for the automatic doc builds ........ r47067 | andrew.kuchling | 2006-06-22 15:10:23 +0200 (Thu, 22 Jun 2006) | 1 line Mention how to suppress warnings ........ r47069 | georg.brandl | 2006-06-22 16:46:17 +0200 (Thu, 22 Jun 2006) | 3 lines Set lineno correctly on list, tuple and dict literals. ........ r47070 | georg.brandl | 2006-06-22 16:46:46 +0200 (Thu, 22 Jun 2006) | 4 lines Test for correct compilation of try-except-finally stmt. Test for correct lineno on list, tuple, dict literals. ........ r47071 | fred.drake | 2006-06-22 17:50:08 +0200 (Thu, 22 Jun 2006) | 1 line fix markup nit ........ r47072 | brett.cannon | 2006-06-22 18:49:14 +0200 (Thu, 22 Jun 2006) | 6 lines 'warning's was improperly requiring that a command-line Warning category be both a subclass of Warning and a subclass of types.ClassType. The latter is no longer true thanks to new-style exceptions. Closes bug #1510580. Thanks to AMK for the test. ........ r47073 | ronald.oussoren | 2006-06-22 20:33:54 +0200 (Thu, 22 Jun 2006) | 3 lines MacOSX: Add a message to the first screen of the installer that tells users how to avoid updates to their shell profile. ........ r47074 | georg.brandl | 2006-06-22 21:02:18 +0200 (Thu, 22 Jun 2006) | 3 lines Fix my name ;) ........ r47075 | thomas.heller | 2006-06-22 21:07:36 +0200 (Thu, 22 Jun 2006) | 2 lines Small fixes, mostly in the markup. ........ r47076 | peter.astrand | 2006-06-22 22:06:46 +0200 (Thu, 22 Jun 2006) | 1 line Make it possible to run test_subprocess.py on Python 2.2, which lacks test_support.is_resource_enabled. ........ r47077 | peter.astrand | 2006-06-22 22:21:26 +0200 (Thu, 22 Jun 2006) | 1 line Applied patch #1506758: Prevent MemoryErrors with large MAXFD. ........ r47079 | neal.norwitz | 2006-06-23 05:32:44 +0200 (Fri, 23 Jun 2006) | 1 line Fix refleak ........ r47080 | fred.drake | 2006-06-23 08:03:45 +0200 (Fri, 23 Jun 2006) | 9 lines - SF bug #853506: IP6 address parsing in sgmllib ('[' and ']' were not accepted in unquoted attribute values) - cleaned up tests of character and entity reference decoding so the tests cover the documented relationships among handle_charref, handle_entityref, convert_charref, convert_codepoint, and convert_entityref, without bringing up Unicode issues that sgmllib cannot be involved in ........ r47085 | andrew.kuchling | 2006-06-23 21:23:40 +0200 (Fri, 23 Jun 2006) | 11 lines Fit Makefile for the Python doc environment better; this is a step toward including the howtos in the build process. * Put LaTeX output in ../paper-<whatever>/. * Put HTML output in ../html/ * Explain some of the Makefile variables * Remove some cruft dating to my environment (e.g. the 'web' target) This makefile isn't currently invoked by the documentation build process, so these changes won't destabilize anything. ........ r47086 | hyeshik.chang | 2006-06-23 23:16:18 +0200 (Fri, 23 Jun 2006) | 5 lines Bug #1511381: codec_getstreamcodec() in codec.c is corrected to omit a default "error" argument for NULL pointer. This allows the parser to take a codec from cjkcodecs again. (Reported by Taewook Kang and reviewed by Walter Doerwald) ........ r47091 | ronald.oussoren | 2006-06-25 22:44:16 +0200 (Sun, 25 Jun 2006) | 6 lines Workaround for bug #1512124 Without this patch IDLE will get unresponsive when you open the debugger window on OSX. This is both using the system Tcl/Tk on Tiger as the latest universal download from tk-components.sf.net. ........ r47092 | ronald.oussoren | 2006-06-25 23:14:19 +0200 (Sun, 25 Jun 2006) | 3 lines Drop the calldll demo's for macos, calldll isn't present anymore, no need to keep the demo's around. ........ r47093 | ronald.oussoren | 2006-06-25 23:15:58 +0200 (Sun, 25 Jun 2006) | 3 lines Use a path without a double slash to compile the .py files after installation (macosx, binary installer). This fixes bug #1508369 for python 2.5. ........ r47094 | ronald.oussoren | 2006-06-25 23:19:06 +0200 (Sun, 25 Jun 2006) | 3 lines Also install the .egg-info files in Lib. This will cause wsgiref.egg-info to be installed. ........ r47097 | andrew.kuchling | 2006-06-26 14:40:02 +0200 (Mon, 26 Jun 2006) | 1 line [Bug #1511998] Various comments from Nick Coghlan; thanks! ........ r47098 | andrew.kuchling | 2006-06-26 14:43:43 +0200 (Mon, 26 Jun 2006) | 1 line Describe workaround for PyRange_New()'s removal ........ r47099 | andrew.kuchling | 2006-06-26 15:08:24 +0200 (Mon, 26 Jun 2006) | 5 lines [Bug #1512163] Fix typo. This change will probably break tests on FreeBSD buildbots, but I'll check in a fix for that next. ........ r47100 | andrew.kuchling | 2006-06-26 15:12:16 +0200 (Mon, 26 Jun 2006) | 9 lines [Bug #1512163] Use one set of locking methods, lockf(); remove the flock() calls. On FreeBSD, the two methods lockf() and flock() end up using the same mechanism and the second one fails. A Linux man page claims that the two methods are orthogonal (so locks acquired one way don't interact with locks acquired the other way) but that clearly must be false. ........ r47101 | andrew.kuchling | 2006-06-26 15:23:10 +0200 (Mon, 26 Jun 2006) | 5 lines Add a test for a conflicting lock. On slow machines, maybe the time intervals (2 sec, 0.5 sec) will be too tight. I'll see how the buildbots like it. ........ r47103 | andrew.kuchling | 2006-06-26 16:33:24 +0200 (Mon, 26 Jun 2006) | 1 line Windows doesn't have os.fork(). I'll just disable this test for now ........ r47106 | andrew.kuchling | 2006-06-26 19:00:35 +0200 (Mon, 26 Jun 2006) | 9 lines Attempt to fix build failure on OS X and Debian alpha; the symptom is consistent with os.wait() returning immediately because some other subprocess had previously exited; the test suite then immediately tries to lock the mailbox and gets an error saying it's already locked. To fix this, do a waitpid() so the test suite only continues once the intended child process has exited. ........ r47113 | neal.norwitz | 2006-06-27 06:06:46 +0200 (Tue, 27 Jun 2006) | 1 line Ignore some more warnings in the dynamic linker on an older gentoo ........ r47114 | neal.norwitz | 2006-06-27 06:09:13 +0200 (Tue, 27 Jun 2006) | 6 lines Instead of doing a make test, run the regression tests out of the installed copy. This will hopefully catch problems where directories are added under Lib/ but not to Makefile.pre.in. This breaks out the 2 runs of the test suite with and without -O which is also nicer. ........ r47115 | neal.norwitz | 2006-06-27 06:12:58 +0200 (Tue, 27 Jun 2006) | 5 lines Fix SF bug #1513032, 'make install' failure on FreeBSD 5.3. No need to install lib-old, it's empty in 2.5. ........ r47116 | neal.norwitz | 2006-06-27 06:23:06 +0200 (Tue, 27 Jun 2006) | 1 line Test unimportant change to verify buildbot does not try to build ........ r47117 | neal.norwitz | 2006-06-27 06:26:30 +0200 (Tue, 27 Jun 2006) | 1 line Try again: test unimportant change to verify buildbot does not try to build ........ r47118 | neal.norwitz | 2006-06-27 06:28:56 +0200 (Tue, 27 Jun 2006) | 1 line Verify buildbot picks up these changes (really needs testing after last change to Makefile.pre.in) ........ r47121 | vinay.sajip | 2006-06-27 09:34:37 +0200 (Tue, 27 Jun 2006) | 1 line Removed buggy exception handling in doRollover of rotating file handlers. Exceptions now propagate to caller. ........ r47123 | ronald.oussoren | 2006-06-27 12:08:25 +0200 (Tue, 27 Jun 2006) | 3 lines MacOSX: fix rather dumb buglet that made it impossible to create extensions on OSX 10.3 when using a binary distribution build on 10.4. ........ r47125 | tim.peters | 2006-06-27 13:52:49 +0200 (Tue, 27 Jun 2006) | 2 lines Whitespace normalization. ........ r47128 | ronald.oussoren | 2006-06-27 14:53:52 +0200 (Tue, 27 Jun 2006) | 8 lines Use staticly build copies of zlib and bzip2 to build the OSX installer, that way the resulting binaries have a better change of running on 10.3. This patch also updates the search logic for sleepycat db3/4, without this patch you cannot use a sleepycat build with a non-standard prefix; with this you can (at least on OSX) if you add the prefix to CPPFLAGS/LDFLAGS at configure-time. This change is needed to build the binary installer for OSX. ........ r47131 | ronald.oussoren | 2006-06-27 17:45:32 +0200 (Tue, 27 Jun 2006) | 5 lines macosx: Install a libpython2.5.a inside the framework as a symlink to the actual dylib at the root of the framework, that way tools that expect a unix-like install (python-config, but more importantly external products like mod_python) work correctly. ........ r47137 | neal.norwitz | 2006-06-28 07:03:22 +0200 (Wed, 28 Jun 2006) | 4 lines According to the man pages on Gentoo Linux and Tru64, EACCES or EAGAIN can be returned if fcntl (lockf) fails. This fixes the test failure on Tru64 by checking for either error rather than just EAGAIN. ........ r47139 | neal.norwitz | 2006-06-28 08:28:31 +0200 (Wed, 28 Jun 2006) | 5 lines Fix bug #1512695: cPickle.loads could crash if it was interrupted with a KeyboardInterrupt since PyTuple_Pack was passed a NULL. Will backport. ........ r47142 | nick.coghlan | 2006-06-28 12:41:47 +0200 (Wed, 28 Jun 2006) | 1 line Make full module name available as __module_name__ even when __name__ is set to something else (like '__main__') ........ r47143 | armin.rigo | 2006-06-28 12:49:51 +0200 (Wed, 28 Jun 2006) | 2 lines A couple of crashers of the "won't fix" kind. ........ r47147 | andrew.kuchling | 2006-06-28 16:25:20 +0200 (Wed, 28 Jun 2006) | 1 line [Bug #1508766] Add docs for uuid module; docs written by George Yoshida, with minor rearrangements by me. ........ r47148 | andrew.kuchling | 2006-06-28 16:27:21 +0200 (Wed, 28 Jun 2006) | 1 line [Bug #1508766] Add docs for uuid module; this puts the module in the 'Internet Protocols' section. Arguably this module could also have gone in the chapters on strings or encodings, maybe even the crypto chapter. Fred, please move if you see fit. ........ r47151 | georg.brandl | 2006-06-28 22:23:25 +0200 (Wed, 28 Jun 2006) | 3 lines Fix end_fill(). ........ r47153 | trent.mick | 2006-06-28 22:30:41 +0200 (Wed, 28 Jun 2006) | 2 lines Mention the expat upgrade and pyexpat fix I put in 2.5b1. ........ r47154 | fred.drake | 2006-06-29 02:51:53 +0200 (Thu, 29 Jun 2006) | 6 lines SF bug #1504333: sgmlib should allow angle brackets in quoted values (modified patch by Sam Ruby; changed to use separate REs for start and end tags to reduce matching cost for end tags; extended tests; updated to avoid breaking previous changes to support IPv6 addresses in unquoted attribute values) ........ r47156 | fred.drake | 2006-06-29 04:57:48 +0200 (Thu, 29 Jun 2006) | 1 line document recent bugfixes in sgmllib ........ r47158 | neal.norwitz | 2006-06-29 06:10:08 +0200 (Thu, 29 Jun 2006) | 10 lines Add new utility function, reap_children(), to test_support. This should be called at the end of each test that spawns children (perhaps it should be called from regrtest instead?). This will hopefully prevent some of the unexplained failures in the buildbots (hppa and alpha) during tests that spawn children. The problems were not reproducible. There were many zombies that remained at the end of several tests. In the worst case, this shouldn't cause any more problems, though it may not help either. Time will tell. ........ r47159 | neal.norwitz | 2006-06-29 07:48:14 +0200 (Thu, 29 Jun 2006) | 5 lines This should fix the buildbot failure on s/390 which can't connect to gmail.org. It makes the error message consistent and always sends to stderr. It would be much better for all the networking tests to hit only python.org. ........ r47161 | thomas.heller | 2006-06-29 20:34:15 +0200 (Thu, 29 Jun 2006) | 3 lines Protect the thread api calls in the _ctypes extension module within #ifdef WITH_THREADS/#endif blocks. Found by Sam Rushing. ........ r47162 | martin.v.loewis | 2006-06-29 20:58:44 +0200 (Thu, 29 Jun 2006) | 2 lines Patch #1509163: MS Toolkit Compiler no longer available ........ r47163 | skip.montanaro | 2006-06-29 21:20:09 +0200 (Thu, 29 Jun 2006) | 1 line add string methods to index ........ r47164 | vinay.sajip | 2006-06-30 02:13:08 +0200 (Fri, 30 Jun 2006) | 1 line Fixed bug in fileConfig() which failed to clear logging._handlerList ........ r47166 | tim.peters | 2006-06-30 08:18:39 +0200 (Fri, 30 Jun 2006) | 2 lines Whitespace normalization. ........ r47170 | neal.norwitz | 2006-06-30 09:32:16 +0200 (Fri, 30 Jun 2006) | 1 line Silence compiler warning ........ r47171 | neal.norwitz | 2006-06-30 09:32:46 +0200 (Fri, 30 Jun 2006) | 1 line Another problem reported by Coverity. Backport candidate. ........ r47175 | thomas.heller | 2006-06-30 19:44:54 +0200 (Fri, 30 Jun 2006) | 2 lines Revert the use of PY_FORMAT_SIZE_T in PyErr_Format. ........ r47176 | tim.peters | 2006-06-30 20:34:51 +0200 (Fri, 30 Jun 2006) | 2 lines Remove now-unused fidding with PY_FORMAT_SIZE_T. ........ r47177 | georg.brandl | 2006-06-30 20:47:56 +0200 (Fri, 30 Jun 2006) | 3 lines Document decorator usage of property. ........ r47181 | fred.drake | 2006-06-30 21:29:25 +0200 (Fri, 30 Jun 2006) | 4 lines - consistency nit: always include "()" in \function and \method (*should* be done by the presentation, but that requires changes all over) - avoid spreading the __name meme ........ r47188 | vinay.sajip | 2006-07-01 12:45:20 +0200 (Sat, 01 Jul 2006) | 1 line Added entry for fileConfig() bugfix. ........ r47189 | vinay.sajip | 2006-07-01 12:47:20 +0200 (Sat, 01 Jul 2006) | 1 line Added duplicate call to fileConfig() to ensure that it cleans up after itself correctly. ........ r47190 | martin.v.loewis | 2006-07-01 17:33:37 +0200 (Sat, 01 Jul 2006) | 2 lines Release all forwarded functions in .close. Fixes #1513223. ........ r47191 | fred.drake | 2006-07-01 18:28:20 +0200 (Sat, 01 Jul 2006) | 7 lines SF bug #1296433 (Expat bug #1515266): Unchecked calls to character data handler would cause a segfault. This merges in Expat's lib/xmlparse.c revisions 1.154 and 1.155, which fix this and a closely related problem (the later does not affect Python). Moved the crasher test to the tests for xml.parsers.expat. ........ r47197 | gerhard.haering | 2006-07-02 19:48:30 +0200 (Sun, 02 Jul 2006) | 4 lines The sqlite3 module did cut off data from the SQLite database at the first null character before sending it to a custom converter. This has been fixed now. ........ r47198 | martin.v.loewis | 2006-07-02 20:44:00 +0200 (Sun, 02 Jul 2006) | 1 line Correct arithmetic in access on Win32. Fixes #1513646. ........ r47203 | thomas.heller | 2006-07-03 09:58:09 +0200 (Mon, 03 Jul 2006) | 1 line Cleanup: Remove commented out code. ........ r47204 | thomas.heller | 2006-07-03 09:59:50 +0200 (Mon, 03 Jul 2006) | 1 line Don't run the doctests with Python 2.3 because it doesn't have the ELLIPSIS flag. ........ r47205 | thomas.heller | 2006-07-03 10:04:05 +0200 (Mon, 03 Jul 2006) | 7 lines Fixes so that _ctypes can be compiled with the MingW compiler. It seems that the definition of '__attribute__(x)' was responsible for the compiler ignoring the '__fastcall' attribute on the ffi_closure_SYSV function in libffi_msvc/ffi.c, took me quite some time to figure this out. ........ r47206 | thomas.heller | 2006-07-03 10:08:14 +0200 (Mon, 03 Jul 2006) | 11 lines Add a new function uses_seh() to the _ctypes extension module. This will return True if Windows Structured Exception handling (SEH) is used when calling functions, False otherwise. Currently, only MSVC supports SEH. Fix the test so that it doesn't crash when run with MingW compiled _ctypes. Note that two tests are still failing when mingw is used, I suspect structure layout differences and function calling conventions between MSVC and MingW. ........ r47207 | tim.peters | 2006-07-03 10:23:19 +0200 (Mon, 03 Jul 2006) | 2 lines Whitespace normalization. ........ r47208 | martin.v.loewis | 2006-07-03 11:44:00 +0200 (Mon, 03 Jul 2006) | 3 lines Only setup canvas when it is first created. Fixes #1514703 ........ r47209 | martin.v.loewis | 2006-07-03 12:05:30 +0200 (Mon, 03 Jul 2006) | 3 lines Reimplement turtle.circle using a polyline, to allow correct filling of arcs. Also fixes #1514693. ........ r47210 | martin.v.loewis | 2006-07-03 12:19:49 +0200 (Mon, 03 Jul 2006) | 3 lines Bug #1514693: Update turtle's heading when switching between degrees and radians. ........ r47211 | martin.v.loewis | 2006-07-03 13:12:06 +0200 (Mon, 03 Jul 2006) | 2 lines Document functions added in 2.3 and 2.5. ........ r47212 | martin.v.loewis | 2006-07-03 14:19:50 +0200 (Mon, 03 Jul 2006) | 3 lines Bug #1417699: Reject locale-specific decimal point in float() and atof(). ........ r47213 | martin.v.loewis | 2006-07-03 14:28:58 +0200 (Mon, 03 Jul 2006) | 3 lines Bug #1267547: Put proper recursive setup.py call into the spec file generated by bdist_rpm. ........ r47215 | martin.v.loewis | 2006-07-03 15:01:35 +0200 (Mon, 03 Jul 2006) | 3 lines Patch #825417: Fix timeout processing in expect, read_until. Will backport to 2.4. ........ r47218 | martin.v.loewis | 2006-07-03 15:47:40 +0200 (Mon, 03 Jul 2006) | 2 lines Put method-wrappers into trashcan. Fixes #927248. ........ r47219 | andrew.kuchling | 2006-07-03 16:07:30 +0200 (Mon, 03 Jul 2006) | 1 line [Bug #1515932] Clarify description of slice assignment ........ r47220 | andrew.kuchling | 2006-07-03 16:16:09 +0200 (Mon, 03 Jul 2006) | 4 lines [Bug #1511911] Clarify description of optional arguments to sorted() by improving the xref to the section on lists, and by copying the explanations of the arguments (with a slight modification). ........ r47223 | kristjan.jonsson | 2006-07-03 16:59:05 +0200 (Mon, 03 Jul 2006) | 1 line Fix build problems with the platform SDK on windows. It is not sufficient to test for the C compiler version when determining if we have the secure CRT from microsoft. Must test with an undocumented macro, __STDC_SECURE_LIB__ too. ........ r47224 | ronald.oussoren | 2006-07-04 14:30:22 +0200 (Tue, 04 Jul 2006) | 7 lines Sync the darwin/x86 port libffi with the copy in PyObjC. This fixes a number of bugs in that port. The most annoying ones were due to some subtle differences between the document ABI and the actual implementation :-( (there are no python unittests that fail without this patch, but without it some of libffi's unittests fail). ........ r47234 | georg.brandl | 2006-07-05 10:21:00 +0200 (Wed, 05 Jul 2006) | 3 lines Remove remaining references to OverflowWarning. ........ r47236 | thomas.heller | 2006-07-05 11:13:56 +0200 (Wed, 05 Jul 2006) | 3 lines Fix the bitfield test when _ctypes is compiled with MingW. Structures containing bitfields may have different layout on MSVC and MingW . ........ r47237 | thomas.wouters | 2006-07-05 13:03:49 +0200 (Wed, 05 Jul 2006) | 15 lines Fix bug in passing tuples to string.Template. All other values (with working str() or repr()) would work, just not multi-value tuples. Probably not a backport candidate, since it changes the behaviour of passing a single-element tuple: >>> string.Template("$foo").substitute(dict(foo=(1,))) '(1,)' versus '1' ........ r47241 | georg.brandl | 2006-07-05 16:18:45 +0200 (Wed, 05 Jul 2006) | 2 lines Patch #1517490: fix glitches in filter() docs. ........ r47244 | georg.brandl | 2006-07-05 17:50:05 +0200 (Wed, 05 Jul 2006) | 2 lines no need to elaborate "string". ........ r47251 | neal.norwitz | 2006-07-06 06:28:59 +0200 (Thu, 06 Jul 2006) | 3 lines Fix refleaks reported by Shane Hathaway in SF patch #1515361. This change contains only the changes related to leaking the copy variable. ........ r47253 | fred.drake | 2006-07-06 07:13:22 +0200 (Thu, 06 Jul 2006) | 4 lines - back out Expat change; the final fix to Expat will be different - change the pyexpat wrapper to not be so sensitive to this detail of the Expat implementation (the ex-crasher test still passes) ........ r47257 | neal.norwitz | 2006-07-06 08:45:08 +0200 (Thu, 06 Jul 2006) | 1 line Add a NEWS entry for a recent pyexpat fix ........ r47258 | martin.v.loewis | 2006-07-06 08:55:58 +0200 (Thu, 06 Jul 2006) | 2 lines Add sqlite3.dll to the DLLs component, not to the TkDLLs component. Fixes #1517388. ........ r47259 | martin.v.loewis | 2006-07-06 09:05:21 +0200 (Thu, 06 Jul 2006) | 1 line Properly quote compileall and Lib paths in case TARGETDIR has a space. ........ r47260 | thomas.heller | 2006-07-06 09:50:18 +0200 (Thu, 06 Jul 2006) | 5 lines Revert the change done in svn revision 47206: Add a new function uses_seh() to the _ctypes extension module. This will return True if Windows Structured Exception handling (SEH) is used when calling functions, False otherwise. ........ r47261 | armin.rigo | 2006-07-06 09:58:18 +0200 (Thu, 06 Jul 2006) | 3 lines A couple of examples about how to attack the fact that _PyType_Lookup() returns a borrowed ref. Many of the calls are open to attack. ........ r47262 | thomas.heller | 2006-07-06 10:28:14 +0200 (Thu, 06 Jul 2006) | 2 lines The test that calls a function with invalid arguments and catches the resulting Windows access violation will not be run by default. ........ r47263 | thomas.heller | 2006-07-06 10:48:35 +0200 (Thu, 06 Jul 2006) | 5 lines Patch #1517790: It is now possible to use custom objects in the ctypes foreign function argtypes sequence as long as they provide a from_param method, no longer is it required that the object is a ctypes type. ........ r47264 | thomas.heller | 2006-07-06 10:58:40 +0200 (Thu, 06 Jul 2006) | 2 lines Document the Struture and Union constructors. ........ r47265 | thomas.heller | 2006-07-06 11:11:22 +0200 (Thu, 06 Jul 2006) | 2 lines Document the changes in svn revision 47263, from patch #1517790. ........ r47267 | ronald.oussoren | 2006-07-06 12:13:35 +0200 (Thu, 06 Jul 2006) | 7 lines This patch solves the problem Skip was seeing with zlib, this patch ensures that configure uses similar compiler flags as setup.py when doing the zlib test. Without this patch configure would use the first shared library on the linker path, with this patch it uses the first shared or static library on that path just like setup.py. ........ r47268 | thomas.wouters | 2006-07-06 12:48:28 +0200 (Thu, 06 Jul 2006) | 4 lines NEWS entry for r47267: fixing configure's zlib probing. ........ r47269 | fredrik.lundh | 2006-07-06 14:29:24 +0200 (Thu, 06 Jul 2006) | 3 lines added XMLParser alias for cElementTree compatibility ........ r47271 | nick.coghlan | 2006-07-06 14:53:04 +0200 (Thu, 06 Jul 2006) | 1 line Revert the __module_name__ changes made in rev 47142. We'll revisit this in Python 2.6 ........ r47272 | nick.coghlan | 2006-07-06 15:04:56 +0200 (Thu, 06 Jul 2006) | 1 line Update the tutorial section on relative imports ........ r47273 | nick.coghlan | 2006-07-06 15:35:27 +0200 (Thu, 06 Jul 2006) | 1 line Ignore ImportWarning by default ........ r47274 | nick.coghlan | 2006-07-06 15:41:34 +0200 (Thu, 06 Jul 2006) | 1 line Cover ImportWarning, PendingDeprecationWarning and simplefilter() in the warnings module docs ........ r47275 | nick.coghlan | 2006-07-06 15:47:18 +0200 (Thu, 06 Jul 2006) | 1 line Add NEWS entries for the ImportWarning change and documentation update ........ r47276 | andrew.kuchling | 2006-07-06 15:57:28 +0200 (Thu, 06 Jul 2006) | 1 line ImportWarning is now silent by default ........ r47277 | thomas.heller | 2006-07-06 17:06:05 +0200 (Thu, 06 Jul 2006) | 2 lines Document the correct return type of PyLong_AsUnsignedLongLongMask. ........ r47278 | hyeshik.chang | 2006-07-06 17:21:52 +0200 (Thu, 06 Jul 2006) | 2 lines Add a testcase for r47086 which fixed a bug in codec_getstreamcodec(). ........ r47279 | hyeshik.chang | 2006-07-06 17:39:24 +0200 (Thu, 06 Jul 2006) | 3 lines Test using all CJK encodings for the testcases which don't require specific encodings. ........ r47280 | martin.v.loewis | 2006-07-06 21:28:03 +0200 (Thu, 06 Jul 2006) | 2 lines Properly generate logical file ids. Fixes #1515998. Also correct typo in Control.mapping. ........ r47287 | neal.norwitz | 2006-07-07 08:03:15 +0200 (Fri, 07 Jul 2006) | 17 lines Restore rev 47014: The hppa ubuntu box sometimes hangs forever in these tests. My guess is that the wait is failing for some reason. Use WNOHANG, so we won't wait until the buildbot kills the test suite. I haven't been able to reproduce the failure, so I'm not sure if this will help or not. Hopefully, this change will cause the test to fail, rather than hang. That will be better since we will get the rest of the test results. It may also help us debug the real problem. *** The reason this originally failed was because there were many zombie children outstanding before rev 47158 cleaned them up. There are still hangs in test_subprocess that need to be addressed, but that will take more work. This should close some holes. ........ r47289 | georg.brandl | 2006-07-07 10:15:12 +0200 (Fri, 07 Jul 2006) | 3 lines Fix RFC number. ........ r50489 | neal.norwitz | 2006-07-08 07:31:37 +0200 (Sat, 08 Jul 2006) | 1 line Fix SF bug #1519018: 'as' is now validated properly in import statements ........ r50490 | georg.brandl | 2006-07-08 14:15:27 +0200 (Sat, 08 Jul 2006) | 3 lines Add an additional test for bug #1519018. ........ r50491 | tim.peters | 2006-07-08 21:55:05 +0200 (Sat, 08 Jul 2006) | 2 lines Whitespace normalization. ........ r50493 | neil.schemenauer | 2006-07-09 18:16:34 +0200 (Sun, 09 Jul 2006) | 2 lines Fix AST compiler bug #1501934: incorrect LOAD/STORE_GLOBAL generation. ........ r50495 | neil.schemenauer | 2006-07-09 23:19:29 +0200 (Sun, 09 Jul 2006) | 2 lines Fix SF bug 1441486: bad unary minus folding in compiler. ........ r50497 | neal.norwitz | 2006-07-10 00:14:42 +0200 (Mon, 10 Jul 2006) | 4 lines On 64 bit systems, int literals that use less than 64 bits are now ints rather than longs. This also fixes the test for eval(-sys.maxint - 1). ........ r50500 | neal.norwitz | 2006-07-10 02:04:44 +0200 (Mon, 10 Jul 2006) | 4 lines Bug #1512814, Fix incorrect lineno's when code at module scope started after line 256. ........ r50501 | neal.norwitz | 2006-07-10 02:05:34 +0200 (Mon, 10 Jul 2006) | 1 line Fix doco. Backport candidate. ........ r50503 | neal.norwitz | 2006-07-10 02:23:17 +0200 (Mon, 10 Jul 2006) | 5 lines Part of SF patch #1484695. This removes dead code. The chksum was already verified in .frombuf() on the lines above. If there was a problem an exception is raised, so there was no way this condition could have been true. ........ r50504 | neal.norwitz | 2006-07-10 03:18:57 +0200 (Mon, 10 Jul 2006) | 3 lines Patch #1516912: improve Modules support for OpenVMS. ........ r50506 | neal.norwitz | 2006-07-10 04:36:41 +0200 (Mon, 10 Jul 2006) | 7 lines Patch #1504046: Add documentation for xml.etree. /F wrote the text docs, Englebert Gruber massaged it to latex and I did some more massaging to try and improve the consistency and fix some name mismatches between the declaration and text. ........ r50509 | martin.v.loewis | 2006-07-10 09:23:48 +0200 (Mon, 10 Jul 2006) | 2 lines Introduce DISTUTILS_USE_SDK as a flag to determine whether the SDK environment should be used. Fixes #1508010. ........ r50510 | martin.v.loewis | 2006-07-10 09:26:41 +0200 (Mon, 10 Jul 2006) | 1 line Change error message to indicate that VS2003 is necessary to build extension modules, not the .NET SDK. ........ r50511 | martin.v.loewis | 2006-07-10 09:29:41 +0200 (Mon, 10 Jul 2006) | 1 line Add svn:ignore. ........ r50512 | anthony.baxter | 2006-07-10 09:41:04 +0200 (Mon, 10 Jul 2006) | 1 line preparing for 2.5b2 ........ r50513 | thomas.heller | 2006-07-10 11:10:28 +0200 (Mon, 10 Jul 2006) | 2 lines Fix bug #1518190: accept any integer or long value in the ctypes.c_void_p constructor. ........ r50514 | thomas.heller | 2006-07-10 11:31:06 +0200 (Mon, 10 Jul 2006) | 3 lines Fixed a segfault when ctypes.wintypes were imported on non-Windows machines. ........ r50516 | thomas.heller | 2006-07-10 13:11:10 +0200 (Mon, 10 Jul 2006) | 3 lines Assigning None to pointer type structure fields possible overwrote wrong fields. ........ r50517 | thomas.heller | 2006-07-10 13:17:37 +0200 (Mon, 10 Jul 2006) | 5 lines Moved the ctypes news entries from the 'Library' section into the 'Extension Modules' section where they belong, probably. This destroyes the original order of the news entries, don't know if that is important or not. ........ r50526 | phillip.eby | 2006-07-10 21:03:29 +0200 (Mon, 10 Jul 2006) | 2 lines Fix SF#1516184 and add a test to prevent regression. ........ r50528 | phillip.eby | 2006-07-10 21:18:35 +0200 (Mon, 10 Jul 2006) | 2 lines Fix SF#1457312: bad socket error handling in distutils "upload" command. ........ r50537 | peter.astrand | 2006-07-10 22:39:49 +0200 (Mon, 10 Jul 2006) | 1 line Make it possible to run test_subprocess.py with Python 2.2, which lacks test_support.reap_children(). ........ r50541 | tim.peters | 2006-07-10 23:08:24 +0200 (Mon, 10 Jul 2006) | 5 lines After approval from Anthony, merge the tim-current_frames branch into the trunk. This adds a new sys._current_frames() function, which returns a dict mapping thread id to topmost thread stack frame. ........ r50542 | tim.peters | 2006-07-10 23:11:49 +0200 (Mon, 10 Jul 2006) | 2 lines Whitespace normalization. ........ r50553 | martin.v.loewis | 2006-07-11 00:11:28 +0200 (Tue, 11 Jul 2006) | 4 lines Patch #1519566: Remove unused _tofill member. Make begin_fill idempotent. Update demo2 to demonstrate filling of concave shapes. ........ r50567 | anthony.baxter | 2006-07-11 04:04:09 +0200 (Tue, 11 Jul 2006) | 4 lines #1494314: Fix a regression with high-numbered sockets in 2.4.3. This means that select() on sockets > FD_SETSIZE (typically 1024) work again. The patch makes sockets use poll() internally where available. ........ r50568 | tim.peters | 2006-07-11 04:17:48 +0200 (Tue, 11 Jul 2006) | 2 lines Whitespace normalization. ........ r50575 | thomas.heller | 2006-07-11 18:42:05 +0200 (Tue, 11 Jul 2006) | 1 line Add missing Py_DECREF. ........ r50576 | thomas.heller | 2006-07-11 18:44:25 +0200 (Tue, 11 Jul 2006) | 1 line Add missing Py_DECREFs. ........ r50579 | andrew.kuchling | 2006-07-11 19:20:16 +0200 (Tue, 11 Jul 2006) | 1 line Bump version number; add sys._current_frames ........ r50582 | thomas.heller | 2006-07-11 20:28:35 +0200 (Tue, 11 Jul 2006) | 3 lines When a foreign function is retrived by calling __getitem__ on a ctypes library instance, do not set it as attribute. ........ r50583 | thomas.heller | 2006-07-11 20:40:50 +0200 (Tue, 11 Jul 2006) | 2 lines Change the ctypes version number to 1.0.0. ........ r50597 | neal.norwitz | 2006-07-12 07:26:17 +0200 (Wed, 12 Jul 2006) | 3 lines Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again. ........ r50598 | neal.norwitz | 2006-07-12 07:26:35 +0200 (Wed, 12 Jul 2006) | 1 line Fix function name in error msg ........ r50599 | neal.norwitz | 2006-07-12 07:27:46 +0200 (Wed, 12 Jul 2006) | 4 lines Fix uninitialized memory read reported by Valgrind when running doctest. This could happen if size == 0. ........ r50600 | neal.norwitz | 2006-07-12 09:28:29 +0200 (Wed, 12 Jul 2006) | 1 line Actually change the MAGIC #. Create a new section for 2.5c1 and mention the impact of changing the MAGIC #. ........ r50601 | thomas.heller | 2006-07-12 10:43:47 +0200 (Wed, 12 Jul 2006) | 3 lines Fix #1467450: ctypes now uses RTLD_GLOBAL by default on OSX 10.3 to load shared libraries. ........ r50604 | thomas.heller | 2006-07-12 16:25:18 +0200 (Wed, 12 Jul 2006) | 3 lines Fix the wrong description of LibraryLoader.LoadLibrary, and document the DEFAULT_MODE constant. ........ r50607 | georg.brandl | 2006-07-12 17:31:17 +0200 (Wed, 12 Jul 2006) | 3 lines Accept long options "--help" and "--version". ........ r50617 | thomas.heller | 2006-07-13 11:53:47 +0200 (Thu, 13 Jul 2006) | 3 lines A misspelled preprocessor symbol caused ctypes to be always compiled without thread support. Replaced WITH_THREADS with WITH_THREAD. ........ r50619 | thomas.heller | 2006-07-13 19:01:14 +0200 (Thu, 13 Jul 2006) | 3 lines Fix #1521375. When running with root priviledges, 'gcc -o /dev/null' did overwrite /dev/null. Use a temporary file instead of /dev/null. ........ r50620 | thomas.heller | 2006-07-13 19:05:13 +0200 (Thu, 13 Jul 2006) | 2 lines Fix misleading words. ........ r50622 | andrew.kuchling | 2006-07-13 19:37:26 +0200 (Thu, 13 Jul 2006) | 1 line Typo fix ........ r50629 | georg.brandl | 2006-07-14 09:12:54 +0200 (Fri, 14 Jul 2006) | 3 lines Patch #1521874: grammar errors in doanddont.tex. ........ r50630 | neal.norwitz | 2006-07-14 09:20:04 +0200 (Fri, 14 Jul 2006) | 1 line Try to improve grammar further. ........ r50631 | martin.v.loewis | 2006-07-14 11:58:55 +0200 (Fri, 14 Jul 2006) | 1 line Extend build_ssl to Win64, using VSExtComp. ........ r50632 | martin.v.loewis | 2006-07-14 14:10:09 +0200 (Fri, 14 Jul 2006) | 1 line Add debug output to analyse buildbot failure. ........ r50633 | martin.v.loewis | 2006-07-14 14:31:05 +0200 (Fri, 14 Jul 2006) | 1 line Fix Debug build of _ssl. ........ r50636 | andrew.kuchling | 2006-07-14 15:32:38 +0200 (Fri, 14 Jul 2006) | 1 line Mention new options ........ r50638 | peter.astrand | 2006-07-14 16:04:45 +0200 (Fri, 14 Jul 2006) | 1 line Bug #1223937: CalledProcessError.errno -> CalledProcessError.returncode. ........ r50640 | thomas.heller | 2006-07-14 17:01:05 +0200 (Fri, 14 Jul 2006) | 4 lines Make the prototypes of our private PyUnicode_FromWideChar and PyUnicode_AsWideChar replacement functions compatible to the official functions by using Py_ssize_t instead of int. ........ r50643 | thomas.heller | 2006-07-14 19:51:14 +0200 (Fri, 14 Jul 2006) | 3 lines Patch #1521817: The index range checking on ctypes arrays containing exactly one element is enabled again. ........ r50647 | thomas.heller | 2006-07-14 20:22:50 +0200 (Fri, 14 Jul 2006) | 2 lines Updates for the ctypes documentation. ........ r50655 | fredrik.lundh | 2006-07-14 23:45:48 +0200 (Fri, 14 Jul 2006) | 3 lines typo ........ r50664 | george.yoshida | 2006-07-15 18:03:49 +0200 (Sat, 15 Jul 2006) | 2 lines Bug #15187702 : ext/win-cookbook.html has a broken link to distutils ........ r50667 | bob.ippolito | 2006-07-15 18:53:15 +0200 (Sat, 15 Jul 2006) | 1 line Patch #1220874: Update the binhex module for Mach-O. ........ r50671 | fred.drake | 2006-07-16 03:21:20 +0200 (Sun, 16 Jul 2006) | 1 line clean up some link markup ........ r50673 | neal.norwitz | 2006-07-16 03:50:38 +0200 (Sun, 16 Jul 2006) | 4 lines Bug #1512814, Fix incorrect lineno's when code within a function had more than 255 blank lines. Byte codes need to go first, line #s second. ........ r50674 | neal.norwitz | 2006-07-16 04:00:32 +0200 (Sun, 16 Jul 2006) | 5 lines a & b were dereffed above, so they are known to be valid pointers. z is known to be NULL, nothing to DECREF. Reported by Klockwork, #107. ........ r50675 | neal.norwitz | 2006-07-16 04:02:57 +0200 (Sun, 16 Jul 2006) | 5 lines self is dereffed (and passed as first arg), so it's known to be good. func is returned from PyArg_ParseTuple and also dereffed. Reported by Klocwork, #30 (self one at least). ........ r50676 | neal.norwitz | 2006-07-16 04:05:35 +0200 (Sun, 16 Jul 2006) | 4 lines proto was dereffed above and is known to be good. No need for X. Reported by Klocwork, #39. ........ r50677 | neal.norwitz | 2006-07-16 04:15:27 +0200 (Sun, 16 Jul 2006) | 5 lines Fix memory leaks in some conditions. Reported by Klocwork #152. ........ r50678 | neal.norwitz | 2006-07-16 04:17:36 +0200 (Sun, 16 Jul 2006) | 4 lines Fix memory leak under some conditions. Reported by Klocwork, #98. ........ r50679 | neal.norwitz | 2006-07-16 04:22:30 +0200 (Sun, 16 Jul 2006) | 8 lines Use sizeof(buffer) instead of duplicating the constants to ensure they won't be wrong. The real change is to pass (bufsz - 1) to PyOS_ascii_formatd and 1 to strncat. strncat copies n+1 bytes from src (not dest). Reported by Klocwork #58. ........ r50680 | neal.norwitz | 2006-07-16 04:32:03 +0200 (Sun, 16 Jul 2006) | 5 lines Handle a NULL name properly. Reported by Klocwork #67 ........ r50681 | neal.norwitz | 2006-07-16 04:35:47 +0200 (Sun, 16 Jul 2006) | 6 lines PyFunction_SetDefaults() is documented as taking None or a tuple. A NULL would crash the PyTuple_Check(). Now make NULL return a SystemError. Reported by Klocwork #73. ........ r50683 | neal.norwitz | 2006-07-17 02:55:45 +0200 (Mon, 17 Jul 2006) | 5 lines Stop INCREFing name, then checking if it's NULL. name (f_name) should never be NULL so assert it. Fix one place where we could have passed NULL. Reported by Klocwork #66. ........ r50684 | neal.norwitz | 2006-07-17 02:57:15 +0200 (Mon, 17 Jul 2006) | 5 lines otherset is known to be non-NULL based on checks before and DECREF after. DECREF otherset rather than XDECREF in error conditions too. Reported by Klockwork #154. ........ r50685 | neal.norwitz | 2006-07-17 02:59:04 +0200 (Mon, 17 Jul 2006) | 7 lines Reported by Klocwork #151. v2 can be NULL if exception2 is NULL. I don't think that condition can happen, but I'm not sure it can't either. Now the code will protect against either being NULL. ........ r50686 | neal.norwitz | 2006-07-17 03:00:16 +0200 (Mon, 17 Jul 2006) | 1 line Add NEWS entry for a bunch of fixes due to warnings produced by Klocworks static analysis tool. ........ r50687 | fred.drake | 2006-07-17 07:47:52 +0200 (Mon, 17 Jul 2006) | 3 lines document xmlcore (still minimal; needs mention in each of the xml.* modules) SF bug #1504456 (partial) ........ r50688 | georg.brandl | 2006-07-17 15:23:46 +0200 (Mon, 17 Jul 2006) | 3 lines Remove usage of sets module (patch #1500609). ........ r50689 | georg.brandl | 2006-07-17 15:26:33 +0200 (Mon, 17 Jul 2006) | 3 lines Add missing NEWS item (#1522771) ........ r50690 | andrew.kuchling | 2006-07-17 18:47:54 +0200 (Mon, 17 Jul 2006) | 1 line Attribute more features ........ r50692 | kurt.kaiser | 2006-07-17 23:59:27 +0200 (Mon, 17 Jul 2006) | 8 lines Patch 1479219 - Tal Einat 1. 'as' highlighted as builtin in comment string on import line 2. Comments such as "#False identity" which start with a keyword immediately after the '#' character aren't colored as comments. 3. u or U beginning unicode string not correctly highlighted Closes bug 1325071 ........ r50693 | barry.warsaw | 2006-07-18 01:07:51 +0200 (Tue, 18 Jul 2006) | 16 lines decode_rfc2231(): Be more robust against buggy RFC 2231 encodings. Specifically, instead of raising a ValueError when there is a single tick in the parameter, simply return that the entire string unquoted, with None for both the charset and the language. Also, if there are more than 2 ticks in the parameter, interpret the first three parts as the standard RFC 2231 parts, then the rest of the parts as the encoded string. Test cases added. Original fewer-than-3-parts fix by Tokio Kikuchi. Resolves SF bug # 1218081. I will back port the fix and tests to Python 2.4 (email 3.0) and Python 2.3 (email 2.5). Also, bump the version number to email 4.0.1, removing the 'alpha' moniker. ........ r50695 | kurt.kaiser | 2006-07-18 06:03:16 +0200 (Tue, 18 Jul 2006) | 2 lines Rebinding Tab key was inserting 'tab' instead of 'Tab'. Bug 1179168. ........ r50696 | brett.cannon | 2006-07-18 06:41:36 +0200 (Tue, 18 Jul 2006) | 6 lines Fix bug #1520914. Starting in 2.4, time.strftime() began to check the bounds of values in the time tuple passed in. Unfortunately people came to rely on undocumented behaviour of setting unneeded values to 0, regardless of if it was within the valid range. Now those values force the value internally to the minimum value when 0 is passed in. ........ r50697 | facundo.batista | 2006-07-18 14:16:13 +0200 (Tue, 18 Jul 2006) | 1 line Comments and docs cleanups, and some little fixes, provided by Santiágo Peresón ........ r50704 | martin.v.loewis | 2006-07-18 19:46:31 +0200 (Tue, 18 Jul 2006) | 2 lines Patch #1524429: Use repr instead of backticks again. ........ r50706 | tim.peters | 2006-07-18 23:55:15 +0200 (Tue, 18 Jul 2006) | 2 lines Whitespace normalization. ........ r50708 | tim.peters | 2006-07-19 02:03:19 +0200 (Wed, 19 Jul 2006) | 18 lines SF bug 1524317: configure --without-threads fails to build Moved the code for _PyThread_CurrentFrames() up, so it's no longer in a huge "#ifdef WITH_THREAD" block (I didn't realize it /was/ in one). Changed test_sys's test_current_frames() so it passes with or without thread supported compiled in. Note that test_sys fails when Python is compiled without threads, but for an unrelated reason (the old test_exit() fails with an indirect ImportError on the `thread` module). There are also other unrelated compilation failures without threads, in extension modules (like ctypes); at least the core compiles again. Do we really support --without-threads? If so, there are several problems remaining. ........ r50713 | thomas.heller | 2006-07-19 11:09:32 +0200 (Wed, 19 Jul 2006) | 4 lines Make sure the _ctypes extension can be compiled when WITH_THREAD is not defined on Windows, even if that configuration is probably not supported at all. ........ r50715 | martin.v.loewis | 2006-07-19 19:18:32 +0200 (Wed, 19 Jul 2006) | 4 lines Revert r50706 (Whitespace normalization) and r50697: Comments and docs cleanups, and some little fixes per recommendation from Raymond Hettinger. ........ r50719 | phillip.eby | 2006-07-20 17:54:16 +0200 (Thu, 20 Jul 2006) | 4 lines Fix SF#1516184 (again) and add a test to prevent regression. (There was a problem with empty filenames still causing recursion) ........ r50720 | georg.brandl | 2006-07-20 18:28:39 +0200 (Thu, 20 Jul 2006) | 3 lines Guard for _active being None in __del__ method. ........ r50721 | vinay.sajip | 2006-07-20 18:28:39 +0200 (Thu, 20 Jul 2006) | 1 line Updated documentation for TimedRotatingFileHandler relating to how rollover files are named. The previous documentation was wrongly the same as for RotatingFileHandler. ........ r50731 | fred.drake | 2006-07-20 22:11:57 +0200 (Thu, 20 Jul 2006) | 1 line markup fix ........ r50739 | kurt.kaiser | 2006-07-21 00:22:52 +0200 (Fri, 21 Jul 2006) | 7 lines Avoid occasional failure to detect closing paren properly. Patch 1407280 Tal Einat M ParenMatch.py M NEWS.txt M CREDITS.txt ........ r50740 | vinay.sajip | 2006-07-21 01:20:12 +0200 (Fri, 21 Jul 2006) | 1 line Addressed SF#1524081 by using a dictionary to map level names to syslog priority names, rather than a string.lower(). ........ r50741 | neal.norwitz | 2006-07-21 07:29:58 +0200 (Fri, 21 Jul 2006) | 1 line Add some asserts that we got good params passed ........ r50742 | neal.norwitz | 2006-07-21 07:31:02 +0200 (Fri, 21 Jul 2006) | 5 lines Move the initialization of some pointers earlier. The problem is that if we call Py_DECREF(frame) like we do if allocating locals fails, frame_dealloc() will try to use these bogus values and crash. ........ r50743 | neal.norwitz | 2006-07-21 07:32:28 +0200 (Fri, 21 Jul 2006) | 4 lines Handle allocation failures gracefully. Found with failmalloc. Many (all?) of these could be backported. ........ r50745 | neal.norwitz | 2006-07-21 09:59:02 +0200 (Fri, 21 Jul 2006) | 1 line Speel initialise write. Tanks Anthony. ........ r50746 | neal.norwitz | 2006-07-21 09:59:47 +0200 (Fri, 21 Jul 2006) | 2 lines Handle more memory allocation failures without crashing. ........ r50754 | barry.warsaw | 2006-07-21 16:51:07 +0200 (Fri, 21 Jul 2006) | 23 lines More RFC 2231 improvements for the email 4.0 package. As Mark Sapiro rightly points out there are really two types of continued headers defined in this RFC (i.e. "encoded" parameters with the form "name*0*=" and unencoded parameters with the form "name*0="), but we were were handling them both the same way and that isn't correct. This patch should be much more RFC compliant in that only encoded params are %-decoded and the charset/language information is only extract if there are any encoded params in the segments. If there are no encoded params then the RFC says that there will be no charset/language parts. Note however that this will change the return value for Message.get_param() in some cases. For example, whereas before if you had all unencoded param continuations you would have still gotten a 3-tuple back from this method (with charset and language == None), you will now get just a string. I don't believe this is a backward incompatible change though because the documentation for this method already indicates that either return value is possible and that you must do an isinstance(val, tuple) check to discriminate between the two. (Yeah that API kind of sucks but we can't change /that/ without breaking code.) Test cases, some documentation updates, and a NEWS item accompany this patch. ........ r50759 | georg.brandl | 2006-07-21 19:36:31 +0200 (Fri, 21 Jul 2006) | 3 lines Fix check for empty list (vs. None). ........ r50771 | brett.cannon | 2006-07-22 00:44:07 +0200 (Sat, 22 Jul 2006) | 2 lines Remove an XXX marker in a comment. ........ r50773 | neal.norwitz | 2006-07-22 18:20:49 +0200 (Sat, 22 Jul 2006) | 1 line Fix more memory allocation issues found with failmalloc. ........ r50774 | neal.norwitz | 2006-07-22 19:00:57 +0200 (Sat, 22 Jul 2006) | 1 line Don't fail if the directory already exists ........ r50775 | greg.ward | 2006-07-23 04:25:53 +0200 (Sun, 23 Jul 2006) | 6 lines Be a lot smarter about whether this test passes: instead of assuming that a 2.93 sec audio file will always take 3.1 sec (as it did on the hardware I had when I first wrote the test), expect that it will take 2.93 sec +/- 10%, and only fail if it's outside of that range. Compute the expected ........ r50776 | kurt.kaiser | 2006-07-23 06:19:49 +0200 (Sun, 23 Jul 2006) | 2 lines Tooltips failed on new-syle class __init__ args. Bug 1027566 Loren Guthrie ........ r50777 | neal.norwitz | 2006-07-23 09:50:36 +0200 (Sun, 23 Jul 2006) | 1 line Handle more mem alloc issues found with failmalloc ........ r50778 | neal.norwitz | 2006-07-23 09:51:58 +0200 (Sun, 23 Jul 2006) | 5 lines If the for loop isn't entered, entryblock will be NULL. If passed to stackdepth_walk it will be dereffed. Not sure if I found with failmalloc or Klockwork #55. ........ r50779 | neal.norwitz | 2006-07-23 09:53:14 +0200 (Sun, 23 Jul 2006) | 4 lines Move the initialization of size_a down below the check for a being NULL. Reported by Klocwork #106 ........ r50780 | neal.norwitz | 2006-07-23 09:55:55 +0200 (Sun, 23 Jul 2006) | 9 lines Check the allocation of b_objects and return if there was a failure. Also fix a few memory leaks in other failure scenarios. It seems that if b_objects == Py_None, we will have an extra ref to b_objects. Add XXX comment so hopefully someone documents why the else isn't necessary or adds it in. Reported by Klocwork #20 ........ r50781 | neal.norwitz | 2006-07-23 09:57:11 +0200 (Sun, 23 Jul 2006) | 2 lines Fix memory leaks spotted by Klocwork #37. ........ r50782 | neal.norwitz | 2006-07-23 09:59:00 +0200 (Sun, 23 Jul 2006) | 5 lines nextlink can be NULL if teedataobject_new fails, so use XINCREF. Ensure that dataobj is never NULL. Reported by Klocwork #102 ........ r50783 | neal.norwitz | 2006-07-23 10:01:43 +0200 (Sun, 23 Jul 2006) | 8 lines Ensure we don't write beyond errText. I think I got this right, but it definitely could use some review to ensure I'm not off by one and there's no possible overflow/wrap-around of bytes_left. Reported by Klocwork #1. Fix a problem if there is a failure allocating self->db. Found with failmalloc. ........ r50784 | ronald.oussoren | 2006-07-23 11:41:09 +0200 (Sun, 23 Jul 2006) | 3 lines Without this patch CMD-W won't close EditorWindows on MacOS X. This solves part of bug #1517990. ........ r50785 | ronald.oussoren | 2006-07-23 11:46:11 +0200 (Sun, 23 Jul 2006) | 5 lines Fix for bug #1517996: Class and Path browsers show Tk menu This patch replaces the menubar that is used by AquaTk for windows without a menubar of their own by one that is more appropriate for IDLE. ........ r50786 | andrew.macintyre | 2006-07-23 14:57:02 +0200 (Sun, 23 Jul 2006) | 2 lines Build updates for OS/2 EMX port ........ r50787 | andrew.macintyre | 2006-07-23 15:00:04 +0200 (Sun, 23 Jul 2006) | 3 lines bugfix: PyThread_start_new_thread() returns the thread ID, not a flag; will backport. ........ r50789 | andrew.macintyre | 2006-07-23 15:04:00 +0200 (Sun, 23 Jul 2006) | 2 lines Get mailbox module working on OS/2 EMX port. ........ r50791 | greg.ward | 2006-07-23 18:05:51 +0200 (Sun, 23 Jul 2006) | 1 line Resync optparse with Optik 1.5.3: minor tweaks for/to tests. ........ r50794 | martin.v.loewis | 2006-07-24 07:05:22 +0200 (Mon, 24 Jul 2006) | 2 lines Update list of unsupported systems. Fixes #1510853. ........ r50795 | martin.v.loewis | 2006-07-24 12:26:33 +0200 (Mon, 24 Jul 2006) | 1 line Patch #1448199: Release GIL around ConnectRegistry. ........ r50796 | martin.v.loewis | 2006-07-24 13:54:53 +0200 (Mon, 24 Jul 2006) | 3 lines Patch #1232023: Don't include empty path component from registry, so that the current directory does not get added to sys.path. Also fixes #1526785. ........ r50797 | martin.v.loewis | 2006-07-24 14:54:17 +0200 (Mon, 24 Jul 2006) | 3 lines Bug #1524310: Properly report errors from FindNextFile in os.listdir. Will backport to 2.4. ........ r50800 | georg.brandl | 2006-07-24 15:28:57 +0200 (Mon, 24 Jul 2006) | 7 lines Patch #1523356: fix determining include dirs in python-config. Also don't install "python-config" when doing altinstall, but always install "python-config2.x" and make a link to it like with the main executable. ........ r50802 | georg.brandl | 2006-07-24 15:46:47 +0200 (Mon, 24 Jul 2006) | 3 lines Patch #1527744: right order of includes in order to have HAVE_CONIO_H defined properly. ........ r50803 | georg.brandl | 2006-07-24 16:09:56 +0200 (Mon, 24 Jul 2006) | 3 lines Patch #1515343: Fix printing of deprecated string exceptions with a value in the traceback module. ........ r50804 | kurt.kaiser | 2006-07-24 19:13:23 +0200 (Mon, 24 Jul 2006) | 7 lines EditorWindow failed when used stand-alone if sys.ps1 not set. Bug 1010370 Dave Florek M EditorWindow.py M PyShell.py M NEWS.txt ........ r50805 | kurt.kaiser | 2006-07-24 20:05:51 +0200 (Mon, 24 Jul 2006) | 6 lines - EditorWindow.test() was failing. Bug 1417598 M EditorWindow.py M ScriptBinding.py M NEWS.txt ........ r50808 | georg.brandl | 2006-07-24 22:11:35 +0200 (Mon, 24 Jul 2006) | 3 lines Repair accidental NameError. ........ r50809 | tim.peters | 2006-07-24 23:02:15 +0200 (Mon, 24 Jul 2006) | 2 lines Whitespace normalization. ........ r50810 | greg.ward | 2006-07-25 04:11:12 +0200 (Tue, 25 Jul 2006) | 3 lines Don't use standard assert: want tests to fail even when run with -O. Delete cruft. ........ r50811 | tim.peters | 2006-07-25 06:07:22 +0200 (Tue, 25 Jul 2006) | 10 lines current_frames_with_threads(): There's actually no way to guess /which/ line the spawned thread is in at the time sys._current_frames() is called: we know it finished enter_g.set(), but can't know whether the instruction counter has advanced to the following leave_g.wait(). The latter is overwhelming most likely, but not guaranteed, and I see that the "x86 Ubuntu dapper (icc) trunk" buildbot found it on the other line once. Changed the test so it passes in either case. ........ r50815 | martin.v.loewis | 2006-07-25 11:53:12 +0200 (Tue, 25 Jul 2006) | 2 lines Bug #1525817: Don't truncate short lines in IDLE's tool tips. ........ r50816 | martin.v.loewis | 2006-07-25 12:05:47 +0200 (Tue, 25 Jul 2006) | 3 lines Bug #978833: Really close underlying socket in _socketobject.close. Will backport to 2.4. ........ r50817 | martin.v.loewis | 2006-07-25 12:11:14 +0200 (Tue, 25 Jul 2006) | 1 line Revert incomplete checkin. ........ r50819 | georg.brandl | 2006-07-25 12:22:34 +0200 (Tue, 25 Jul 2006) | 4 lines Patch #1525766: correctly pass onerror arg to recursive calls of pkg.walk_packages. Also improve the docstrings. ........ r50825 | brett.cannon | 2006-07-25 19:32:20 +0200 (Tue, 25 Jul 2006) | 2 lines Add comment for changes to test_ossaudiodev. ........ r50826 | brett.cannon | 2006-07-25 19:34:36 +0200 (Tue, 25 Jul 2006) | 3 lines Fix a bug in the messages for an assert failure where not enough arguments to a string were being converted in the format. ........ r50828 | armin.rigo | 2006-07-25 20:09:57 +0200 (Tue, 25 Jul 2006) | 2 lines Document why is and is not a good way to fix the gc_inspection crasher. ........ r50829 | armin.rigo | 2006-07-25 20:11:07 +0200 (Tue, 25 Jul 2006) | 5 lines Added another crasher, which hit me today (I was not intentionally writing such code, of course, but it took some gdb time to figure out what my bug was). ........ r50830 | armin.rigo | 2006-07-25 20:38:39 +0200 (Tue, 25 Jul 2006) | 3 lines Document the crashers that will not go away soon as "won't fix", and explain why. ........ r50831 | ronald.oussoren | 2006-07-25 21:13:35 +0200 (Tue, 25 Jul 2006) | 3 lines Install the compatibility symlink to libpython.a on OSX using 'ln -sf' instead of 'ln -s', this avoid problems when reinstalling python. ........ r50832 | ronald.oussoren | 2006-07-25 21:20:54 +0200 (Tue, 25 Jul 2006) | 7 lines Fix for bug #1525447 (renaming to MacOSmodule.c would also work, but not without causing problems for anyone that is on a case-insensitive filesystem). Setup.py tries to compile the MacOS extension from MacOSmodule.c, while the actual file is named macosmodule.c. This is no problem on the (default) case-insensitive filesystem, but doesn't work on case-sensitive filesystems. ........ r50833 | ronald.oussoren | 2006-07-25 22:28:55 +0200 (Tue, 25 Jul 2006) | 7 lines Fix bug #1517990: IDLE keybindings on OSX This adds a new key definition for OSX, which is slightly different from the classic mac definition. Also add NEWS item for a couple of bugfixes I added recently. ........ r50834 | tim.peters | 2006-07-26 00:30:24 +0200 (Wed, 26 Jul 2006) | 2 lines Whitespace normalization. ........ r50839 | neal.norwitz | 2006-07-26 06:00:18 +0200 (Wed, 26 Jul 2006) | 1 line Hmm, only python2.x is installed, not plain python. Did that change recently? ........ r50840 | barry.warsaw | 2006-07-26 07:54:46 +0200 (Wed, 26 Jul 2006) | 6 lines Forward port some fixes that were in email 2.5 but for some reason didn't make it into email 4.0. Specifically, in Message.get_content_charset(), handle RFC 2231 headers that contain an encoding not known to Python, or a character in the data that isn't in the charset encoding. Also forward port the appropriate unit tests. ........ r50841 | georg.brandl | 2006-07-26 09:23:32 +0200 (Wed, 26 Jul 2006) | 3 lines NEWS entry for #1525766. ........ r50842 | georg.brandl | 2006-07-26 09:40:17 +0200 (Wed, 26 Jul 2006) | 3 lines Bug #1459963: properly capitalize HTTP header names. ........ r50843 | georg.brandl | 2006-07-26 10:03:10 +0200 (Wed, 26 Jul 2006) | 6 lines Part of bug #1523610: fix miscalculation of buffer length. Also add a guard against NULL in converttuple and add a test case (that previously would have crashed). ........ r50844 | martin.v.loewis | 2006-07-26 14:12:56 +0200 (Wed, 26 Jul 2006) | 3 lines Bug #978833: Really close underlying socket in _socketobject.close. Fix httplib.HTTPConnection.getresponse to not close the socket if it is still needed for the response. ........ r50845 | andrew.kuchling | 2006-07-26 19:16:52 +0200 (Wed, 26 Jul 2006) | 1 line [Bug #1471938] Fix build problem on Solaris 8 by conditionalizing the use of mvwgetnstr(); it was conditionalized a few lines below. Fix from Paul Eggert. I also tried out the STRICT_SYSV_CURSES case and am therefore removing the 'untested' comment. ........ r50846 | andrew.kuchling | 2006-07-26 19:18:01 +0200 (Wed, 26 Jul 2006) | 1 line Correct error message ........ r50847 | andrew.kuchling | 2006-07-26 19:19:39 +0200 (Wed, 26 Jul 2006) | 1 line Minor grammar fix ........ r50848 | andrew.kuchling | 2006-07-26 19:22:21 +0200 (Wed, 26 Jul 2006) | 1 line Put news item in right section ........ r50850 | andrew.kuchling | 2006-07-26 20:03:12 +0200 (Wed, 26 Jul 2006) | 1 line Use sys.exc_info() ........ r50851 | andrew.kuchling | 2006-07-26 20:15:45 +0200 (Wed, 26 Jul 2006) | 1 line Use sys.exc_info() ........ r50852 | phillip.eby | 2006-07-26 21:48:27 +0200 (Wed, 26 Jul 2006) | 4 lines Allow the 'onerror' argument to walk_packages() to catch any Exception, not just ImportError. This allows documentation tools to better skip unimportable packages. ........ r50854 | tim.peters | 2006-07-27 01:23:15 +0200 (Thu, 27 Jul 2006) | 2 lines Whitespace normalization. ........ r50855 | tim.peters | 2006-07-27 03:14:53 +0200 (Thu, 27 Jul 2006) | 21 lines Bug #1521947: possible bug in mystrtol.c with recent gcc. In general, C doesn't define anything about what happens when an operation on a signed integral type overflows, and PyOS_strtol() did several formally undefined things of that nature on signed longs. Some version of gcc apparently tries to exploit that now, and PyOS_strtol() could fail to detect overflow then. Tried to repair all that, although it seems at least as likely to me that we'll get screwed by bad platform definitions for LONG_MIN and/or LONG_MAX now. For that reason, I don't recommend backporting this. Note that I have no box on which this makes a lick of difference -- can't really test it, except to note that it didn't break anything on my boxes. Silent change: PyOS_strtol() used to return the hard-coded 0x7fffffff in case of overflow. Now it returns LONG_MAX. They're the same only on 32-bit boxes (although C doesn't guarantee that either ...). ........ r50856 | neal.norwitz | 2006-07-27 05:51:58 +0200 (Thu, 27 Jul 2006) | 6 lines Don't kill a normal instance of python running on windows when checking to kill a cygwin instance. build\\python.exe was matching a normal windows instance. Prefix that with a \\ to ensure build is a directory and not PCbuild. As discussed on python-dev. ........ r50857 | neal.norwitz | 2006-07-27 05:55:39 +0200 (Thu, 27 Jul 2006) | 5 lines Closure can't be NULL at this point since we know it's a tuple. Reported by Klocwork # 74. ........ r50858 | neal.norwitz | 2006-07-27 06:04:50 +0200 (Thu, 27 Jul 2006) | 1 line No functional change. Add comment and assert to describe why there cannot be overflow which was reported by Klocwork. Discussed on python-dev ........ r50859 | martin.v.loewis | 2006-07-27 08:38:16 +0200 (Thu, 27 Jul 2006) | 3 lines Bump distutils version to 2.5, as several new features have been introduced since 2.4. ........ r50860 | andrew.kuchling | 2006-07-27 14:18:20 +0200 (Thu, 27 Jul 2006) | 1 line Reformat docstring; fix typo ........ r50861 | georg.brandl | 2006-07-27 17:05:36 +0200 (Thu, 27 Jul 2006) | 6 lines Add test_main() methods. These three tests were never run by regrtest.py. We really need a simpler testing framework. ........ r50862 | tim.peters | 2006-07-27 17:09:20 +0200 (Thu, 27 Jul 2006) | 2 lines News for patch #1529686. ........ r50863 | tim.peters | 2006-07-27 17:11:00 +0200 (Thu, 27 Jul 2006) | 2 lines Whitespace normalization. ........ r50864 | georg.brandl | 2006-07-27 17:38:33 +0200 (Thu, 27 Jul 2006) | 3 lines Amend news entry. ........ r50865 | georg.brandl | 2006-07-27 18:08:15 +0200 (Thu, 27 Jul 2006) | 3 lines Make uuid test suite pass on this box by requesting output with LC_ALL=C. ........ r50866 | andrew.kuchling | 2006-07-27 20:37:33 +0200 (Thu, 27 Jul 2006) | 1 line Add example ........ r50867 | thomas.heller | 2006-07-27 20:39:55 +0200 (Thu, 27 Jul 2006) | 9 lines Remove code that is no longer used (ctypes.com). Fix the DllGetClassObject and DllCanUnloadNow so that they forward the call to the comtypes.server.inprocserver module. The latter was never documented, never used by published code, and didn't work anyway, so I think it does not deserve a NEWS entry (but I might be wrong). ........ r50868 | andrew.kuchling | 2006-07-27 20:41:21 +0200 (Thu, 27 Jul 2006) | 1 line Typo fix ('publically' is rare, poss. non-standard) ........ r50869 | andrew.kuchling | 2006-07-27 20:42:41 +0200 (Thu, 27 Jul 2006) | 1 line Add missing word ........ r50870 | andrew.kuchling | 2006-07-27 20:44:10 +0200 (Thu, 27 Jul 2006) | 1 line Repair typos ........ r50872 | andrew.kuchling | 2006-07-27 20:53:33 +0200 (Thu, 27 Jul 2006) | 1 line Update URL; add example ........ r50873 | andrew.kuchling | 2006-07-27 21:07:29 +0200 (Thu, 27 Jul 2006) | 1 line Add punctuation mark; add some examples ........ r50874 | andrew.kuchling | 2006-07-27 21:11:07 +0200 (Thu, 27 Jul 2006) | 1 line Mention base64 module; rewrite last sentence to be more positive ........ r50875 | andrew.kuchling | 2006-07-27 21:12:49 +0200 (Thu, 27 Jul 2006) | 1 line If binhex is higher-level than binascii, it should come first in the chapter ........ r50876 | tim.peters | 2006-07-27 22:47:24 +0200 (Thu, 27 Jul 2006) | 28 lines check_node(): stop spraying mystery output to stderr. When a node number disagrees, keep track of all sources & the node numbers they reported, and stick all that in the error message. Changed all callers to supply a non-empty "source" argument; made the "source" argument non-optional. On my box, test_uuid still fails, but with the less confusing output: AssertionError: different sources disagree on node: from source 'getnode1', node was 00038a000015 from source 'getnode2', node was 00038a000015 from source 'ipconfig', node was 001111b2b7bf Only the last one appears to be correct; e.g., C:\Code\python\PCbuild>getmac Physical Address Transport Name =================== ========================================================== 00-11-11-B2-B7-BF \Device\Tcpip_{190FB163-5AFD-4483-86A1-2FE16AC61FF1} 62-A1-AC-6C-FD-BE \Device\Tcpip_{8F77DF5A-EA3D-4F1D-975E-D472CEE6438A} E2-1F-01-C6-5D-88 \Device\Tcpip_{CD18F76B-2EF3-409F-9B8A-6481EE70A1E4} I can't find anything on my box with MAC 00-03-8a-00-00-15, and am not clear on where that comes from. ........ r50878 | andrew.kuchling | 2006-07-28 00:40:05 +0200 (Fri, 28 Jul 2006) | 1 line Reword paragraph ........ r50879 | andrew.kuchling | 2006-07-28 00:49:38 +0200 (Fri, 28 Jul 2006) | 1 line Add example ........ r50880 | andrew.kuchling | 2006-07-28 00:49:54 +0200 (Fri, 28 Jul 2006) | 1 line Add example ........ r50881 | barry.warsaw | 2006-07-28 01:43:15 +0200 (Fri, 28 Jul 2006) | 27 lines Patch #1520294: Support for getset and member descriptors in types.py, inspect.py, and pydoc.py. Specifically, this allows for querying the type of an object against these built-in C types and more importantly, for getting their docstrings printed in the interactive interpreter's help() function. This patch includes a new built-in module called _types which provides definitions of getset and member descriptors for use by the types.py module. These types are exposed as types.GetSetDescriptorType and types.MemberDescriptorType. Query functions are provided as inspect.isgetsetdescriptor() and inspect.ismemberdescriptor(). The implementations of these are robust enough to work with Python implementations other than CPython, which may not have these fundamental types. The patch also includes documentation and test suite updates. I commit these changes now under these guiding principles: 1. Silence is assent. The release manager has not said "no", and of the few people that cared enough to respond to the thread, the worst vote was "0". 2. It's easier to ask for forgiveness than permission. 3. It's so dang easy to revert stuff in svn, that you could view this as a forcing function. :) Windows build patches will follow. ........ r50882 | tim.peters | 2006-07-28 01:44:37 +0200 (Fri, 28 Jul 2006) | 4 lines Bug #1529297: The rewrite of doctest for Python 2.4 unintentionally lost that tests are sorted by name before being run. ``DocTestFinder`` has been changed to sort the list of tests it returns. ........ r50883 | tim.peters | 2006-07-28 01:45:48 +0200 (Fri, 28 Jul 2006) | 2 lines Whitespace normalization. ........ r50884 | tim.peters | 2006-07-28 01:46:36 +0200 (Fri, 28 Jul 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r50885 | barry.warsaw | 2006-07-28 01:50:40 +0200 (Fri, 28 Jul 2006) | 4 lines Enable the building of the _types module on Windows. Note that this has only been tested for VS 2003 since that's all I have. ........ r50887 | tim.peters | 2006-07-28 02:23:15 +0200 (Fri, 28 Jul 2006) | 7 lines defdict_reduce(): Plug leaks. We didn't notice these before because test_defaultdict didn't actually do anything before Georg fixed that earlier today. Neal's next refleak run then showed test_defaultdict leaking 9 references on each run. That's repaired by this checkin. ........ r50888 | tim.peters | 2006-07-28 02:30:00 +0200 (Fri, 28 Jul 2006) | 2 lines News about the repaired memory leak in defaultdict. ........ r50889 | gregory.p.smith | 2006-07-28 03:35:25 +0200 (Fri, 28 Jul 2006) | 7 lines - pybsddb Bug #1527939: bsddb module DBEnv dbremove and dbrename methods now allow their database parameter to be None as the sleepycat API allows. Also adds an appropriate test case for DBEnv.dbrename and dbremove. ........ r50895 | neal.norwitz | 2006-07-28 06:22:34 +0200 (Fri, 28 Jul 2006) | 1 line Ensure the actual number matches the expected count ........ r50896 | tim.peters | 2006-07-28 06:51:59 +0200 (Fri, 28 Jul 2006) | 6 lines Live with that "the hardware address" is an ill-defined concept, and that different ways of trying to find "the hardware address" may return different results. Certainly true on both of my Windows boxes, and in different ways (see whining on python-dev). ........ r50897 | neal.norwitz | 2006-07-28 09:21:27 +0200 (Fri, 28 Jul 2006) | 3 lines Try to find the MAC addr on various flavours of Unix. This seems hopeless. The reduces the test_uuid failures, but there's still another method failing. ........ r50898 | martin.v.loewis | 2006-07-28 09:45:49 +0200 (Fri, 28 Jul 2006) | 2 lines Add UUID for upcoming 2.5b3. ........ r50899 | matt.fleming | 2006-07-28 13:27:27 +0200 (Fri, 28 Jul 2006) | 3 lines Allow socketmodule to compile on NetBSD -current, whose bluetooth API differs from both Linux and FreeBSD. Accepted by Neal Norwitz. ........ r50900 | andrew.kuchling | 2006-07-28 14:07:12 +0200 (Fri, 28 Jul 2006) | 1 line [Patch #1529811] Correction to description of r|* mode ........ r50901 | andrew.kuchling | 2006-07-28 14:18:22 +0200 (Fri, 28 Jul 2006) | 1 line Typo fix ........ r50902 | andrew.kuchling | 2006-07-28 14:32:43 +0200 (Fri, 28 Jul 2006) | 1 line Add example ........ r50903 | andrew.kuchling | 2006-07-28 14:33:19 +0200 (Fri, 28 Jul 2006) | 1 line Add example ........ r50904 | andrew.kuchling | 2006-07-28 14:45:55 +0200 (Fri, 28 Jul 2006) | 1 line Don't overwrite built-in name; add some blank lines for readability ........ r50905 | andrew.kuchling | 2006-07-28 14:48:07 +0200 (Fri, 28 Jul 2006) | 1 line Add example. Should I propagate this example to all the other DBM-ish modules, too? ........ r50912 | georg.brandl | 2006-07-28 20:31:39 +0200 (Fri, 28 Jul 2006) | 3 lines Patch #1529686: also run test_email_codecs with regrtest.py. ........ r50913 | georg.brandl | 2006-07-28 20:36:01 +0200 (Fri, 28 Jul 2006) | 3 lines Fix spelling. ........ r50915 | thomas.heller | 2006-07-28 21:42:40 +0200 (Fri, 28 Jul 2006) | 3 lines Remove a useless XXX comment. Cosmetic changes to the code so that the #ifdef _UNICODE block doesn't mess emacs code formatting. ........ r50916 | phillip.eby | 2006-07-28 23:12:07 +0200 (Fri, 28 Jul 2006) | 5 lines Bug #1529871: The speed enhancement patch #921466 broke Python's compliance with PEP 302. This was fixed by adding an ``imp.NullImporter`` type that is used in ``sys.path_importer_cache`` to cache non-directory paths and avoid excessive filesystem operations during imports. ........ r50917 | phillip.eby | 2006-07-28 23:31:54 +0200 (Fri, 28 Jul 2006) | 2 lines Fix svn merge spew. ........ r50918 | thomas.heller | 2006-07-28 23:43:20 +0200 (Fri, 28 Jul 2006) | 4 lines Patch #1529514: More openbsd platforms for ctypes. Regenerated Modules/_ctypes/libffi/configure with autoconf 2.59. Approved by Neal. ........ r50922 | georg.brandl | 2006-07-29 10:51:21 +0200 (Sat, 29 Jul 2006) | 2 lines Bug #835255: The "closure" argument to new.function() is now documented. ........ r50924 | georg.brandl | 2006-07-29 11:33:26 +0200 (Sat, 29 Jul 2006) | 3 lines Bug #1441397: The compiler module now recognizes module and function docstrings correctly as it did in Python 2.4. ........ r50925 | georg.brandl | 2006-07-29 12:25:46 +0200 (Sat, 29 Jul 2006) | 4 lines Revert rev 42617, it was introduced to work around bug #1441397. test_compiler now passes again. ........ r50926 | fred.drake | 2006-07-29 15:22:49 +0200 (Sat, 29 Jul 2006) | 1 line update target version number ........ r50927 | andrew.kuchling | 2006-07-29 15:56:48 +0200 (Sat, 29 Jul 2006) | 1 line Add example ........ r50928 | andrew.kuchling | 2006-07-29 16:04:47 +0200 (Sat, 29 Jul 2006) | 1 line Update URL ........ r50930 | andrew.kuchling | 2006-07-29 16:08:15 +0200 (Sat, 29 Jul 2006) | 1 line Reword paragraph to match the order of the subsequent sections ........ r50931 | andrew.kuchling | 2006-07-29 16:21:15 +0200 (Sat, 29 Jul 2006) | 1 line [Bug #1529157] Mention raw_input() and input(); while I'm at it, reword the description a bit ........ r50932 | andrew.kuchling | 2006-07-29 16:42:48 +0200 (Sat, 29 Jul 2006) | 1 line [Bug #1519571] Document some missing functions: setup(), title(), done() ........ r50933 | andrew.kuchling | 2006-07-29 16:43:55 +0200 (Sat, 29 Jul 2006) | 1 line Fix docstring punctuation ........ r50934 | andrew.kuchling | 2006-07-29 17:10:32 +0200 (Sat, 29 Jul 2006) | 1 line [Bug #1414697] Change docstring of set/frozenset types to specify that the contents are unique. Raymond, please feel free to edit or revert. ........ r50935 | andrew.kuchling | 2006-07-29 17:35:21 +0200 (Sat, 29 Jul 2006) | 1 line [Bug #1530382] Document SSL.server(), .issuer() methods ........ r50936 | andrew.kuchling | 2006-07-29 17:42:46 +0200 (Sat, 29 Jul 2006) | 1 line Typo fix ........ r50937 | andrew.kuchling | 2006-07-29 17:43:13 +0200 (Sat, 29 Jul 2006) | 1 line Tweak wording ........ r50938 | matt.fleming | 2006-07-29 17:55:30 +0200 (Sat, 29 Jul 2006) | 2 lines Fix typo ........ r50939 | andrew.kuchling | 2006-07-29 17:57:08 +0200 (Sat, 29 Jul 2006) | 6 lines [Bug #1528258] Mention that the 'data' argument can be None. The constructor docs referred the reader to the add_data() method's docs, but they weren't very helpful. I've simply copied an earlier explanation of 'data' that's more useful. ........ r50940 | andrew.kuchling | 2006-07-29 18:08:40 +0200 (Sat, 29 Jul 2006) | 1 line Set bug/patch count. Take a bow, everyone! ........ r50941 | fred.drake | 2006-07-29 18:56:15 +0200 (Sat, 29 Jul 2006) | 18 lines expunge the xmlcore changes: 41667, 41668 - initial switch to xmlcore 47044 - mention of xmlcore in What's New 50687 - mention of xmlcore in the library reference re-apply xmlcore changes to xml: 41674 - line ending changes (re-applied manually), directory props 41677 - add cElementTree wrapper 41678 - PSF licensing for etree 41812 - whitespace normalization 42724 - fix svn:eol-style settings 43681, 43682 - remove Python version-compatibility cruft from minidom 46773 - fix encoding of \r\n\t in attr values in saxutils 47269 - added XMLParser alias for cElementTree compatibility additional tests were added in Lib/test/test_sax.py that failed with the xmlcore changes; these relate to SF bugs #1511497, #1513611 ........ r50942 | andrew.kuchling | 2006-07-29 20:14:07 +0200 (Sat, 29 Jul 2006) | 17 lines Reorganize the docs for 'file' and 'open()' after some discussion with Fred. We want to encourage users to write open() when opening a file, but open() was described with a single paragraph and 'file' had lots of explanation of the mode and bufsize arguments. I've shrunk the description of 'file' to cross-reference to the 'File objects' section, and to open() for an explanation of the arguments. open() now has all the paragraphs about the mode string. The bufsize argument was moved up so that it isn't buried at the end; now there's 1 paragraph on mode, 1 on bufsize, and then 3 more on mode. Various other edits and rearrangements were made in the process. It's probably best to read the final text and not to try to make sense of the diffs. ........ r50943 | fred.drake | 2006-07-29 20:19:19 +0200 (Sat, 29 Jul 2006) | 1 line restore test un-intentionally removed in the xmlcore purge (revision 50941) ........ r50944 | fred.drake | 2006-07-29 20:33:29 +0200 (Sat, 29 Jul 2006) | 3 lines make the reference to older versions of the documentation a link to the right page on python.org ........ r50945 | fred.drake | 2006-07-29 21:09:01 +0200 (Sat, 29 Jul 2006) | 1 line document the footnote usage pattern ........ r50947 | fred.drake | 2006-07-29 21:14:10 +0200 (Sat, 29 Jul 2006) | 1 line emphasize and oddball nuance of LaTeX comment syntax ........ r50948 | andrew.kuchling | 2006-07-29 21:24:04 +0200 (Sat, 29 Jul 2006) | 1 line [Patch #1490989 from Skip Montanaro] Mention debugging builds in the API documentation. I've changed Skip's patch to point to Misc/SpecialBuilds and fiddled with the markup a bit. ........ r50949 | neal.norwitz | 2006-07-29 21:29:35 +0200 (Sat, 29 Jul 2006) | 6 lines Disable these tests until they are reliable across platforms. These problems may mask more important, real problems. One or both methods are known to fail on: Solaris, OpenBSD, Debian, Ubuntu. They pass on Windows and some Linux boxes. ........ r50950 | andrew.kuchling | 2006-07-29 21:50:37 +0200 (Sat, 29 Jul 2006) | 1 line [Patch #1068277] Clarify that os.path.exists() can return False depending on permissions. Fred approved committing this patch in December 2004! ........ r50952 | fred.drake | 2006-07-29 22:04:42 +0200 (Sat, 29 Jul 2006) | 6 lines SF bug #1193966: Weakref types documentation misplaced The information about supporting weakrefs with types defined in C extensions is moved to the Extending & Embedding manual. Py_TPFLAGS_HAVE_WEAKREFS is no longer mentioned since it is part of Py_TPFLAGS_DEFAULT. ........ r50953 | skip.montanaro | 2006-07-29 22:06:05 +0200 (Sat, 29 Jul 2006) | 4 lines Add a comment to the csv reader documentation that explains why the treatment of newlines changed in 2.5. Pulled almost verbatim from a comment by Andrew McNamara in <http://python.org/sf/1465014>. ........ r50954 | neal.norwitz | 2006-07-29 22:20:52 +0200 (Sat, 29 Jul 2006) | 3 lines If the executable doesn't exist, there's no reason to try to start it. This prevents garbage about command not found being printed on Solaris. ........ r50955 | fred.drake | 2006-07-29 22:21:25 +0200 (Sat, 29 Jul 2006) | 1 line fix minor markup error that introduced extra punctuation ........ r50957 | neal.norwitz | 2006-07-29 22:37:08 +0200 (Sat, 29 Jul 2006) | 3 lines Disable test_getnode too, since this is also unreliable. ........ r50958 | andrew.kuchling | 2006-07-29 23:27:12 +0200 (Sat, 29 Jul 2006) | 1 line Follow TeX's conventions for hyphens ........ r50959 | andrew.kuchling | 2006-07-29 23:30:21 +0200 (Sat, 29 Jul 2006) | 1 line Fix case for 'Unix' ........ r50960 | fred.drake | 2006-07-30 01:34:57 +0200 (Sun, 30 Jul 2006) | 1 line markup cleanups ........ r50961 | andrew.kuchling | 2006-07-30 02:27:34 +0200 (Sun, 30 Jul 2006) | 1 line Minor typo fixes ........ r50962 | andrew.kuchling | 2006-07-30 02:37:56 +0200 (Sun, 30 Jul 2006) | 1 line [Bug #793553] Correct description of keyword arguments for SSL authentication ........ r50963 | tim.peters | 2006-07-30 02:58:15 +0200 (Sun, 30 Jul 2006) | 2 lines Whitespace normalization. ........ r50964 | fred.drake | 2006-07-30 05:03:43 +0200 (Sun, 30 Jul 2006) | 1 line lots of markup nits, most commonly Unix/unix --> \UNIX ........ r50965 | fred.drake | 2006-07-30 07:41:28 +0200 (Sun, 30 Jul 2006) | 1 line update information on wxPython, from Robin Dunn ........ r50966 | fred.drake | 2006-07-30 07:49:49 +0200 (Sun, 30 Jul 2006) | 4 lines remove possibly-outdated comment on what GUI toolkit is most commonly used; it is hard to know whether this is right, and it does not add valuable reference information at any rate ........ r50967 | fred.drake | 2006-07-30 07:55:39 +0200 (Sun, 30 Jul 2006) | 3 lines - remove yet another reference to how commonly Tkinter is (thought to be) used - fix an internal section reference ........ r50968 | neal.norwitz | 2006-07-30 08:53:31 +0200 (Sun, 30 Jul 2006) | 4 lines Patch #1531113: Fix augmented assignment with yield expressions. Also fix a SystemError when trying to assign to yield expressions. ........ r50969 | neal.norwitz | 2006-07-30 08:55:48 +0200 (Sun, 30 Jul 2006) | 5 lines Add PyErr_WarnEx() so C code can pass the stacklevel to warnings.warn(). This provides the proper warning for struct.pack(). PyErr_Warn() is now deprecated in favor of PyErr_WarnEx(). As mentioned by Tim Peters on python-dev. ........ r50970 | neal.norwitz | 2006-07-30 08:57:04 +0200 (Sun, 30 Jul 2006) | 3 lines Bug #1515471: string.replace() accepts character buffers again. Pass the char* and size around rather than PyObject's. ........ r50971 | neal.norwitz | 2006-07-30 08:59:13 +0200 (Sun, 30 Jul 2006) | 1 line Whitespace normalization ........ r50973 | georg.brandl | 2006-07-30 12:53:32 +0200 (Sun, 30 Jul 2006) | 3 lines Clarify that __op__ methods must return NotImplemented if they don't support the operation. ........ r50974 | georg.brandl | 2006-07-30 13:07:23 +0200 (Sun, 30 Jul 2006) | 3 lines Bug #1002398: The documentation for os.path.sameopenfile now correctly refers to file descriptors, not file objects. ........ r50977 | martin.v.loewis | 2006-07-30 15:00:31 +0200 (Sun, 30 Jul 2006) | 3 lines Don't copy directory stat times in shutil.copytree on Windows Fixes #1525866. ........ r50978 | martin.v.loewis | 2006-07-30 15:14:05 +0200 (Sun, 30 Jul 2006) | 3 lines Base __version__ on sys.version_info, as distutils is no longer maintained separatedly. ........ r50979 | martin.v.loewis | 2006-07-30 15:27:31 +0200 (Sun, 30 Jul 2006) | 3 lines Mention Cygwin in distutils error message about a missing VS 2003. Fixes #1257728. ........ r50982 | martin.v.loewis | 2006-07-30 16:09:47 +0200 (Sun, 30 Jul 2006) | 5 lines Drop usage of test -e in configure as it is not portable. Fixes #1439538 Will backport to 2.4 Also regenerate pyconfig.h.in. ........ r50984 | georg.brandl | 2006-07-30 18:20:10 +0200 (Sun, 30 Jul 2006) | 3 lines Fix makefile changes for python-config. ........ r50985 | george.yoshida | 2006-07-30 18:37:37 +0200 (Sun, 30 Jul 2006) | 2 lines Rename struct.pack_to to struct.pack_into as changed in revision 46642. ........ r50986 | george.yoshida | 2006-07-30 18:41:30 +0200 (Sun, 30 Jul 2006) | 2 lines Typo fix ........ r50987 | neal.norwitz | 2006-07-30 21:18:13 +0200 (Sun, 30 Jul 2006) | 1 line Add some asserts and update comments ........ r50988 | neal.norwitz | 2006-07-30 21:18:38 +0200 (Sun, 30 Jul 2006) | 1 line Verify that the signal handlers were really called ........ r50989 | neal.norwitz | 2006-07-30 21:20:42 +0200 (Sun, 30 Jul 2006) | 3 lines Try to prevent hangs on Tru64/Alpha buildbot. I'm not certain this will help and may need to be reverted if it causes problems. ........ r50990 | georg.brandl | 2006-07-30 22:18:51 +0200 (Sun, 30 Jul 2006) | 2 lines Bug #1531349: right <-> left glitch in __rop__ description. ........ r50992 | tim.peters | 2006-07-31 03:46:03 +0200 (Mon, 31 Jul 2006) | 2 lines Whitespace normalization. ........ r50993 | andrew.mcnamara | 2006-07-31 04:27:48 +0200 (Mon, 31 Jul 2006) | 2 lines Redo the comment about the 2.5 change in quoted-newline handling. ........ r50994 | tim.peters | 2006-07-31 04:40:23 +0200 (Mon, 31 Jul 2006) | 10 lines ZipFile.close(): Killed one of the struct.pack deprecation warnings on Win32. Also added an XXX about the line: pos3 = self.fp.tell() `pos3` is never referenced, and I have no idea what the code intended to do instead. ........ r50996 | tim.peters | 2006-07-31 04:53:03 +0200 (Mon, 31 Jul 2006) | 8 lines ZipFile.close(): Kill the other struct.pack deprecation warning on Windows. Afraid I can't detect a pattern to when the pack formats decide to use a signed or unsigned format code -- appears nearly arbitrary to my eyes. So I left all the pack formats alone and changed the special-case data values instead. ........ r50997 | skip.montanaro | 2006-07-31 05:09:45 +0200 (Mon, 31 Jul 2006) | 1 line minor tweaks ........ r50998 | skip.montanaro | 2006-07-31 05:11:11 +0200 (Mon, 31 Jul 2006) | 1 line minor tweaks ........ r50999 | andrew.kuchling | 2006-07-31 14:20:24 +0200 (Mon, 31 Jul 2006) | 1 line Add refcounts for PyErr_WarnEx ........ r51000 | andrew.kuchling | 2006-07-31 14:39:05 +0200 (Mon, 31 Jul 2006) | 9 lines Document PyErr_WarnEx. (Bad Neal! No biscuit!) Is the explanation of the 'stacklevel' parameter clear? Please feel free to edit it. I don't have LaTeX installed on this machine, so haven't verified that the markup is correct. Will check tonight, or maybe the automatic doc build will tell me. ........ r51001 | andrew.kuchling | 2006-07-31 14:52:26 +0200 (Mon, 31 Jul 2006) | 1 line Add PyErr_WarnEx() ........ r51002 | andrew.kuchling | 2006-07-31 15:18:27 +0200 (Mon, 31 Jul 2006) | 1 line Mention csv newline changes ........ r51003 | andrew.kuchling | 2006-07-31 17:22:58 +0200 (Mon, 31 Jul 2006) | 1 line Typo fix ........ r51004 | andrew.kuchling | 2006-07-31 17:23:43 +0200 (Mon, 31 Jul 2006) | 1 line Remove reference to notation ........ r51005 | georg.brandl | 2006-07-31 18:00:34 +0200 (Mon, 31 Jul 2006) | 3 lines Fix function name. ........ r51006 | andrew.kuchling | 2006-07-31 18:10:24 +0200 (Mon, 31 Jul 2006) | 1 line [Bug #1514540] Instead of putting the standard types in a section, put them in a chapter of their own. This means string methods will now show up in the ToC. (Should the types come before or after the functions+exceptions+constants chapter? I've put them after, for now.) ........ r51007 | andrew.kuchling | 2006-07-31 18:22:05 +0200 (Mon, 31 Jul 2006) | 1 line [Bug #848556] Remove \d* from second alternative to avoid exponential case when repeating match ........ r51008 | andrew.kuchling | 2006-07-31 18:27:57 +0200 (Mon, 31 Jul 2006) | 1 line Update list of files; fix a typo ........ r51013 | andrew.kuchling | 2006-08-01 18:24:30 +0200 (Tue, 01 Aug 2006) | 1 line typo fix ........ r51018 | thomas.heller | 2006-08-01 18:54:43 +0200 (Tue, 01 Aug 2006) | 2 lines Fix a potential segfault and various potentail refcount leaks in the cast() function. ........ r51020 | thomas.heller | 2006-08-01 19:46:10 +0200 (Tue, 01 Aug 2006) | 1 line Minimal useful docstring for CopyComPointer. ........ r51021 | andrew.kuchling | 2006-08-01 20:16:15 +0200 (Tue, 01 Aug 2006) | 8 lines [Patch #1520905] Attempt to suppress core file created by test_subprocess.py. Patch by Douglas Greiman. The test_run_abort() testcase produces a core file on Unix systems, even though the test is successful. This can be confusing or alarming to someone who runs 'make test' and then finds that the Python interpreter apparently crashed. ........ r51023 | georg.brandl | 2006-08-01 20:49:24 +0200 (Tue, 01 Aug 2006) | 3 lines os.urandom no longer masks unrelated exceptions like SystemExit or KeyboardInterrupt. ........ r51025 | thomas.heller | 2006-08-01 21:14:15 +0200 (Tue, 01 Aug 2006) | 2 lines Speed up PyType_stgdict and PyObject_stgdict. ........ r51027 | ronald.oussoren | 2006-08-01 22:30:31 +0200 (Tue, 01 Aug 2006) | 3 lines Make sure the postinstall action that optionally updates the user's profile on MacOS X actually works correctly in all cases. ........ r51028 | ronald.oussoren | 2006-08-01 23:00:57 +0200 (Tue, 01 Aug 2006) | 4 lines This fixes bug #1527397: PythonLauncher runs scripts with the wrong working directory. It also fixes a bug where PythonLauncher failed to launch scripts when the scriptname (or the path to the script) contains quotes. ........ r51031 | tim.peters | 2006-08-02 05:27:46 +0200 (Wed, 02 Aug 2006) | 2 lines Whitespace normalization. ........ r51032 | tim.peters | 2006-08-02 06:12:36 +0200 (Wed, 02 Aug 2006) | 19 lines Try to squash struct.pack warnings on the "amd64 gentoo trunk" buildbot (& possibly other 64-bit boxes) during test_gzip. The native zlib crc32 function returns an unsigned 32-bit integer, which the Python wrapper implicitly casts to C long. Therefore the same crc can "look negative" on a 32-bit box but "look positive" on a 64-bit box. This patch papers over that platform difference when writing the crc to file. It may be better to change the Python wrapper, either to make the result "look positive" on all platforms (which means it may have to return a Python long at times on a 32-bit box), or to keep the sign the same across boxes. But that would be a visible change in what users see, while the current hack changes no visible behavior (well, apart from stopping the struct deprecation warning). Note that the module-level write32() function is no longer used. ........ r51033 | neal.norwitz | 2006-08-02 06:27:11 +0200 (Wed, 02 Aug 2006) | 4 lines Prevent memory leak on error. Reported by Klocwork #36 ........ r51034 | tim.peters | 2006-08-02 07:20:08 +0200 (Wed, 02 Aug 2006) | 9 lines _Stream.close(): Try to kill struct.pack() warnings when writing the crc to file on the "PPC64 Debian trunk" buildbot when running test_tarfile. This is again a case where the native zlib crc is an unsigned 32-bit int, but the Python wrapper implicitly casts it to signed C long, so that "the sign bit looks different" on different platforms. ........ r51035 | ronald.oussoren | 2006-08-02 08:10:10 +0200 (Wed, 02 Aug 2006) | 2 lines Updated documentation for the script that builds the OSX installer. ........ r51036 | neal.norwitz | 2006-08-02 08:14:22 +0200 (Wed, 02 Aug 2006) | 2 lines _PyWeakref_GetWeakrefCount() now returns a Py_ssize_t instead of long. ........ r51037 | neal.norwitz | 2006-08-02 08:15:10 +0200 (Wed, 02 Aug 2006) | 1 line v is already checked for NULL, so just DECREF it ........ r51038 | neal.norwitz | 2006-08-02 08:19:19 +0200 (Wed, 02 Aug 2006) | 1 line Let us know when there was a problem and the child had to kill the parent ........ r51039 | neal.norwitz | 2006-08-02 08:46:21 +0200 (Wed, 02 Aug 2006) | 5 lines Patch #1519025 and bug #926423: If a KeyboardInterrupt occurs during a socket operation on a socket with a timeout, the exception will be caught correctly. Previously, the exception was not caught. ........ r51040 | neal.norwitz | 2006-08-02 09:09:32 +0200 (Wed, 02 Aug 2006) | 1 line Add some explanation about Klocwork and Coverity static analysis ........ r51041 | anthony.baxter | 2006-08-02 09:43:09 +0200 (Wed, 02 Aug 2006) | 1 line pre-release machinations ........ r51043 | thomas.heller | 2006-08-02 13:35:31 +0200 (Wed, 02 Aug 2006) | 4 lines A few nore words about what ctypes does. Document that using the wrong calling convention can also raise 'ValueError: Procedure called with the wrong number of arguments'. ........ r51045 | thomas.heller | 2006-08-02 14:00:13 +0200 (Wed, 02 Aug 2006) | 1 line Fix a mistake. ........ r51046 | martin.v.loewis | 2006-08-02 15:53:55 +0200 (Wed, 02 Aug 2006) | 3 lines Correction of patch #1455898: In the mbcs decoder, set final=False for stream decoder, but final=True for the decode function. ........ r51049 | tim.peters | 2006-08-02 20:19:35 +0200 (Wed, 02 Aug 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51079 | neal.norwitz | 2006-08-04 06:50:21 +0200 (Fri, 04 Aug 2006) | 3 lines Bug #1531405, format_exception no longer raises an exception if str(exception) raised an exception. ........ r51080 | neal.norwitz | 2006-08-04 06:58:47 +0200 (Fri, 04 Aug 2006) | 11 lines Bug #1191458: tracing over for loops now produces a line event on each iteration. I'm not positive this is the best way to handle this. I'm also not sure that there aren't other cases where the lnotab is generated incorrectly. It would be great if people that use pdb or tracing could test heavily. Also: * Remove dead/duplicated code that wasn't used/necessary because we already handled the docstring prior to entering the loop. * add some debugging code into the compiler (#if 0'd out). ........ r51081 | neal.norwitz | 2006-08-04 07:09:28 +0200 (Fri, 04 Aug 2006) | 4 lines Bug #1333982: string/number constants were inappropriately stored in the byte code and co_consts even if they were not used, ie immediately popped off the stack. ........ r51082 | neal.norwitz | 2006-08-04 07:12:19 +0200 (Fri, 04 Aug 2006) | 1 line There were really two issues ........ r51084 | fred.drake | 2006-08-04 07:17:21 +0200 (Fri, 04 Aug 2006) | 1 line SF patch #1534048 (bug #1531003): fix typo in error message ........ r51085 | gregory.p.smith | 2006-08-04 07:17:47 +0200 (Fri, 04 Aug 2006) | 3 lines fix typos ........ r51087 | georg.brandl | 2006-08-04 08:03:53 +0200 (Fri, 04 Aug 2006) | 3 lines Fix bug caused by first decrefing, then increfing. ........ r51109 | neil.schemenauer | 2006-08-04 18:20:30 +0200 (Fri, 04 Aug 2006) | 5 lines Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. In the 2.5 development cycle, MAKE_CLOSURE as changed to take free variables as a tuple rather than as individual items on the stack. Closes patch #1534084. ........ r51110 | georg.brandl | 2006-08-04 20:03:37 +0200 (Fri, 04 Aug 2006) | 3 lines Change fix for segfaulting property(), add a NEWS entry and a test. ........ r51111 | georg.brandl | 2006-08-04 20:07:34 +0200 (Fri, 04 Aug 2006) | 3 lines Better fix for bug #1531405, not executing str(value) twice. ........ r51112 | thomas.heller | 2006-08-04 20:17:40 +0200 (Fri, 04 Aug 2006) | 1 line On Windows, make PyErr_Warn an exported function again. ........ r51113 | thomas.heller | 2006-08-04 20:57:34 +0200 (Fri, 04 Aug 2006) | 4 lines Fix #1530448 - fix ctypes build failure on solaris 10. The '-mimpure-text' linker flag is required when linking _ctypes.so. ........ r51114 | thomas.heller | 2006-08-04 21:49:31 +0200 (Fri, 04 Aug 2006) | 3 lines Fix #1534738: win32 debug version of _msi must be _msi_d.pyd, not _msi.pyd. Fix the name of the pdb file as well. ........ r51115 | andrew.kuchling | 2006-08-04 22:37:43 +0200 (Fri, 04 Aug 2006) | 1 line Typo fixes ........ r51116 | andrew.kuchling | 2006-08-04 23:10:03 +0200 (Fri, 04 Aug 2006) | 1 line Fix mangled sentence ........ r51118 | tim.peters | 2006-08-05 00:00:35 +0200 (Sat, 05 Aug 2006) | 2 lines Whitespace normalization. ........ r51119 | bob.ippolito | 2006-08-05 01:59:21 +0200 (Sat, 05 Aug 2006) | 5 lines Fix #1530559, struct.pack raises TypeError where it used to convert. Passing float arguments to struct.pack when integers are expected now triggers a DeprecationWarning. ........ r51123 | georg.brandl | 2006-08-05 08:10:54 +0200 (Sat, 05 Aug 2006) | 3 lines Patch #1534922: correct and enhance unittest docs. ........ r51126 | georg.brandl | 2006-08-06 09:06:33 +0200 (Sun, 06 Aug 2006) | 2 lines Bug #1535182: really test the xreadlines() method of bz2 objects. ........ r51128 | georg.brandl | 2006-08-06 09:26:21 +0200 (Sun, 06 Aug 2006) | 4 lines Bug #1535081: A leading underscore has been added to the names of the md5 and sha modules, so add it in Modules/Setup.dist too. ........ r51129 | georg.brandl | 2006-08-06 10:23:54 +0200 (Sun, 06 Aug 2006) | 3 lines Bug #1535165: fixed a segfault in input() and raw_input() when sys.stdin is closed. ........ r51131 | georg.brandl | 2006-08-06 11:17:16 +0200 (Sun, 06 Aug 2006) | 2 lines Don't produce output in test_builtin. ........ r51133 | andrew.macintyre | 2006-08-06 14:37:03 +0200 (Sun, 06 Aug 2006) | 4 lines test_threading now skips testing alternate thread stack sizes on platforms that don't support changing thread stack size. ........ r51134 | andrew.kuchling | 2006-08-07 00:07:04 +0200 (Mon, 07 Aug 2006) | 2 lines [Patch #1464056] Ensure that we use the panelw library when linking with ncursesw. Once I see how the buildbots react, I'll backport this to 2.4. ........ r51137 | georg.brandl | 2006-08-08 13:52:34 +0200 (Tue, 08 Aug 2006) | 3 lines webbrowser: Silence stderr output if no gconftool or gnome browser found ........ r51138 | georg.brandl | 2006-08-08 13:56:21 +0200 (Tue, 08 Aug 2006) | 7 lines Remove "non-mapping" and "non-sequence" from TypeErrors raised by PyMapping_Size and PySequence_Size. Because len() tries first sequence, then mapping size, it will always raise a "non-mapping object has no len" error which is confusing. ........ r51139 | thomas.heller | 2006-08-08 19:37:00 +0200 (Tue, 08 Aug 2006) | 3 lines memcmp() can return values other than -1, 0, and +1 but tp_compare must not. ........ r51140 | thomas.heller | 2006-08-08 19:39:20 +0200 (Tue, 08 Aug 2006) | 1 line Remove accidently committed, duplicated test. ........ r51147 | andrew.kuchling | 2006-08-08 20:50:14 +0200 (Tue, 08 Aug 2006) | 1 line Reword paragraph to clarify ........ r51148 | andrew.kuchling | 2006-08-08 20:56:08 +0200 (Tue, 08 Aug 2006) | 1 line Move obmalloc item into C API section ........ r51149 | andrew.kuchling | 2006-08-08 21:00:14 +0200 (Tue, 08 Aug 2006) | 1 line 'Other changes' section now has only one item; move the item elsewhere and remove the section ........ r51150 | andrew.kuchling | 2006-08-08 21:00:34 +0200 (Tue, 08 Aug 2006) | 1 line Bump version number ........ r51151 | georg.brandl | 2006-08-08 22:11:22 +0200 (Tue, 08 Aug 2006) | 2 lines Bug #1536828: typo: TypeType should have been StringType. ........ r51153 | georg.brandl | 2006-08-08 22:13:13 +0200 (Tue, 08 Aug 2006) | 2 lines Bug #1536660: separate two words. ........ r51155 | georg.brandl | 2006-08-08 22:48:10 +0200 (Tue, 08 Aug 2006) | 3 lines ``str`` is now the same object as ``types.StringType``. ........ r51156 | tim.peters | 2006-08-09 02:52:26 +0200 (Wed, 09 Aug 2006) | 2 lines Whitespace normalization. ........ r51158 | georg.brandl | 2006-08-09 09:03:22 +0200 (Wed, 09 Aug 2006) | 4 lines Introduce an upper bound on tuple nesting depth in C argument format strings; fixes rest of #1523610. ........ r51160 | martin.v.loewis | 2006-08-09 09:57:39 +0200 (Wed, 09 Aug 2006) | 4 lines __hash__ may now return long int; the final hash value is obtained by invoking hash on the long int. Fixes #1536021. ........ r51168 | andrew.kuchling | 2006-08-09 15:03:41 +0200 (Wed, 09 Aug 2006) | 1 line [Bug #1536021] Mention __hash__ change ........ r51169 | andrew.kuchling | 2006-08-09 15:57:05 +0200 (Wed, 09 Aug 2006) | 1 line [Patch #1534027] Add notes on locale module changes ........ r51170 | andrew.kuchling | 2006-08-09 16:05:35 +0200 (Wed, 09 Aug 2006) | 1 line Add missing 'self' parameters ........ r51171 | andrew.kuchling | 2006-08-09 16:06:19 +0200 (Wed, 09 Aug 2006) | 1 line Reindent code ........ r51172 | armin.rigo | 2006-08-09 16:55:26 +0200 (Wed, 09 Aug 2006) | 2 lines Fix and test for an infinite C recursion. ........ r51173 | ronald.oussoren | 2006-08-09 16:56:33 +0200 (Wed, 09 Aug 2006) | 2 lines It's unlikely that future versions will require _POSIX_C_SOURCE ........ r51178 | armin.rigo | 2006-08-09 17:37:26 +0200 (Wed, 09 Aug 2006) | 2 lines Concatenation on a long string breaks (SF #1526585). ........ r51180 | kurt.kaiser | 2006-08-09 18:46:15 +0200 (Wed, 09 Aug 2006) | 8 lines 1. When used w/o subprocess, all exceptions were preceeded by an error message claiming they were IDLE internal errors (since 1.2a1). 2. Add Ronald Oussoren to CREDITS M NEWS.txt M PyShell.py M CREDITS.txt ........ r51181 | kurt.kaiser | 2006-08-09 19:47:15 +0200 (Wed, 09 Aug 2006) | 4 lines As a slight enhancement to the previous checkin, improve the internal error reporting by moving message to IDLE console. ........ r51182 | andrew.kuchling | 2006-08-09 20:23:14 +0200 (Wed, 09 Aug 2006) | 1 line Typo fix ........ r51183 | kurt.kaiser | 2006-08-09 22:34:46 +0200 (Wed, 09 Aug 2006) | 2 lines ToggleTab dialog was setting indent to 8 even if cancelled (since 1.2a1). ........ r51184 | martin.v.loewis | 2006-08-10 01:42:18 +0200 (Thu, 10 Aug 2006) | 2 lines Add some commentary on -mimpure-text. ........ r51185 | tim.peters | 2006-08-10 02:58:49 +0200 (Thu, 10 Aug 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51186 | kurt.kaiser | 2006-08-10 03:41:17 +0200 (Thu, 10 Aug 2006) | 2 lines Changing tokenize (39046) to detect dedent broke tabnanny check (since 1.2a1) ........ r51187 | tim.peters | 2006-08-10 05:01:26 +0200 (Thu, 10 Aug 2006) | 13 lines test_copytree_simple(): This was leaving behind two new temp directories each time it ran, at least on Windows. Several changes: explicitly closed all files; wrapped long lines; stopped suppressing errors when removing a file or directory fails (removing /shouldn't/ fail!); and changed what appeared to be incorrect usage of os.removedirs() (that doesn't remove empty directories at and /under/ the given path, instead it must be given an empty leaf directory and then deletes empty directories moving /up/ the path -- could be that the conceptually simpler shutil.rmtree() was really actually intended here). ........
8617 lines
214 KiB
C
8617 lines
214 KiB
C
|
|
/* POSIX module implementation */
|
|
|
|
/* This file is also used for Windows NT/MS-Win and OS/2. In that case the
|
|
module actually calls itself 'nt' or 'os2', not 'posix', and a few
|
|
functions are either unimplemented or implemented differently. The source
|
|
assumes that for Windows NT, the macro 'MS_WINDOWS' is defined independent
|
|
of the compiler used. Different compilers define their own feature
|
|
test macro, e.g. '__BORLANDC__' or '_MSC_VER'. For OS/2, the compiler
|
|
independent macro PYOS_OS2 should be defined. On OS/2 the default
|
|
compiler is assumed to be IBM's VisualAge C++ (VACPP). PYCC_GCC is used
|
|
as the compiler specific macro for the EMX port of gcc to OS/2. */
|
|
|
|
/* See also ../Dos/dosmodule.c */
|
|
|
|
#ifdef __APPLE__
|
|
/*
|
|
* Step 1 of support for weak-linking a number of symbols existing on
|
|
* OSX 10.4 and later, see the comment in the #ifdef __APPLE__ block
|
|
* at the end of this file for more information.
|
|
*/
|
|
# pragma weak lchown
|
|
# pragma weak statvfs
|
|
# pragma weak fstatvfs
|
|
|
|
#endif /* __APPLE__ */
|
|
|
|
#define PY_SSIZE_T_CLEAN
|
|
|
|
#include "Python.h"
|
|
#include "structseq.h"
|
|
|
|
#if defined(__VMS)
|
|
# include <unixio.h>
|
|
#endif /* defined(__VMS) */
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
PyDoc_STRVAR(posix__doc__,
|
|
"This module provides access to operating system functionality that is\n\
|
|
standardized by the C Standard and the POSIX standard (a thinly\n\
|
|
disguised Unix interface). Refer to the library manual and\n\
|
|
corresponding Unix manual entries for more information on calls.");
|
|
|
|
#ifndef Py_USING_UNICODE
|
|
/* This is used in signatures of functions. */
|
|
#define Py_UNICODE void
|
|
#endif
|
|
|
|
#if defined(PYOS_OS2)
|
|
#define INCL_DOS
|
|
#define INCL_DOSERRORS
|
|
#define INCL_DOSPROCESS
|
|
#define INCL_NOPMAPI
|
|
#include <os2.h>
|
|
#if defined(PYCC_GCC)
|
|
#include <ctype.h>
|
|
#include <io.h>
|
|
#include <stdio.h>
|
|
#include <process.h>
|
|
#endif
|
|
#include "osdefs.h"
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
#include <sys/types.h>
|
|
#endif /* HAVE_SYS_TYPES_H */
|
|
|
|
#ifdef HAVE_SYS_STAT_H
|
|
#include <sys/stat.h>
|
|
#endif /* HAVE_SYS_STAT_H */
|
|
|
|
#ifdef HAVE_SYS_WAIT_H
|
|
#include <sys/wait.h> /* For WNOHANG */
|
|
#endif
|
|
|
|
#ifdef HAVE_SIGNAL_H
|
|
#include <signal.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_FCNTL_H
|
|
#include <fcntl.h>
|
|
#endif /* HAVE_FCNTL_H */
|
|
|
|
#ifdef HAVE_GRP_H
|
|
#include <grp.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_SYSEXITS_H
|
|
#include <sysexits.h>
|
|
#endif /* HAVE_SYSEXITS_H */
|
|
|
|
#ifdef HAVE_SYS_LOADAVG_H
|
|
#include <sys/loadavg.h>
|
|
#endif
|
|
|
|
/* Various compilers have only certain posix functions */
|
|
/* XXX Gosh I wish these were all moved into pyconfig.h */
|
|
#if defined(PYCC_VACPP) && defined(PYOS_OS2)
|
|
#include <process.h>
|
|
#else
|
|
#if defined(__WATCOMC__) && !defined(__QNX__) /* Watcom compiler */
|
|
#define HAVE_GETCWD 1
|
|
#define HAVE_OPENDIR 1
|
|
#define HAVE_SYSTEM 1
|
|
#if defined(__OS2__)
|
|
#define HAVE_EXECV 1
|
|
#define HAVE_WAIT 1
|
|
#endif
|
|
#include <process.h>
|
|
#else
|
|
#ifdef __BORLANDC__ /* Borland compiler */
|
|
#define HAVE_EXECV 1
|
|
#define HAVE_GETCWD 1
|
|
#define HAVE_OPENDIR 1
|
|
#define HAVE_PIPE 1
|
|
#define HAVE_POPEN 1
|
|
#define HAVE_SYSTEM 1
|
|
#define HAVE_WAIT 1
|
|
#else
|
|
#ifdef _MSC_VER /* Microsoft compiler */
|
|
#define HAVE_GETCWD 1
|
|
#define HAVE_SPAWNV 1
|
|
#define HAVE_EXECV 1
|
|
#define HAVE_PIPE 1
|
|
#define HAVE_POPEN 1
|
|
#define HAVE_SYSTEM 1
|
|
#define HAVE_CWAIT 1
|
|
#define HAVE_FSYNC 1
|
|
#define fsync _commit
|
|
#else
|
|
#if defined(PYOS_OS2) && defined(PYCC_GCC) || defined(__VMS)
|
|
/* Everything needed is defined in PC/os2emx/pyconfig.h or vms/pyconfig.h */
|
|
#else /* all other compilers */
|
|
/* Unix functions that the configure script doesn't check for */
|
|
#define HAVE_EXECV 1
|
|
#define HAVE_FORK 1
|
|
#if defined(__USLC__) && defined(__SCO_VERSION__) /* SCO UDK Compiler */
|
|
#define HAVE_FORK1 1
|
|
#endif
|
|
#define HAVE_GETCWD 1
|
|
#define HAVE_GETEGID 1
|
|
#define HAVE_GETEUID 1
|
|
#define HAVE_GETGID 1
|
|
#define HAVE_GETPPID 1
|
|
#define HAVE_GETUID 1
|
|
#define HAVE_KILL 1
|
|
#define HAVE_OPENDIR 1
|
|
#define HAVE_PIPE 1
|
|
#ifndef __rtems__
|
|
#define HAVE_POPEN 1
|
|
#endif
|
|
#define HAVE_SYSTEM 1
|
|
#define HAVE_WAIT 1
|
|
#define HAVE_TTYNAME 1
|
|
#endif /* PYOS_OS2 && PYCC_GCC && __VMS */
|
|
#endif /* _MSC_VER */
|
|
#endif /* __BORLANDC__ */
|
|
#endif /* ! __WATCOMC__ || __QNX__ */
|
|
#endif /* ! __IBMC__ */
|
|
|
|
#ifndef _MSC_VER
|
|
|
|
#if defined(__sgi)&&_COMPILER_VERSION>=700
|
|
/* declare ctermid_r if compiling with MIPSPro 7.x in ANSI C mode
|
|
(default) */
|
|
extern char *ctermid_r(char *);
|
|
#endif
|
|
|
|
#ifndef HAVE_UNISTD_H
|
|
#if defined(PYCC_VACPP)
|
|
extern int mkdir(char *);
|
|
#else
|
|
#if ( defined(__WATCOMC__) || defined(_MSC_VER) ) && !defined(__QNX__)
|
|
extern int mkdir(const char *);
|
|
#else
|
|
extern int mkdir(const char *, mode_t);
|
|
#endif
|
|
#endif
|
|
#if defined(__IBMC__) || defined(__IBMCPP__)
|
|
extern int chdir(char *);
|
|
extern int rmdir(char *);
|
|
#else
|
|
extern int chdir(const char *);
|
|
extern int rmdir(const char *);
|
|
#endif
|
|
#ifdef __BORLANDC__
|
|
extern int chmod(const char *, int);
|
|
#else
|
|
extern int chmod(const char *, mode_t);
|
|
#endif
|
|
extern int chown(const char *, uid_t, gid_t);
|
|
extern char *getcwd(char *, int);
|
|
extern char *strerror(int);
|
|
extern int link(const char *, const char *);
|
|
extern int rename(const char *, const char *);
|
|
extern int stat(const char *, struct stat *);
|
|
extern int unlink(const char *);
|
|
extern int pclose(FILE *);
|
|
#ifdef HAVE_SYMLINK
|
|
extern int symlink(const char *, const char *);
|
|
#endif /* HAVE_SYMLINK */
|
|
#ifdef HAVE_LSTAT
|
|
extern int lstat(const char *, struct stat *);
|
|
#endif /* HAVE_LSTAT */
|
|
#endif /* !HAVE_UNISTD_H */
|
|
|
|
#endif /* !_MSC_VER */
|
|
|
|
#ifdef HAVE_UTIME_H
|
|
#include <utime.h>
|
|
#endif /* HAVE_UTIME_H */
|
|
|
|
#ifdef HAVE_SYS_UTIME_H
|
|
#include <sys/utime.h>
|
|
#define HAVE_UTIME_H /* pretend we do for the rest of this file */
|
|
#endif /* HAVE_SYS_UTIME_H */
|
|
|
|
#ifdef HAVE_SYS_TIMES_H
|
|
#include <sys/times.h>
|
|
#endif /* HAVE_SYS_TIMES_H */
|
|
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
#include <sys/param.h>
|
|
#endif /* HAVE_SYS_PARAM_H */
|
|
|
|
#ifdef HAVE_SYS_UTSNAME_H
|
|
#include <sys/utsname.h>
|
|
#endif /* HAVE_SYS_UTSNAME_H */
|
|
|
|
#ifdef HAVE_DIRENT_H
|
|
#include <dirent.h>
|
|
#define NAMLEN(dirent) strlen((dirent)->d_name)
|
|
#else
|
|
#if defined(__WATCOMC__) && !defined(__QNX__)
|
|
#include <direct.h>
|
|
#define NAMLEN(dirent) strlen((dirent)->d_name)
|
|
#else
|
|
#define dirent direct
|
|
#define NAMLEN(dirent) (dirent)->d_namlen
|
|
#endif
|
|
#ifdef HAVE_SYS_NDIR_H
|
|
#include <sys/ndir.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_DIR_H
|
|
#include <sys/dir.h>
|
|
#endif
|
|
#ifdef HAVE_NDIR_H
|
|
#include <ndir.h>
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef _MSC_VER
|
|
#ifdef HAVE_DIRECT_H
|
|
#include <direct.h>
|
|
#endif
|
|
#ifdef HAVE_IO_H
|
|
#include <io.h>
|
|
#endif
|
|
#ifdef HAVE_PROCESS_H
|
|
#include <process.h>
|
|
#endif
|
|
#include "osdefs.h"
|
|
#define _WIN32_WINNT 0x0400 /* Needed for CryptoAPI on some systems */
|
|
#include <windows.h>
|
|
#include <shellapi.h> /* for ShellExecute() */
|
|
#define popen _popen
|
|
#define pclose _pclose
|
|
#endif /* _MSC_VER */
|
|
|
|
#if defined(PYCC_VACPP) && defined(PYOS_OS2)
|
|
#include <io.h>
|
|
#endif /* OS2 */
|
|
|
|
#ifndef MAXPATHLEN
|
|
#if defined(PATH_MAX) && PATH_MAX > 1024
|
|
#define MAXPATHLEN PATH_MAX
|
|
#else
|
|
#define MAXPATHLEN 1024
|
|
#endif
|
|
#endif /* MAXPATHLEN */
|
|
|
|
#ifdef UNION_WAIT
|
|
/* Emulate some macros on systems that have a union instead of macros */
|
|
|
|
#ifndef WIFEXITED
|
|
#define WIFEXITED(u_wait) (!(u_wait).w_termsig && !(u_wait).w_coredump)
|
|
#endif
|
|
|
|
#ifndef WEXITSTATUS
|
|
#define WEXITSTATUS(u_wait) (WIFEXITED(u_wait)?((u_wait).w_retcode):-1)
|
|
#endif
|
|
|
|
#ifndef WTERMSIG
|
|
#define WTERMSIG(u_wait) ((u_wait).w_termsig)
|
|
#endif
|
|
|
|
#define WAIT_TYPE union wait
|
|
#define WAIT_STATUS_INT(s) (s.w_status)
|
|
|
|
#else /* !UNION_WAIT */
|
|
#define WAIT_TYPE int
|
|
#define WAIT_STATUS_INT(s) (s)
|
|
#endif /* UNION_WAIT */
|
|
|
|
/* Don't use the "_r" form if we don't need it (also, won't have a
|
|
prototype for it, at least on Solaris -- maybe others as well?). */
|
|
#if defined(HAVE_CTERMID_R) && defined(WITH_THREAD)
|
|
#define USE_CTERMID_R
|
|
#endif
|
|
|
|
#if defined(HAVE_TMPNAM_R) && defined(WITH_THREAD)
|
|
#define USE_TMPNAM_R
|
|
#endif
|
|
|
|
/* choose the appropriate stat and fstat functions and return structs */
|
|
#undef STAT
|
|
#if defined(MS_WIN64) || defined(MS_WINDOWS)
|
|
# define STAT win32_stat
|
|
# define FSTAT win32_fstat
|
|
# define STRUCT_STAT struct win32_stat
|
|
#else
|
|
# define STAT stat
|
|
# define FSTAT fstat
|
|
# define STRUCT_STAT struct stat
|
|
#endif
|
|
|
|
#if defined(MAJOR_IN_MKDEV)
|
|
#include <sys/mkdev.h>
|
|
#else
|
|
#if defined(MAJOR_IN_SYSMACROS)
|
|
#include <sys/sysmacros.h>
|
|
#endif
|
|
#if defined(HAVE_MKNOD) && defined(HAVE_SYS_MKDEV_H)
|
|
#include <sys/mkdev.h>
|
|
#endif
|
|
#endif
|
|
|
|
/* Return a dictionary corresponding to the POSIX environment table */
|
|
#ifdef WITH_NEXT_FRAMEWORK
|
|
/* On Darwin/MacOSX a shared library or framework has no access to
|
|
** environ directly, we must obtain it with _NSGetEnviron().
|
|
*/
|
|
#include <crt_externs.h>
|
|
static char **environ;
|
|
#elif !defined(_MSC_VER) && ( !defined(__WATCOMC__) || defined(__QNX__) )
|
|
extern char **environ;
|
|
#endif /* !_MSC_VER */
|
|
|
|
static PyObject *
|
|
convertenviron(void)
|
|
{
|
|
PyObject *d;
|
|
char **e;
|
|
d = PyDict_New();
|
|
if (d == NULL)
|
|
return NULL;
|
|
#ifdef WITH_NEXT_FRAMEWORK
|
|
if (environ == NULL)
|
|
environ = *_NSGetEnviron();
|
|
#endif
|
|
if (environ == NULL)
|
|
return d;
|
|
/* This part ignores errors */
|
|
for (e = environ; *e != NULL; e++) {
|
|
PyObject *k;
|
|
PyObject *v;
|
|
char *p = strchr(*e, '=');
|
|
if (p == NULL)
|
|
continue;
|
|
k = PyString_FromStringAndSize(*e, (int)(p-*e));
|
|
if (k == NULL) {
|
|
PyErr_Clear();
|
|
continue;
|
|
}
|
|
v = PyString_FromString(p+1);
|
|
if (v == NULL) {
|
|
PyErr_Clear();
|
|
Py_DECREF(k);
|
|
continue;
|
|
}
|
|
if (PyDict_GetItem(d, k) == NULL) {
|
|
if (PyDict_SetItem(d, k, v) != 0)
|
|
PyErr_Clear();
|
|
}
|
|
Py_DECREF(k);
|
|
Py_DECREF(v);
|
|
}
|
|
#if defined(PYOS_OS2)
|
|
{
|
|
APIRET rc;
|
|
char buffer[1024]; /* OS/2 Provides a Documented Max of 1024 Chars */
|
|
|
|
rc = DosQueryExtLIBPATH(buffer, BEGIN_LIBPATH);
|
|
if (rc == NO_ERROR) { /* (not a type, envname is NOT 'BEGIN_LIBPATH') */
|
|
PyObject *v = PyString_FromString(buffer);
|
|
PyDict_SetItemString(d, "BEGINLIBPATH", v);
|
|
Py_DECREF(v);
|
|
}
|
|
rc = DosQueryExtLIBPATH(buffer, END_LIBPATH);
|
|
if (rc == NO_ERROR) { /* (not a typo, envname is NOT 'END_LIBPATH') */
|
|
PyObject *v = PyString_FromString(buffer);
|
|
PyDict_SetItemString(d, "ENDLIBPATH", v);
|
|
Py_DECREF(v);
|
|
}
|
|
}
|
|
#endif
|
|
return d;
|
|
}
|
|
|
|
|
|
/* Set a POSIX-specific error from errno, and return NULL */
|
|
|
|
static PyObject *
|
|
posix_error(void)
|
|
{
|
|
return PyErr_SetFromErrno(PyExc_OSError);
|
|
}
|
|
static PyObject *
|
|
posix_error_with_filename(char* name)
|
|
{
|
|
return PyErr_SetFromErrnoWithFilename(PyExc_OSError, name);
|
|
}
|
|
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
static PyObject *
|
|
posix_error_with_unicode_filename(Py_UNICODE* name)
|
|
{
|
|
return PyErr_SetFromErrnoWithUnicodeFilename(PyExc_OSError, name);
|
|
}
|
|
#endif /* Py_WIN_WIDE_FILENAMES */
|
|
|
|
|
|
static PyObject *
|
|
posix_error_with_allocated_filename(char* name)
|
|
{
|
|
PyObject *rc = PyErr_SetFromErrnoWithFilename(PyExc_OSError, name);
|
|
PyMem_Free(name);
|
|
return rc;
|
|
}
|
|
|
|
#ifdef MS_WINDOWS
|
|
static PyObject *
|
|
win32_error(char* function, char* filename)
|
|
{
|
|
/* XXX We should pass the function name along in the future.
|
|
(_winreg.c also wants to pass the function name.)
|
|
This would however require an additional param to the
|
|
Windows error object, which is non-trivial.
|
|
*/
|
|
errno = GetLastError();
|
|
if (filename)
|
|
return PyErr_SetFromWindowsErrWithFilename(errno, filename);
|
|
else
|
|
return PyErr_SetFromWindowsErr(errno);
|
|
}
|
|
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
static PyObject *
|
|
win32_error_unicode(char* function, Py_UNICODE* filename)
|
|
{
|
|
/* XXX - see win32_error for comments on 'function' */
|
|
errno = GetLastError();
|
|
if (filename)
|
|
return PyErr_SetFromWindowsErrWithUnicodeFilename(errno, filename);
|
|
else
|
|
return PyErr_SetFromWindowsErr(errno);
|
|
}
|
|
|
|
static PyObject *_PyUnicode_FromFileSystemEncodedObject(register PyObject *obj)
|
|
{
|
|
}
|
|
|
|
/* Function suitable for O& conversion */
|
|
static int
|
|
convert_to_unicode(PyObject *arg, void* _param)
|
|
{
|
|
PyObject **param = (PyObject**)_param;
|
|
if (PyUnicode_CheckExact(arg)) {
|
|
Py_INCREF(arg);
|
|
*param = arg;
|
|
}
|
|
else if (PyUnicode_Check(arg)) {
|
|
/* For a Unicode subtype that's not a Unicode object,
|
|
return a true Unicode object with the same data. */
|
|
*param = PyUnicode_FromUnicode(PyUnicode_AS_UNICODE(arg),
|
|
PyUnicode_GET_SIZE(arg));
|
|
return *param != NULL;
|
|
}
|
|
else
|
|
*param = PyUnicode_FromEncodedObject(arg,
|
|
Py_FileSystemDefaultEncoding,
|
|
"strict");
|
|
return (*param) != NULL;
|
|
}
|
|
|
|
#endif /* Py_WIN_WIDE_FILENAMES */
|
|
|
|
#endif
|
|
|
|
#if defined(PYOS_OS2)
|
|
/**********************************************************************
|
|
* Helper Function to Trim and Format OS/2 Messages
|
|
**********************************************************************/
|
|
static void
|
|
os2_formatmsg(char *msgbuf, int msglen, char *reason)
|
|
{
|
|
msgbuf[msglen] = '\0'; /* OS/2 Doesn't Guarantee a Terminator */
|
|
|
|
if (strlen(msgbuf) > 0) { /* If Non-Empty Msg, Trim CRLF */
|
|
char *lastc = &msgbuf[ strlen(msgbuf)-1 ];
|
|
|
|
while (lastc > msgbuf && isspace(Py_CHARMASK(*lastc)))
|
|
*lastc-- = '\0'; /* Trim Trailing Whitespace (CRLF) */
|
|
}
|
|
|
|
/* Add Optional Reason Text */
|
|
if (reason) {
|
|
strcat(msgbuf, " : ");
|
|
strcat(msgbuf, reason);
|
|
}
|
|
}
|
|
|
|
/**********************************************************************
|
|
* Decode an OS/2 Operating System Error Code
|
|
*
|
|
* A convenience function to lookup an OS/2 error code and return a
|
|
* text message we can use to raise a Python exception.
|
|
*
|
|
* Notes:
|
|
* The messages for errors returned from the OS/2 kernel reside in
|
|
* the file OSO001.MSG in the \OS2 directory hierarchy.
|
|
*
|
|
**********************************************************************/
|
|
static char *
|
|
os2_strerror(char *msgbuf, int msgbuflen, int errorcode, char *reason)
|
|
{
|
|
APIRET rc;
|
|
ULONG msglen;
|
|
|
|
/* Retrieve Kernel-Related Error Message from OSO001.MSG File */
|
|
Py_BEGIN_ALLOW_THREADS
|
|
rc = DosGetMessage(NULL, 0, msgbuf, msgbuflen,
|
|
errorcode, "oso001.msg", &msglen);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (rc == NO_ERROR)
|
|
os2_formatmsg(msgbuf, msglen, reason);
|
|
else
|
|
PyOS_snprintf(msgbuf, msgbuflen,
|
|
"unknown OS error #%d", errorcode);
|
|
|
|
return msgbuf;
|
|
}
|
|
|
|
/* Set an OS/2-specific error and return NULL. OS/2 kernel
|
|
errors are not in a global variable e.g. 'errno' nor are
|
|
they congruent with posix error numbers. */
|
|
|
|
static PyObject * os2_error(int code)
|
|
{
|
|
char text[1024];
|
|
PyObject *v;
|
|
|
|
os2_strerror(text, sizeof(text), code, "");
|
|
|
|
v = Py_BuildValue("(is)", code, text);
|
|
if (v != NULL) {
|
|
PyErr_SetObject(PyExc_OSError, v);
|
|
Py_DECREF(v);
|
|
}
|
|
return NULL; /* Signal to Python that an Exception is Pending */
|
|
}
|
|
|
|
#endif /* OS2 */
|
|
|
|
/* POSIX generic methods */
|
|
|
|
static PyObject *
|
|
posix_fildes(PyObject *fdobj, int (*func)(int))
|
|
{
|
|
int fd;
|
|
int res;
|
|
fd = PyObject_AsFileDescriptor(fdobj);
|
|
if (fd < 0)
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = (*func)(fd);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return posix_error();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
static int
|
|
unicode_file_names(void)
|
|
{
|
|
static int canusewide = -1;
|
|
if (canusewide == -1) {
|
|
/* As per doc for ::GetVersion(), this is the correct test for
|
|
the Windows NT family. */
|
|
canusewide = (GetVersion() < 0x80000000) ? 1 : 0;
|
|
}
|
|
return canusewide;
|
|
}
|
|
#endif
|
|
|
|
static PyObject *
|
|
posix_1str(PyObject *args, char *format, int (*func)(const char*))
|
|
{
|
|
char *path1 = NULL;
|
|
int res;
|
|
if (!PyArg_ParseTuple(args, format,
|
|
Py_FileSystemDefaultEncoding, &path1))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = (*func)(path1);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return posix_error_with_allocated_filename(path1);
|
|
PyMem_Free(path1);
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
static PyObject *
|
|
posix_2str(PyObject *args,
|
|
char *format,
|
|
int (*func)(const char *, const char *))
|
|
{
|
|
char *path1 = NULL, *path2 = NULL;
|
|
int res;
|
|
if (!PyArg_ParseTuple(args, format,
|
|
Py_FileSystemDefaultEncoding, &path1,
|
|
Py_FileSystemDefaultEncoding, &path2))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = (*func)(path1, path2);
|
|
Py_END_ALLOW_THREADS
|
|
PyMem_Free(path1);
|
|
PyMem_Free(path2);
|
|
if (res != 0)
|
|
/* XXX how to report both path1 and path2??? */
|
|
return posix_error();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
static PyObject*
|
|
win32_1str(PyObject* args, char* func,
|
|
char* format, BOOL (__stdcall *funcA)(LPCSTR),
|
|
char* wformat, BOOL (__stdcall *funcW)(LPWSTR))
|
|
{
|
|
PyObject *uni;
|
|
char *ansi;
|
|
BOOL result;
|
|
if (unicode_file_names()) {
|
|
if (!PyArg_ParseTuple(args, wformat, &uni))
|
|
PyErr_Clear();
|
|
else {
|
|
Py_BEGIN_ALLOW_THREADS
|
|
result = funcW(PyUnicode_AsUnicode(uni));
|
|
Py_END_ALLOW_THREADS
|
|
if (!result)
|
|
return win32_error_unicode(func, PyUnicode_AsUnicode(uni));
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
}
|
|
if (!PyArg_ParseTuple(args, format, &ansi))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
result = funcA(ansi);
|
|
Py_END_ALLOW_THREADS
|
|
if (!result)
|
|
return win32_error(func, ansi);
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
|
|
}
|
|
|
|
/* This is a reimplementation of the C library's chdir function,
|
|
but one that produces Win32 errors instead of DOS error codes.
|
|
chdir is essentially a wrapper around SetCurrentDirectory; however,
|
|
it also needs to set "magic" environment variables indicating
|
|
the per-drive current directory, which are of the form =<drive>: */
|
|
BOOL __stdcall
|
|
win32_chdir(LPCSTR path)
|
|
{
|
|
char new_path[MAX_PATH+1];
|
|
int result;
|
|
char env[4] = "=x:";
|
|
|
|
if(!SetCurrentDirectoryA(path))
|
|
return FALSE;
|
|
result = GetCurrentDirectoryA(MAX_PATH+1, new_path);
|
|
if (!result)
|
|
return FALSE;
|
|
/* In the ANSI API, there should not be any paths longer
|
|
than MAX_PATH. */
|
|
assert(result <= MAX_PATH+1);
|
|
if (strncmp(new_path, "\\\\", 2) == 0 ||
|
|
strncmp(new_path, "//", 2) == 0)
|
|
/* UNC path, nothing to do. */
|
|
return TRUE;
|
|
env[1] = new_path[0];
|
|
return SetEnvironmentVariableA(env, new_path);
|
|
}
|
|
|
|
/* The Unicode version differs from the ANSI version
|
|
since the current directory might exceed MAX_PATH characters */
|
|
BOOL __stdcall
|
|
win32_wchdir(LPCWSTR path)
|
|
{
|
|
wchar_t _new_path[MAX_PATH+1], *new_path = _new_path;
|
|
int result;
|
|
wchar_t env[4] = L"=x:";
|
|
|
|
if(!SetCurrentDirectoryW(path))
|
|
return FALSE;
|
|
result = GetCurrentDirectoryW(MAX_PATH+1, new_path);
|
|
if (!result)
|
|
return FALSE;
|
|
if (result > MAX_PATH+1) {
|
|
new_path = malloc(result);
|
|
if (!new_path) {
|
|
SetLastError(ERROR_OUTOFMEMORY);
|
|
return FALSE;
|
|
}
|
|
}
|
|
if (wcsncmp(new_path, L"\\\\", 2) == 0 ||
|
|
wcsncmp(new_path, L"//", 2) == 0)
|
|
/* UNC path, nothing to do. */
|
|
return TRUE;
|
|
env[1] = new_path[0];
|
|
result = SetEnvironmentVariableW(env, new_path);
|
|
if (new_path != _new_path)
|
|
free(new_path);
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
#ifdef MS_WINDOWS
|
|
/* The CRT of Windows has a number of flaws wrt. its stat() implementation:
|
|
- time stamps are restricted to second resolution
|
|
- file modification times suffer from forth-and-back conversions between
|
|
UTC and local time
|
|
Therefore, we implement our own stat, based on the Win32 API directly.
|
|
*/
|
|
#define HAVE_STAT_NSEC 1
|
|
|
|
struct win32_stat{
|
|
int st_dev;
|
|
__int64 st_ino;
|
|
unsigned short st_mode;
|
|
int st_nlink;
|
|
int st_uid;
|
|
int st_gid;
|
|
int st_rdev;
|
|
__int64 st_size;
|
|
int st_atime;
|
|
int st_atime_nsec;
|
|
int st_mtime;
|
|
int st_mtime_nsec;
|
|
int st_ctime;
|
|
int st_ctime_nsec;
|
|
};
|
|
|
|
static __int64 secs_between_epochs = 11644473600; /* Seconds between 1.1.1601 and 1.1.1970 */
|
|
|
|
static void
|
|
FILE_TIME_to_time_t_nsec(FILETIME *in_ptr, int *time_out, int* nsec_out)
|
|
{
|
|
/* XXX endianness. Shouldn't matter, as all Windows implementations are little-endian */
|
|
/* Cannot simply cast and dereference in_ptr,
|
|
since it might not be aligned properly */
|
|
__int64 in;
|
|
memcpy(&in, in_ptr, sizeof(in));
|
|
*nsec_out = (int)(in % 10000000) * 100; /* FILETIME is in units of 100 nsec. */
|
|
/* XXX Win32 supports time stamps past 2038; we currently don't */
|
|
*time_out = Py_SAFE_DOWNCAST((in / 10000000) - secs_between_epochs, __int64, int);
|
|
}
|
|
|
|
static void
|
|
time_t_to_FILE_TIME(int time_in, int nsec_in, FILETIME *out_ptr)
|
|
{
|
|
/* XXX endianness */
|
|
__int64 out;
|
|
out = time_in + secs_between_epochs;
|
|
out = out * 10000000 + nsec_in;
|
|
memcpy(out_ptr, &out, sizeof(out));
|
|
}
|
|
|
|
/* Below, we *know* that ugo+r is 0444 */
|
|
#if _S_IREAD != 0400
|
|
#error Unsupported C library
|
|
#endif
|
|
static int
|
|
attributes_to_mode(DWORD attr)
|
|
{
|
|
int m = 0;
|
|
if (attr & FILE_ATTRIBUTE_DIRECTORY)
|
|
m |= _S_IFDIR | 0111; /* IFEXEC for user,group,other */
|
|
else
|
|
m |= _S_IFREG;
|
|
if (attr & FILE_ATTRIBUTE_READONLY)
|
|
m |= 0444;
|
|
else
|
|
m |= 0666;
|
|
return m;
|
|
}
|
|
|
|
static int
|
|
attribute_data_to_stat(WIN32_FILE_ATTRIBUTE_DATA *info, struct win32_stat *result)
|
|
{
|
|
memset(result, 0, sizeof(*result));
|
|
result->st_mode = attributes_to_mode(info->dwFileAttributes);
|
|
result->st_size = (((__int64)info->nFileSizeHigh)<<32) + info->nFileSizeLow;
|
|
FILE_TIME_to_time_t_nsec(&info->ftCreationTime, &result->st_ctime, &result->st_ctime_nsec);
|
|
FILE_TIME_to_time_t_nsec(&info->ftLastWriteTime, &result->st_mtime, &result->st_mtime_nsec);
|
|
FILE_TIME_to_time_t_nsec(&info->ftLastAccessTime, &result->st_atime, &result->st_atime_nsec);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
win32_stat(const char* path, struct win32_stat *result)
|
|
{
|
|
WIN32_FILE_ATTRIBUTE_DATA info;
|
|
int code;
|
|
char *dot;
|
|
/* XXX not supported on Win95 and NT 3.x */
|
|
if (!GetFileAttributesExA(path, GetFileExInfoStandard, &info)) {
|
|
/* Protocol violation: we explicitly clear errno, instead of
|
|
setting it to a POSIX error. Callers should use GetLastError. */
|
|
errno = 0;
|
|
return -1;
|
|
}
|
|
code = attribute_data_to_stat(&info, result);
|
|
if (code != 0)
|
|
return code;
|
|
/* Set S_IFEXEC if it is an .exe, .bat, ... */
|
|
dot = strrchr(path, '.');
|
|
if (dot) {
|
|
if (stricmp(dot, ".bat") == 0 ||
|
|
stricmp(dot, ".cmd") == 0 ||
|
|
stricmp(dot, ".exe") == 0 ||
|
|
stricmp(dot, ".com") == 0)
|
|
result->st_mode |= 0111;
|
|
}
|
|
return code;
|
|
}
|
|
|
|
static int
|
|
win32_wstat(const wchar_t* path, struct win32_stat *result)
|
|
{
|
|
int code;
|
|
const wchar_t *dot;
|
|
WIN32_FILE_ATTRIBUTE_DATA info;
|
|
/* XXX not supported on Win95 and NT 3.x */
|
|
if (!GetFileAttributesExW(path, GetFileExInfoStandard, &info)) {
|
|
/* Protocol violation: we explicitly clear errno, instead of
|
|
setting it to a POSIX error. Callers should use GetLastError. */
|
|
errno = 0;
|
|
return -1;
|
|
}
|
|
code = attribute_data_to_stat(&info, result);
|
|
if (code < 0)
|
|
return code;
|
|
/* Set IFEXEC if it is an .exe, .bat, ... */
|
|
dot = wcsrchr(path, '.');
|
|
if (dot) {
|
|
if (_wcsicmp(dot, L".bat") == 0 ||
|
|
_wcsicmp(dot, L".cmd") == 0 ||
|
|
_wcsicmp(dot, L".exe") == 0 ||
|
|
_wcsicmp(dot, L".com") == 0)
|
|
result->st_mode |= 0111;
|
|
}
|
|
return code;
|
|
}
|
|
|
|
static int
|
|
win32_fstat(int file_number, struct win32_stat *result)
|
|
{
|
|
BY_HANDLE_FILE_INFORMATION info;
|
|
HANDLE h;
|
|
int type;
|
|
|
|
h = (HANDLE)_get_osfhandle(file_number);
|
|
|
|
/* Protocol violation: we explicitly clear errno, instead of
|
|
setting it to a POSIX error. Callers should use GetLastError. */
|
|
errno = 0;
|
|
|
|
if (h == INVALID_HANDLE_VALUE) {
|
|
/* This is really a C library error (invalid file handle).
|
|
We set the Win32 error to the closes one matching. */
|
|
SetLastError(ERROR_INVALID_HANDLE);
|
|
return -1;
|
|
}
|
|
memset(result, 0, sizeof(*result));
|
|
|
|
type = GetFileType(h);
|
|
if (type == FILE_TYPE_UNKNOWN) {
|
|
DWORD error = GetLastError();
|
|
if (error != 0) {
|
|
return -1;
|
|
}
|
|
/* else: valid but unknown file */
|
|
}
|
|
|
|
if (type != FILE_TYPE_DISK) {
|
|
if (type == FILE_TYPE_CHAR)
|
|
result->st_mode = _S_IFCHR;
|
|
else if (type == FILE_TYPE_PIPE)
|
|
result->st_mode = _S_IFIFO;
|
|
return 0;
|
|
}
|
|
|
|
if (!GetFileInformationByHandle(h, &info)) {
|
|
return -1;
|
|
}
|
|
|
|
/* similar to stat() */
|
|
result->st_mode = attributes_to_mode(info.dwFileAttributes);
|
|
result->st_size = (((__int64)info.nFileSizeHigh)<<32) + info.nFileSizeLow;
|
|
FILE_TIME_to_time_t_nsec(&info.ftCreationTime, &result->st_ctime, &result->st_ctime_nsec);
|
|
FILE_TIME_to_time_t_nsec(&info.ftLastWriteTime, &result->st_mtime, &result->st_mtime_nsec);
|
|
FILE_TIME_to_time_t_nsec(&info.ftLastAccessTime, &result->st_atime, &result->st_atime_nsec);
|
|
/* specific to fstat() */
|
|
result->st_nlink = info.nNumberOfLinks;
|
|
result->st_ino = (((__int64)info.nFileIndexHigh)<<32) + info.nFileIndexLow;
|
|
return 0;
|
|
}
|
|
|
|
#endif /* MS_WINDOWS */
|
|
|
|
PyDoc_STRVAR(stat_result__doc__,
|
|
"stat_result: Result from stat or lstat.\n\n\
|
|
This object may be accessed either as a tuple of\n\
|
|
(mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime)\n\
|
|
or via the attributes st_mode, st_ino, st_dev, st_nlink, st_uid, and so on.\n\
|
|
\n\
|
|
Posix/windows: If your platform supports st_blksize, st_blocks, st_rdev,\n\
|
|
or st_flags, they are available as attributes only.\n\
|
|
\n\
|
|
See os.stat for more information.");
|
|
|
|
static PyStructSequence_Field stat_result_fields[] = {
|
|
{"st_mode", "protection bits"},
|
|
{"st_ino", "inode"},
|
|
{"st_dev", "device"},
|
|
{"st_nlink", "number of hard links"},
|
|
{"st_uid", "user ID of owner"},
|
|
{"st_gid", "group ID of owner"},
|
|
{"st_size", "total size, in bytes"},
|
|
/* The NULL is replaced with PyStructSequence_UnnamedField later. */
|
|
{NULL, "integer time of last access"},
|
|
{NULL, "integer time of last modification"},
|
|
{NULL, "integer time of last change"},
|
|
{"st_atime", "time of last access"},
|
|
{"st_mtime", "time of last modification"},
|
|
{"st_ctime", "time of last change"},
|
|
#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
|
|
{"st_blksize", "blocksize for filesystem I/O"},
|
|
#endif
|
|
#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
|
|
{"st_blocks", "number of blocks allocated"},
|
|
#endif
|
|
#ifdef HAVE_STRUCT_STAT_ST_RDEV
|
|
{"st_rdev", "device type (if inode device)"},
|
|
#endif
|
|
#ifdef HAVE_STRUCT_STAT_ST_FLAGS
|
|
{"st_flags", "user defined flags for file"},
|
|
#endif
|
|
#ifdef HAVE_STRUCT_STAT_ST_GEN
|
|
{"st_gen", "generation number"},
|
|
#endif
|
|
#ifdef HAVE_STRUCT_STAT_ST_BIRTHTIME
|
|
{"st_birthtime", "time of creation"},
|
|
#endif
|
|
{0}
|
|
};
|
|
|
|
#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
|
|
#define ST_BLKSIZE_IDX 13
|
|
#else
|
|
#define ST_BLKSIZE_IDX 12
|
|
#endif
|
|
|
|
#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
|
|
#define ST_BLOCKS_IDX (ST_BLKSIZE_IDX+1)
|
|
#else
|
|
#define ST_BLOCKS_IDX ST_BLKSIZE_IDX
|
|
#endif
|
|
|
|
#ifdef HAVE_STRUCT_STAT_ST_RDEV
|
|
#define ST_RDEV_IDX (ST_BLOCKS_IDX+1)
|
|
#else
|
|
#define ST_RDEV_IDX ST_BLOCKS_IDX
|
|
#endif
|
|
|
|
#ifdef HAVE_STRUCT_STAT_ST_FLAGS
|
|
#define ST_FLAGS_IDX (ST_RDEV_IDX+1)
|
|
#else
|
|
#define ST_FLAGS_IDX ST_RDEV_IDX
|
|
#endif
|
|
|
|
#ifdef HAVE_STRUCT_STAT_ST_GEN
|
|
#define ST_GEN_IDX (ST_FLAGS_IDX+1)
|
|
#else
|
|
#define ST_GEN_IDX ST_FLAGS_IDX
|
|
#endif
|
|
|
|
#ifdef HAVE_STRUCT_STAT_ST_BIRTHTIME
|
|
#define ST_BIRTHTIME_IDX (ST_GEN_IDX+1)
|
|
#else
|
|
#define ST_BIRTHTIME_IDX ST_GEN_IDX
|
|
#endif
|
|
|
|
static PyStructSequence_Desc stat_result_desc = {
|
|
"stat_result", /* name */
|
|
stat_result__doc__, /* doc */
|
|
stat_result_fields,
|
|
10
|
|
};
|
|
|
|
PyDoc_STRVAR(statvfs_result__doc__,
|
|
"statvfs_result: Result from statvfs or fstatvfs.\n\n\
|
|
This object may be accessed either as a tuple of\n\
|
|
(bsize, frsize, blocks, bfree, bavail, files, ffree, favail, flag, namemax),\n\
|
|
or via the attributes f_bsize, f_frsize, f_blocks, f_bfree, and so on.\n\
|
|
\n\
|
|
See os.statvfs for more information.");
|
|
|
|
static PyStructSequence_Field statvfs_result_fields[] = {
|
|
{"f_bsize", },
|
|
{"f_frsize", },
|
|
{"f_blocks", },
|
|
{"f_bfree", },
|
|
{"f_bavail", },
|
|
{"f_files", },
|
|
{"f_ffree", },
|
|
{"f_favail", },
|
|
{"f_flag", },
|
|
{"f_namemax",},
|
|
{0}
|
|
};
|
|
|
|
static PyStructSequence_Desc statvfs_result_desc = {
|
|
"statvfs_result", /* name */
|
|
statvfs_result__doc__, /* doc */
|
|
statvfs_result_fields,
|
|
10
|
|
};
|
|
|
|
static int initialized;
|
|
static PyTypeObject StatResultType;
|
|
static PyTypeObject StatVFSResultType;
|
|
static newfunc structseq_new;
|
|
|
|
static PyObject *
|
|
statresult_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyStructSequence *result;
|
|
int i;
|
|
|
|
result = (PyStructSequence*)structseq_new(type, args, kwds);
|
|
if (!result)
|
|
return NULL;
|
|
/* If we have been initialized from a tuple,
|
|
st_?time might be set to None. Initialize it
|
|
from the int slots. */
|
|
for (i = 7; i <= 9; i++) {
|
|
if (result->ob_item[i+3] == Py_None) {
|
|
Py_DECREF(Py_None);
|
|
Py_INCREF(result->ob_item[i]);
|
|
result->ob_item[i+3] = result->ob_item[i];
|
|
}
|
|
}
|
|
return (PyObject*)result;
|
|
}
|
|
|
|
|
|
|
|
/* If true, st_?time is float. */
|
|
static int _stat_float_times = 1;
|
|
|
|
PyDoc_STRVAR(stat_float_times__doc__,
|
|
"stat_float_times([newval]) -> oldval\n\n\
|
|
Determine whether os.[lf]stat represents time stamps as float objects.\n\
|
|
If newval is True, future calls to stat() return floats, if it is False,\n\
|
|
future calls return ints. \n\
|
|
If newval is omitted, return the current setting.\n");
|
|
|
|
static PyObject*
|
|
stat_float_times(PyObject* self, PyObject *args)
|
|
{
|
|
int newval = -1;
|
|
if (!PyArg_ParseTuple(args, "|i:stat_float_times", &newval))
|
|
return NULL;
|
|
if (newval == -1)
|
|
/* Return old value */
|
|
return PyBool_FromLong(_stat_float_times);
|
|
_stat_float_times = newval;
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
static void
|
|
fill_time(PyObject *v, int index, time_t sec, unsigned long nsec)
|
|
{
|
|
PyObject *fval,*ival;
|
|
#if SIZEOF_TIME_T > SIZEOF_LONG
|
|
ival = PyLong_FromLongLong((PY_LONG_LONG)sec);
|
|
#else
|
|
ival = PyInt_FromLong((long)sec);
|
|
#endif
|
|
if (_stat_float_times) {
|
|
fval = PyFloat_FromDouble(sec + 1e-9*nsec);
|
|
} else {
|
|
fval = ival;
|
|
Py_INCREF(fval);
|
|
}
|
|
PyStructSequence_SET_ITEM(v, index, ival);
|
|
PyStructSequence_SET_ITEM(v, index+3, fval);
|
|
}
|
|
|
|
/* pack a system stat C structure into the Python stat tuple
|
|
(used by posix_stat() and posix_fstat()) */
|
|
static PyObject*
|
|
_pystat_fromstructstat(STRUCT_STAT *st)
|
|
{
|
|
unsigned long ansec, mnsec, cnsec;
|
|
PyObject *v = PyStructSequence_New(&StatResultType);
|
|
if (v == NULL)
|
|
return NULL;
|
|
|
|
PyStructSequence_SET_ITEM(v, 0, PyInt_FromLong((long)st->st_mode));
|
|
#ifdef HAVE_LARGEFILE_SUPPORT
|
|
PyStructSequence_SET_ITEM(v, 1,
|
|
PyLong_FromLongLong((PY_LONG_LONG)st->st_ino));
|
|
#else
|
|
PyStructSequence_SET_ITEM(v, 1, PyInt_FromLong((long)st->st_ino));
|
|
#endif
|
|
#if defined(HAVE_LONG_LONG) && !defined(MS_WINDOWS)
|
|
PyStructSequence_SET_ITEM(v, 2,
|
|
PyLong_FromLongLong((PY_LONG_LONG)st->st_dev));
|
|
#else
|
|
PyStructSequence_SET_ITEM(v, 2, PyInt_FromLong((long)st->st_dev));
|
|
#endif
|
|
PyStructSequence_SET_ITEM(v, 3, PyInt_FromLong((long)st->st_nlink));
|
|
PyStructSequence_SET_ITEM(v, 4, PyInt_FromLong((long)st->st_uid));
|
|
PyStructSequence_SET_ITEM(v, 5, PyInt_FromLong((long)st->st_gid));
|
|
#ifdef HAVE_LARGEFILE_SUPPORT
|
|
PyStructSequence_SET_ITEM(v, 6,
|
|
PyLong_FromLongLong((PY_LONG_LONG)st->st_size));
|
|
#else
|
|
PyStructSequence_SET_ITEM(v, 6, PyInt_FromLong(st->st_size));
|
|
#endif
|
|
|
|
#if defined(HAVE_STAT_TV_NSEC)
|
|
ansec = st->st_atim.tv_nsec;
|
|
mnsec = st->st_mtim.tv_nsec;
|
|
cnsec = st->st_ctim.tv_nsec;
|
|
#elif defined(HAVE_STAT_TV_NSEC2)
|
|
ansec = st->st_atimespec.tv_nsec;
|
|
mnsec = st->st_mtimespec.tv_nsec;
|
|
cnsec = st->st_ctimespec.tv_nsec;
|
|
#elif defined(HAVE_STAT_NSEC)
|
|
ansec = st->st_atime_nsec;
|
|
mnsec = st->st_mtime_nsec;
|
|
cnsec = st->st_ctime_nsec;
|
|
#else
|
|
ansec = mnsec = cnsec = 0;
|
|
#endif
|
|
fill_time(v, 7, st->st_atime, ansec);
|
|
fill_time(v, 8, st->st_mtime, mnsec);
|
|
fill_time(v, 9, st->st_ctime, cnsec);
|
|
|
|
#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
|
|
PyStructSequence_SET_ITEM(v, ST_BLKSIZE_IDX,
|
|
PyInt_FromLong((long)st->st_blksize));
|
|
#endif
|
|
#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
|
|
PyStructSequence_SET_ITEM(v, ST_BLOCKS_IDX,
|
|
PyInt_FromLong((long)st->st_blocks));
|
|
#endif
|
|
#ifdef HAVE_STRUCT_STAT_ST_RDEV
|
|
PyStructSequence_SET_ITEM(v, ST_RDEV_IDX,
|
|
PyInt_FromLong((long)st->st_rdev));
|
|
#endif
|
|
#ifdef HAVE_STRUCT_STAT_ST_GEN
|
|
PyStructSequence_SET_ITEM(v, ST_GEN_IDX,
|
|
PyInt_FromLong((long)st->st_gen));
|
|
#endif
|
|
#ifdef HAVE_STRUCT_STAT_ST_BIRTHTIME
|
|
{
|
|
PyObject *val;
|
|
unsigned long bsec,bnsec;
|
|
bsec = (long)st->st_birthtime;
|
|
#ifdef HAVE_STAT_TV_NSEC2
|
|
bnsec = st->st_birthtimespec.tv_nsec;
|
|
#else
|
|
bnsec = 0;
|
|
#endif
|
|
if (_stat_float_times) {
|
|
val = PyFloat_FromDouble(bsec + 1e-9*bnsec);
|
|
} else {
|
|
val = PyInt_FromLong((long)bsec);
|
|
}
|
|
PyStructSequence_SET_ITEM(v, ST_BIRTHTIME_IDX,
|
|
val);
|
|
}
|
|
#endif
|
|
#ifdef HAVE_STRUCT_STAT_ST_FLAGS
|
|
PyStructSequence_SET_ITEM(v, ST_FLAGS_IDX,
|
|
PyInt_FromLong((long)st->st_flags));
|
|
#endif
|
|
|
|
if (PyErr_Occurred()) {
|
|
Py_DECREF(v);
|
|
return NULL;
|
|
}
|
|
|
|
return v;
|
|
}
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
/* IsUNCRoot -- test whether the supplied path is of the form \\SERVER\SHARE\,
|
|
where / can be used in place of \ and the trailing slash is optional.
|
|
Both SERVER and SHARE must have at least one character.
|
|
*/
|
|
|
|
#define ISSLASHA(c) ((c) == '\\' || (c) == '/')
|
|
#define ISSLASHW(c) ((c) == L'\\' || (c) == L'/')
|
|
#ifndef ARRAYSIZE
|
|
#define ARRAYSIZE(a) (sizeof(a) / sizeof(a[0]))
|
|
#endif
|
|
|
|
static BOOL
|
|
IsUNCRootA(char *path, int pathlen)
|
|
{
|
|
#define ISSLASH ISSLASHA
|
|
|
|
int i, share;
|
|
|
|
if (pathlen < 5 || !ISSLASH(path[0]) || !ISSLASH(path[1]))
|
|
/* minimum UNCRoot is \\x\y */
|
|
return FALSE;
|
|
for (i = 2; i < pathlen ; i++)
|
|
if (ISSLASH(path[i])) break;
|
|
if (i == 2 || i == pathlen)
|
|
/* do not allow \\\SHARE or \\SERVER */
|
|
return FALSE;
|
|
share = i+1;
|
|
for (i = share; i < pathlen; i++)
|
|
if (ISSLASH(path[i])) break;
|
|
return (i != share && (i == pathlen || i == pathlen-1));
|
|
|
|
#undef ISSLASH
|
|
}
|
|
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
static BOOL
|
|
IsUNCRootW(Py_UNICODE *path, int pathlen)
|
|
{
|
|
#define ISSLASH ISSLASHW
|
|
|
|
int i, share;
|
|
|
|
if (pathlen < 5 || !ISSLASH(path[0]) || !ISSLASH(path[1]))
|
|
/* minimum UNCRoot is \\x\y */
|
|
return FALSE;
|
|
for (i = 2; i < pathlen ; i++)
|
|
if (ISSLASH(path[i])) break;
|
|
if (i == 2 || i == pathlen)
|
|
/* do not allow \\\SHARE or \\SERVER */
|
|
return FALSE;
|
|
share = i+1;
|
|
for (i = share; i < pathlen; i++)
|
|
if (ISSLASH(path[i])) break;
|
|
return (i != share && (i == pathlen || i == pathlen-1));
|
|
|
|
#undef ISSLASH
|
|
}
|
|
#endif /* Py_WIN_WIDE_FILENAMES */
|
|
#endif /* MS_WINDOWS */
|
|
|
|
static PyObject *
|
|
posix_do_stat(PyObject *self, PyObject *args,
|
|
char *format,
|
|
#ifdef __VMS
|
|
int (*statfunc)(const char *, STRUCT_STAT *, ...),
|
|
#else
|
|
int (*statfunc)(const char *, STRUCT_STAT *),
|
|
#endif
|
|
char *wformat,
|
|
int (*wstatfunc)(const Py_UNICODE *, STRUCT_STAT *))
|
|
{
|
|
STRUCT_STAT st;
|
|
char *path = NULL; /* pass this to stat; do not free() it */
|
|
char *pathfree = NULL; /* this memory must be free'd */
|
|
int res;
|
|
PyObject *result;
|
|
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
/* If on wide-character-capable OS see if argument
|
|
is Unicode and if so use wide API. */
|
|
if (unicode_file_names()) {
|
|
PyUnicodeObject *po;
|
|
if (PyArg_ParseTuple(args, wformat, &po)) {
|
|
Py_UNICODE *wpath = PyUnicode_AS_UNICODE(po);
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
/* PyUnicode_AS_UNICODE result OK without
|
|
thread lock as it is a simple dereference. */
|
|
res = wstatfunc(wpath, &st);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (res != 0)
|
|
return win32_error_unicode("stat", wpath);
|
|
return _pystat_fromstructstat(&st);
|
|
}
|
|
/* Drop the argument parsing error as narrow strings
|
|
are also valid. */
|
|
PyErr_Clear();
|
|
}
|
|
#endif
|
|
|
|
if (!PyArg_ParseTuple(args, format,
|
|
Py_FileSystemDefaultEncoding, &path))
|
|
return NULL;
|
|
pathfree = path;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = (*statfunc)(path, &st);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (res != 0) {
|
|
#ifdef MS_WINDOWS
|
|
result = win32_error("stat", pathfree);
|
|
#else
|
|
result = posix_error_with_filename(pathfree);
|
|
#endif
|
|
}
|
|
else
|
|
result = _pystat_fromstructstat(&st);
|
|
|
|
PyMem_Free(pathfree);
|
|
return result;
|
|
}
|
|
|
|
/* POSIX methods */
|
|
|
|
PyDoc_STRVAR(posix_access__doc__,
|
|
"access(path, mode) -> 1 if granted, 0 otherwise\n\n\
|
|
Use the real uid/gid to test for access to a path. Note that most\n\
|
|
operations will use the effective uid/gid, therefore this routine can\n\
|
|
be used in a suid/sgid environment to test if the invoking user has the\n\
|
|
specified access to the path. The mode argument can be F_OK to test\n\
|
|
existence, or the inclusive-OR of R_OK, W_OK, and X_OK.");
|
|
|
|
static PyObject *
|
|
posix_access(PyObject *self, PyObject *args)
|
|
{
|
|
char *path;
|
|
int mode;
|
|
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
DWORD attr;
|
|
if (unicode_file_names()) {
|
|
PyUnicodeObject *po;
|
|
if (PyArg_ParseTuple(args, "Ui:access", &po, &mode)) {
|
|
Py_BEGIN_ALLOW_THREADS
|
|
/* PyUnicode_AS_UNICODE OK without thread lock as
|
|
it is a simple dereference. */
|
|
attr = GetFileAttributesW(PyUnicode_AS_UNICODE(po));
|
|
Py_END_ALLOW_THREADS
|
|
goto finish;
|
|
}
|
|
/* Drop the argument parsing error as narrow strings
|
|
are also valid. */
|
|
PyErr_Clear();
|
|
}
|
|
if (!PyArg_ParseTuple(args, "eti:access",
|
|
Py_FileSystemDefaultEncoding, &path, &mode))
|
|
return 0;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
attr = GetFileAttributesA(path);
|
|
Py_END_ALLOW_THREADS
|
|
PyMem_Free(path);
|
|
finish:
|
|
if (attr == 0xFFFFFFFF)
|
|
/* File does not exist, or cannot read attributes */
|
|
return PyBool_FromLong(0);
|
|
/* Access is possible if either write access wasn't requested, or
|
|
the file isn't read-only. */
|
|
return PyBool_FromLong(!(mode & 2) || !(attr & FILE_ATTRIBUTE_READONLY));
|
|
#else
|
|
int res;
|
|
if (!PyArg_ParseTuple(args, "eti:access",
|
|
Py_FileSystemDefaultEncoding, &path, &mode))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = access(path, mode);
|
|
Py_END_ALLOW_THREADS
|
|
PyMem_Free(path);
|
|
return PyBool_FromLong(res == 0);
|
|
#endif
|
|
}
|
|
|
|
#ifndef F_OK
|
|
#define F_OK 0
|
|
#endif
|
|
#ifndef R_OK
|
|
#define R_OK 4
|
|
#endif
|
|
#ifndef W_OK
|
|
#define W_OK 2
|
|
#endif
|
|
#ifndef X_OK
|
|
#define X_OK 1
|
|
#endif
|
|
|
|
#ifdef HAVE_TTYNAME
|
|
PyDoc_STRVAR(posix_ttyname__doc__,
|
|
"ttyname(fd) -> string\n\n\
|
|
Return the name of the terminal device connected to 'fd'.");
|
|
|
|
static PyObject *
|
|
posix_ttyname(PyObject *self, PyObject *args)
|
|
{
|
|
int id;
|
|
char *ret;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:ttyname", &id))
|
|
return NULL;
|
|
|
|
#if defined(__VMS)
|
|
/* file descriptor 0 only, the default input device (stdin) */
|
|
if (id == 0) {
|
|
ret = ttyname();
|
|
}
|
|
else {
|
|
ret = NULL;
|
|
}
|
|
#else
|
|
ret = ttyname(id);
|
|
#endif
|
|
if (ret == NULL)
|
|
return posix_error();
|
|
return PyString_FromString(ret);
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_CTERMID
|
|
PyDoc_STRVAR(posix_ctermid__doc__,
|
|
"ctermid() -> string\n\n\
|
|
Return the name of the controlling terminal for this process.");
|
|
|
|
static PyObject *
|
|
posix_ctermid(PyObject *self, PyObject *noargs)
|
|
{
|
|
char *ret;
|
|
char buffer[L_ctermid];
|
|
|
|
#ifdef USE_CTERMID_R
|
|
ret = ctermid_r(buffer);
|
|
#else
|
|
ret = ctermid(buffer);
|
|
#endif
|
|
if (ret == NULL)
|
|
return posix_error();
|
|
return PyString_FromString(buffer);
|
|
}
|
|
#endif
|
|
|
|
PyDoc_STRVAR(posix_chdir__doc__,
|
|
"chdir(path)\n\n\
|
|
Change the current working directory to the specified path.");
|
|
|
|
static PyObject *
|
|
posix_chdir(PyObject *self, PyObject *args)
|
|
{
|
|
#ifdef MS_WINDOWS
|
|
return win32_1str(args, "chdir", "s:chdir", win32_chdir, "U:chdir", win32_wchdir);
|
|
#elif defined(PYOS_OS2) && defined(PYCC_GCC)
|
|
return posix_1str(args, "et:chdir", _chdir2);
|
|
#elif defined(__VMS)
|
|
return posix_1str(args, "et:chdir", (int (*)(const char *))chdir);
|
|
#else
|
|
return posix_1str(args, "et:chdir", chdir);
|
|
#endif
|
|
}
|
|
|
|
#ifdef HAVE_FCHDIR
|
|
PyDoc_STRVAR(posix_fchdir__doc__,
|
|
"fchdir(fildes)\n\n\
|
|
Change to the directory of the given file descriptor. fildes must be\n\
|
|
opened on a directory, not a file.");
|
|
|
|
static PyObject *
|
|
posix_fchdir(PyObject *self, PyObject *fdobj)
|
|
{
|
|
return posix_fildes(fdobj, fchdir);
|
|
}
|
|
#endif /* HAVE_FCHDIR */
|
|
|
|
|
|
PyDoc_STRVAR(posix_chmod__doc__,
|
|
"chmod(path, mode)\n\n\
|
|
Change the access permissions of a file.");
|
|
|
|
static PyObject *
|
|
posix_chmod(PyObject *self, PyObject *args)
|
|
{
|
|
char *path = NULL;
|
|
int i;
|
|
int res;
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
DWORD attr;
|
|
if (unicode_file_names()) {
|
|
PyUnicodeObject *po;
|
|
if (PyArg_ParseTuple(args, "Ui|:chmod", &po, &i)) {
|
|
Py_BEGIN_ALLOW_THREADS
|
|
attr = GetFileAttributesW(PyUnicode_AS_UNICODE(po));
|
|
if (attr != 0xFFFFFFFF) {
|
|
if (i & _S_IWRITE)
|
|
attr &= ~FILE_ATTRIBUTE_READONLY;
|
|
else
|
|
attr |= FILE_ATTRIBUTE_READONLY;
|
|
res = SetFileAttributesW(PyUnicode_AS_UNICODE(po), attr);
|
|
}
|
|
else
|
|
res = 0;
|
|
Py_END_ALLOW_THREADS
|
|
if (!res)
|
|
return win32_error_unicode("chmod",
|
|
PyUnicode_AS_UNICODE(po));
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
/* Drop the argument parsing error as narrow strings
|
|
are also valid. */
|
|
PyErr_Clear();
|
|
}
|
|
if (!PyArg_ParseTuple(args, "eti:chmod", Py_FileSystemDefaultEncoding,
|
|
&path, &i))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
attr = GetFileAttributesA(path);
|
|
if (attr != 0xFFFFFFFF) {
|
|
if (i & _S_IWRITE)
|
|
attr &= ~FILE_ATTRIBUTE_READONLY;
|
|
else
|
|
attr |= FILE_ATTRIBUTE_READONLY;
|
|
res = SetFileAttributesA(path, attr);
|
|
}
|
|
else
|
|
res = 0;
|
|
Py_END_ALLOW_THREADS
|
|
if (!res) {
|
|
win32_error("chmod", path);
|
|
PyMem_Free(path);
|
|
return NULL;
|
|
}
|
|
PyMem_Free(path);
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
#else /* Py_WIN_WIDE_FILENAMES */
|
|
if (!PyArg_ParseTuple(args, "eti:chmod", Py_FileSystemDefaultEncoding,
|
|
&path, &i))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = chmod(path, i);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return posix_error_with_allocated_filename(path);
|
|
PyMem_Free(path);
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
#endif
|
|
}
|
|
|
|
|
|
#ifdef HAVE_CHROOT
|
|
PyDoc_STRVAR(posix_chroot__doc__,
|
|
"chroot(path)\n\n\
|
|
Change root directory to path.");
|
|
|
|
static PyObject *
|
|
posix_chroot(PyObject *self, PyObject *args)
|
|
{
|
|
return posix_1str(args, "et:chroot", chroot);
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_FSYNC
|
|
PyDoc_STRVAR(posix_fsync__doc__,
|
|
"fsync(fildes)\n\n\
|
|
force write of file with filedescriptor to disk.");
|
|
|
|
static PyObject *
|
|
posix_fsync(PyObject *self, PyObject *fdobj)
|
|
{
|
|
return posix_fildes(fdobj, fsync);
|
|
}
|
|
#endif /* HAVE_FSYNC */
|
|
|
|
#ifdef HAVE_FDATASYNC
|
|
|
|
#ifdef __hpux
|
|
extern int fdatasync(int); /* On HP-UX, in libc but not in unistd.h */
|
|
#endif
|
|
|
|
PyDoc_STRVAR(posix_fdatasync__doc__,
|
|
"fdatasync(fildes)\n\n\
|
|
force write of file with filedescriptor to disk.\n\
|
|
does not force update of metadata.");
|
|
|
|
static PyObject *
|
|
posix_fdatasync(PyObject *self, PyObject *fdobj)
|
|
{
|
|
return posix_fildes(fdobj, fdatasync);
|
|
}
|
|
#endif /* HAVE_FDATASYNC */
|
|
|
|
|
|
#ifdef HAVE_CHOWN
|
|
PyDoc_STRVAR(posix_chown__doc__,
|
|
"chown(path, uid, gid)\n\n\
|
|
Change the owner and group id of path to the numeric uid and gid.");
|
|
|
|
static PyObject *
|
|
posix_chown(PyObject *self, PyObject *args)
|
|
{
|
|
char *path = NULL;
|
|
int uid, gid;
|
|
int res;
|
|
if (!PyArg_ParseTuple(args, "etii:chown",
|
|
Py_FileSystemDefaultEncoding, &path,
|
|
&uid, &gid))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = chown(path, (uid_t) uid, (gid_t) gid);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return posix_error_with_allocated_filename(path);
|
|
PyMem_Free(path);
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif /* HAVE_CHOWN */
|
|
|
|
#ifdef HAVE_LCHOWN
|
|
PyDoc_STRVAR(posix_lchown__doc__,
|
|
"lchown(path, uid, gid)\n\n\
|
|
Change the owner and group id of path to the numeric uid and gid.\n\
|
|
This function will not follow symbolic links.");
|
|
|
|
static PyObject *
|
|
posix_lchown(PyObject *self, PyObject *args)
|
|
{
|
|
char *path = NULL;
|
|
int uid, gid;
|
|
int res;
|
|
if (!PyArg_ParseTuple(args, "etii:lchown",
|
|
Py_FileSystemDefaultEncoding, &path,
|
|
&uid, &gid))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = lchown(path, (uid_t) uid, (gid_t) gid);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return posix_error_with_allocated_filename(path);
|
|
PyMem_Free(path);
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif /* HAVE_LCHOWN */
|
|
|
|
|
|
#ifdef HAVE_GETCWD
|
|
PyDoc_STRVAR(posix_getcwd__doc__,
|
|
"getcwd() -> path\n\n\
|
|
Return a string representing the current working directory.");
|
|
|
|
static PyObject *
|
|
posix_getcwd(PyObject *self, PyObject *noargs)
|
|
{
|
|
char buf[1026];
|
|
char *res;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#if defined(PYOS_OS2) && defined(PYCC_GCC)
|
|
res = _getcwd2(buf, sizeof buf);
|
|
#else
|
|
res = getcwd(buf, sizeof buf);
|
|
#endif
|
|
Py_END_ALLOW_THREADS
|
|
if (res == NULL)
|
|
return posix_error();
|
|
return PyString_FromString(buf);
|
|
}
|
|
|
|
#ifdef Py_USING_UNICODE
|
|
PyDoc_STRVAR(posix_getcwdu__doc__,
|
|
"getcwdu() -> path\n\n\
|
|
Return a unicode string representing the current working directory.");
|
|
|
|
static PyObject *
|
|
posix_getcwdu(PyObject *self, PyObject *noargs)
|
|
{
|
|
char buf[1026];
|
|
char *res;
|
|
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
DWORD len;
|
|
if (unicode_file_names()) {
|
|
wchar_t wbuf[1026];
|
|
wchar_t *wbuf2 = wbuf;
|
|
PyObject *resobj;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
len = GetCurrentDirectoryW(sizeof wbuf/ sizeof wbuf[0], wbuf);
|
|
/* If the buffer is large enough, len does not include the
|
|
terminating \0. If the buffer is too small, len includes
|
|
the space needed for the terminator. */
|
|
if (len >= sizeof wbuf/ sizeof wbuf[0]) {
|
|
wbuf2 = malloc(len * sizeof(wchar_t));
|
|
if (wbuf2)
|
|
len = GetCurrentDirectoryW(len, wbuf2);
|
|
}
|
|
Py_END_ALLOW_THREADS
|
|
if (!wbuf2) {
|
|
PyErr_NoMemory();
|
|
return NULL;
|
|
}
|
|
if (!len) {
|
|
if (wbuf2 != wbuf) free(wbuf2);
|
|
return win32_error("getcwdu", NULL);
|
|
}
|
|
resobj = PyUnicode_FromWideChar(wbuf2, len);
|
|
if (wbuf2 != wbuf) free(wbuf2);
|
|
return resobj;
|
|
}
|
|
#endif
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#if defined(PYOS_OS2) && defined(PYCC_GCC)
|
|
res = _getcwd2(buf, sizeof buf);
|
|
#else
|
|
res = getcwd(buf, sizeof buf);
|
|
#endif
|
|
Py_END_ALLOW_THREADS
|
|
if (res == NULL)
|
|
return posix_error();
|
|
return PyUnicode_Decode(buf, strlen(buf), Py_FileSystemDefaultEncoding,"strict");
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_LINK
|
|
PyDoc_STRVAR(posix_link__doc__,
|
|
"link(src, dst)\n\n\
|
|
Create a hard link to a file.");
|
|
|
|
static PyObject *
|
|
posix_link(PyObject *self, PyObject *args)
|
|
{
|
|
return posix_2str(args, "etet:link", link);
|
|
}
|
|
#endif /* HAVE_LINK */
|
|
|
|
|
|
PyDoc_STRVAR(posix_listdir__doc__,
|
|
"listdir(path) -> list_of_strings\n\n\
|
|
Return a list containing the names of the entries in the directory.\n\
|
|
\n\
|
|
path: path of directory to list\n\
|
|
\n\
|
|
The list is in arbitrary order. It does not include the special\n\
|
|
entries '.' and '..' even if they are present in the directory.");
|
|
|
|
static PyObject *
|
|
posix_listdir(PyObject *self, PyObject *args)
|
|
{
|
|
/* XXX Should redo this putting the (now four) versions of opendir
|
|
in separate files instead of having them all here... */
|
|
#if defined(MS_WINDOWS) && !defined(HAVE_OPENDIR)
|
|
|
|
PyObject *d, *v;
|
|
HANDLE hFindFile;
|
|
BOOL result;
|
|
WIN32_FIND_DATA FileData;
|
|
char namebuf[MAX_PATH+5]; /* Overallocate for \\*.*\0 */
|
|
char *bufptr = namebuf;
|
|
Py_ssize_t len = sizeof(namebuf)-5; /* only claim to have space for MAX_PATH */
|
|
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
/* If on wide-character-capable OS see if argument
|
|
is Unicode and if so use wide API. */
|
|
if (unicode_file_names()) {
|
|
PyObject *po;
|
|
if (PyArg_ParseTuple(args, "U:listdir", &po)) {
|
|
WIN32_FIND_DATAW wFileData;
|
|
Py_UNICODE *wnamebuf;
|
|
Py_UNICODE wch;
|
|
/* Overallocate for \\*.*\0 */
|
|
len = PyUnicode_GET_SIZE(po);
|
|
wnamebuf = malloc((len + 5) * sizeof(wchar_t));
|
|
if (!wnamebuf) {
|
|
PyErr_NoMemory();
|
|
return NULL;
|
|
}
|
|
wcscpy(wnamebuf, PyUnicode_AS_UNICODE(po));
|
|
wch = len > 0 ? wnamebuf[len-1] : '\0';
|
|
if (wch != L'/' && wch != L'\\' && wch != L':')
|
|
wnamebuf[len++] = L'\\';
|
|
wcscpy(wnamebuf + len, L"*.*");
|
|
if ((d = PyList_New(0)) == NULL) {
|
|
free(wnamebuf);
|
|
return NULL;
|
|
}
|
|
hFindFile = FindFirstFileW(wnamebuf, &wFileData);
|
|
if (hFindFile == INVALID_HANDLE_VALUE) {
|
|
int error = GetLastError();
|
|
if (error == ERROR_FILE_NOT_FOUND) {
|
|
free(wnamebuf);
|
|
return d;
|
|
}
|
|
Py_DECREF(d);
|
|
win32_error_unicode("FindFirstFileW", wnamebuf);
|
|
free(wnamebuf);
|
|
return NULL;
|
|
}
|
|
do {
|
|
/* Skip over . and .. */
|
|
if (wcscmp(wFileData.cFileName, L".") != 0 &&
|
|
wcscmp(wFileData.cFileName, L"..") != 0) {
|
|
v = PyUnicode_FromUnicode(wFileData.cFileName, wcslen(wFileData.cFileName));
|
|
if (v == NULL) {
|
|
Py_DECREF(d);
|
|
d = NULL;
|
|
break;
|
|
}
|
|
if (PyList_Append(d, v) != 0) {
|
|
Py_DECREF(v);
|
|
Py_DECREF(d);
|
|
d = NULL;
|
|
break;
|
|
}
|
|
Py_DECREF(v);
|
|
}
|
|
Py_BEGIN_ALLOW_THREADS
|
|
result = FindNextFileW(hFindFile, &wFileData);
|
|
Py_END_ALLOW_THREADS
|
|
/* FindNextFile sets error to ERROR_NO_MORE_FILES if
|
|
it got to the end of the directory. */
|
|
if (!result && GetLastError() != ERROR_NO_MORE_FILES) {
|
|
Py_DECREF(d);
|
|
win32_error_unicode("FindNextFileW", wnamebuf);
|
|
FindClose(hFindFile);
|
|
free(wnamebuf);
|
|
return NULL;
|
|
}
|
|
} while (result == TRUE);
|
|
|
|
if (FindClose(hFindFile) == FALSE) {
|
|
Py_DECREF(d);
|
|
win32_error_unicode("FindClose", wnamebuf);
|
|
free(wnamebuf);
|
|
return NULL;
|
|
}
|
|
free(wnamebuf);
|
|
return d;
|
|
}
|
|
/* Drop the argument parsing error as narrow strings
|
|
are also valid. */
|
|
PyErr_Clear();
|
|
}
|
|
#endif
|
|
|
|
if (!PyArg_ParseTuple(args, "et#:listdir",
|
|
Py_FileSystemDefaultEncoding, &bufptr, &len))
|
|
return NULL;
|
|
if (len > 0) {
|
|
char ch = namebuf[len-1];
|
|
if (ch != SEP && ch != ALTSEP && ch != ':')
|
|
namebuf[len++] = '/';
|
|
}
|
|
strcpy(namebuf + len, "*.*");
|
|
|
|
if ((d = PyList_New(0)) == NULL)
|
|
return NULL;
|
|
|
|
hFindFile = FindFirstFile(namebuf, &FileData);
|
|
if (hFindFile == INVALID_HANDLE_VALUE) {
|
|
int error = GetLastError();
|
|
if (error == ERROR_FILE_NOT_FOUND)
|
|
return d;
|
|
Py_DECREF(d);
|
|
return win32_error("FindFirstFile", namebuf);
|
|
}
|
|
do {
|
|
/* Skip over . and .. */
|
|
if (strcmp(FileData.cFileName, ".") != 0 &&
|
|
strcmp(FileData.cFileName, "..") != 0) {
|
|
v = PyString_FromString(FileData.cFileName);
|
|
if (v == NULL) {
|
|
Py_DECREF(d);
|
|
d = NULL;
|
|
break;
|
|
}
|
|
if (PyList_Append(d, v) != 0) {
|
|
Py_DECREF(v);
|
|
Py_DECREF(d);
|
|
d = NULL;
|
|
break;
|
|
}
|
|
Py_DECREF(v);
|
|
}
|
|
Py_BEGIN_ALLOW_THREADS
|
|
result = FindNextFile(hFindFile, &FileData);
|
|
Py_END_ALLOW_THREADS
|
|
/* FindNextFile sets error to ERROR_NO_MORE_FILES if
|
|
it got to the end of the directory. */
|
|
if (!result && GetLastError() != ERROR_NO_MORE_FILES) {
|
|
Py_DECREF(d);
|
|
win32_error("FindNextFile", namebuf);
|
|
FindClose(hFindFile);
|
|
return NULL;
|
|
}
|
|
} while (result == TRUE);
|
|
|
|
if (FindClose(hFindFile) == FALSE) {
|
|
Py_DECREF(d);
|
|
return win32_error("FindClose", namebuf);
|
|
}
|
|
|
|
return d;
|
|
|
|
#elif defined(PYOS_OS2)
|
|
|
|
#ifndef MAX_PATH
|
|
#define MAX_PATH CCHMAXPATH
|
|
#endif
|
|
char *name, *pt;
|
|
Py_ssize_t len;
|
|
PyObject *d, *v;
|
|
char namebuf[MAX_PATH+5];
|
|
HDIR hdir = 1;
|
|
ULONG srchcnt = 1;
|
|
FILEFINDBUF3 ep;
|
|
APIRET rc;
|
|
|
|
if (!PyArg_ParseTuple(args, "t#:listdir", &name, &len))
|
|
return NULL;
|
|
if (len >= MAX_PATH) {
|
|
PyErr_SetString(PyExc_ValueError, "path too long");
|
|
return NULL;
|
|
}
|
|
strcpy(namebuf, name);
|
|
for (pt = namebuf; *pt; pt++)
|
|
if (*pt == ALTSEP)
|
|
*pt = SEP;
|
|
if (namebuf[len-1] != SEP)
|
|
namebuf[len++] = SEP;
|
|
strcpy(namebuf + len, "*.*");
|
|
|
|
if ((d = PyList_New(0)) == NULL)
|
|
return NULL;
|
|
|
|
rc = DosFindFirst(namebuf, /* Wildcard Pattern to Match */
|
|
&hdir, /* Handle to Use While Search Directory */
|
|
FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM | FILE_DIRECTORY,
|
|
&ep, sizeof(ep), /* Structure to Receive Directory Entry */
|
|
&srchcnt, /* Max and Actual Count of Entries Per Iteration */
|
|
FIL_STANDARD); /* Format of Entry (EAs or Not) */
|
|
|
|
if (rc != NO_ERROR) {
|
|
errno = ENOENT;
|
|
return posix_error_with_filename(name);
|
|
}
|
|
|
|
if (srchcnt > 0) { /* If Directory is NOT Totally Empty, */
|
|
do {
|
|
if (ep.achName[0] == '.'
|
|
&& (ep.achName[1] == '\0' || (ep.achName[1] == '.' && ep.achName[2] == '\0')))
|
|
continue; /* Skip Over "." and ".." Names */
|
|
|
|
strcpy(namebuf, ep.achName);
|
|
|
|
/* Leave Case of Name Alone -- In Native Form */
|
|
/* (Removed Forced Lowercasing Code) */
|
|
|
|
v = PyString_FromString(namebuf);
|
|
if (v == NULL) {
|
|
Py_DECREF(d);
|
|
d = NULL;
|
|
break;
|
|
}
|
|
if (PyList_Append(d, v) != 0) {
|
|
Py_DECREF(v);
|
|
Py_DECREF(d);
|
|
d = NULL;
|
|
break;
|
|
}
|
|
Py_DECREF(v);
|
|
} while (DosFindNext(hdir, &ep, sizeof(ep), &srchcnt) == NO_ERROR && srchcnt > 0);
|
|
}
|
|
|
|
return d;
|
|
#else
|
|
|
|
char *name = NULL;
|
|
PyObject *d, *v;
|
|
DIR *dirp;
|
|
struct dirent *ep;
|
|
int arg_is_unicode = 1;
|
|
|
|
errno = 0;
|
|
if (!PyArg_ParseTuple(args, "U:listdir", &v)) {
|
|
arg_is_unicode = 0;
|
|
PyErr_Clear();
|
|
}
|
|
if (!PyArg_ParseTuple(args, "et:listdir", Py_FileSystemDefaultEncoding, &name))
|
|
return NULL;
|
|
if ((dirp = opendir(name)) == NULL) {
|
|
return posix_error_with_allocated_filename(name);
|
|
}
|
|
if ((d = PyList_New(0)) == NULL) {
|
|
closedir(dirp);
|
|
PyMem_Free(name);
|
|
return NULL;
|
|
}
|
|
for (;;) {
|
|
Py_BEGIN_ALLOW_THREADS
|
|
ep = readdir(dirp);
|
|
Py_END_ALLOW_THREADS
|
|
if (ep == NULL)
|
|
break;
|
|
if (ep->d_name[0] == '.' &&
|
|
(NAMLEN(ep) == 1 ||
|
|
(ep->d_name[1] == '.' && NAMLEN(ep) == 2)))
|
|
continue;
|
|
v = PyString_FromStringAndSize(ep->d_name, NAMLEN(ep));
|
|
if (v == NULL) {
|
|
Py_DECREF(d);
|
|
d = NULL;
|
|
break;
|
|
}
|
|
#ifdef Py_USING_UNICODE
|
|
if (arg_is_unicode) {
|
|
PyObject *w;
|
|
|
|
w = PyUnicode_FromEncodedObject(v,
|
|
Py_FileSystemDefaultEncoding,
|
|
"strict");
|
|
if (w != NULL) {
|
|
Py_DECREF(v);
|
|
v = w;
|
|
}
|
|
else {
|
|
/* fall back to the original byte string, as
|
|
discussed in patch #683592 */
|
|
PyErr_Clear();
|
|
}
|
|
}
|
|
#endif
|
|
if (PyList_Append(d, v) != 0) {
|
|
Py_DECREF(v);
|
|
Py_DECREF(d);
|
|
d = NULL;
|
|
break;
|
|
}
|
|
Py_DECREF(v);
|
|
}
|
|
if (errno != 0 && d != NULL) {
|
|
/* readdir() returned NULL and set errno */
|
|
closedir(dirp);
|
|
Py_DECREF(d);
|
|
return posix_error_with_allocated_filename(name);
|
|
}
|
|
closedir(dirp);
|
|
PyMem_Free(name);
|
|
|
|
return d;
|
|
|
|
#endif /* which OS */
|
|
} /* end of posix_listdir */
|
|
|
|
#ifdef MS_WINDOWS
|
|
/* A helper function for abspath on win32 */
|
|
static PyObject *
|
|
posix__getfullpathname(PyObject *self, PyObject *args)
|
|
{
|
|
/* assume encoded strings wont more than double no of chars */
|
|
char inbuf[MAX_PATH*2];
|
|
char *inbufp = inbuf;
|
|
Py_ssize_t insize = sizeof(inbuf);
|
|
char outbuf[MAX_PATH*2];
|
|
char *temp;
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
if (unicode_file_names()) {
|
|
PyUnicodeObject *po;
|
|
if (PyArg_ParseTuple(args, "U|:_getfullpathname", &po)) {
|
|
Py_UNICODE woutbuf[MAX_PATH*2];
|
|
Py_UNICODE *wtemp;
|
|
if (!GetFullPathNameW(PyUnicode_AS_UNICODE(po),
|
|
sizeof(woutbuf)/sizeof(woutbuf[0]),
|
|
woutbuf, &wtemp))
|
|
return win32_error("GetFullPathName", "");
|
|
return PyUnicode_FromUnicode(woutbuf, wcslen(woutbuf));
|
|
}
|
|
/* Drop the argument parsing error as narrow strings
|
|
are also valid. */
|
|
PyErr_Clear();
|
|
}
|
|
#endif
|
|
if (!PyArg_ParseTuple (args, "et#:_getfullpathname",
|
|
Py_FileSystemDefaultEncoding, &inbufp,
|
|
&insize))
|
|
return NULL;
|
|
if (!GetFullPathName(inbuf, sizeof(outbuf)/sizeof(outbuf[0]),
|
|
outbuf, &temp))
|
|
return win32_error("GetFullPathName", inbuf);
|
|
if (PyUnicode_Check(PyTuple_GetItem(args, 0))) {
|
|
return PyUnicode_Decode(outbuf, strlen(outbuf),
|
|
Py_FileSystemDefaultEncoding, NULL);
|
|
}
|
|
return PyString_FromString(outbuf);
|
|
} /* end of posix__getfullpathname */
|
|
#endif /* MS_WINDOWS */
|
|
|
|
PyDoc_STRVAR(posix_mkdir__doc__,
|
|
"mkdir(path [, mode=0777])\n\n\
|
|
Create a directory.");
|
|
|
|
static PyObject *
|
|
posix_mkdir(PyObject *self, PyObject *args)
|
|
{
|
|
int res;
|
|
char *path = NULL;
|
|
int mode = 0777;
|
|
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
if (unicode_file_names()) {
|
|
PyUnicodeObject *po;
|
|
if (PyArg_ParseTuple(args, "U|i:mkdir", &po, &mode)) {
|
|
Py_BEGIN_ALLOW_THREADS
|
|
/* PyUnicode_AS_UNICODE OK without thread lock as
|
|
it is a simple dereference. */
|
|
res = CreateDirectoryW(PyUnicode_AS_UNICODE(po), NULL);
|
|
Py_END_ALLOW_THREADS
|
|
if (!res)
|
|
return win32_error_unicode("mkdir", PyUnicode_AS_UNICODE(po));
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
/* Drop the argument parsing error as narrow strings
|
|
are also valid. */
|
|
PyErr_Clear();
|
|
}
|
|
if (!PyArg_ParseTuple(args, "et|i:mkdir",
|
|
Py_FileSystemDefaultEncoding, &path, &mode))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
/* PyUnicode_AS_UNICODE OK without thread lock as
|
|
it is a simple dereference. */
|
|
res = CreateDirectoryA(path, NULL);
|
|
Py_END_ALLOW_THREADS
|
|
if (!res) {
|
|
win32_error("mkdir", path);
|
|
PyMem_Free(path);
|
|
return NULL;
|
|
}
|
|
PyMem_Free(path);
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
#else
|
|
|
|
if (!PyArg_ParseTuple(args, "et|i:mkdir",
|
|
Py_FileSystemDefaultEncoding, &path, &mode))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#if ( defined(__WATCOMC__) || defined(PYCC_VACPP) ) && !defined(__QNX__)
|
|
res = mkdir(path);
|
|
#else
|
|
res = mkdir(path, mode);
|
|
#endif
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return posix_error_with_allocated_filename(path);
|
|
PyMem_Free(path);
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
#endif
|
|
}
|
|
|
|
|
|
/* sys/resource.h is needed for at least: wait3(), wait4(), broken nice. */
|
|
#if defined(HAVE_SYS_RESOURCE_H)
|
|
#include <sys/resource.h>
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_NICE
|
|
PyDoc_STRVAR(posix_nice__doc__,
|
|
"nice(inc) -> new_priority\n\n\
|
|
Decrease the priority of process by inc and return the new priority.");
|
|
|
|
static PyObject *
|
|
posix_nice(PyObject *self, PyObject *args)
|
|
{
|
|
int increment, value;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:nice", &increment))
|
|
return NULL;
|
|
|
|
/* There are two flavours of 'nice': one that returns the new
|
|
priority (as required by almost all standards out there) and the
|
|
Linux/FreeBSD/BSDI one, which returns '0' on success and advices
|
|
the use of getpriority() to get the new priority.
|
|
|
|
If we are of the nice family that returns the new priority, we
|
|
need to clear errno before the call, and check if errno is filled
|
|
before calling posix_error() on a returnvalue of -1, because the
|
|
-1 may be the actual new priority! */
|
|
|
|
errno = 0;
|
|
value = nice(increment);
|
|
#if defined(HAVE_BROKEN_NICE) && defined(HAVE_GETPRIORITY)
|
|
if (value == 0)
|
|
value = getpriority(PRIO_PROCESS, 0);
|
|
#endif
|
|
if (value == -1 && errno != 0)
|
|
/* either nice() or getpriority() returned an error */
|
|
return posix_error();
|
|
return PyInt_FromLong((long) value);
|
|
}
|
|
#endif /* HAVE_NICE */
|
|
|
|
PyDoc_STRVAR(posix_rename__doc__,
|
|
"rename(old, new)\n\n\
|
|
Rename a file or directory.");
|
|
|
|
static PyObject *
|
|
posix_rename(PyObject *self, PyObject *args)
|
|
{
|
|
#ifdef MS_WINDOWS
|
|
PyObject *o1, *o2;
|
|
char *p1, *p2;
|
|
BOOL result;
|
|
if (unicode_file_names()) {
|
|
if (!PyArg_ParseTuple(args, "O&O&:rename",
|
|
convert_to_unicode, &o1,
|
|
convert_to_unicode, &o2))
|
|
PyErr_Clear();
|
|
else {
|
|
Py_BEGIN_ALLOW_THREADS
|
|
result = MoveFileW(PyUnicode_AsUnicode(o1),
|
|
PyUnicode_AsUnicode(o2));
|
|
Py_END_ALLOW_THREADS
|
|
Py_DECREF(o1);
|
|
Py_DECREF(o2);
|
|
if (!result)
|
|
return win32_error("rename", NULL);
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
}
|
|
if (!PyArg_ParseTuple(args, "ss:rename", &p1, &p2))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
result = MoveFileA(p1, p2);
|
|
Py_END_ALLOW_THREADS
|
|
if (!result)
|
|
return win32_error("rename", NULL);
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
#else
|
|
return posix_2str(args, "etet:rename", rename);
|
|
#endif
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(posix_rmdir__doc__,
|
|
"rmdir(path)\n\n\
|
|
Remove a directory.");
|
|
|
|
static PyObject *
|
|
posix_rmdir(PyObject *self, PyObject *args)
|
|
{
|
|
#ifdef MS_WINDOWS
|
|
return win32_1str(args, "rmdir", "s:rmdir", RemoveDirectoryA, "U:rmdir", RemoveDirectoryW);
|
|
#else
|
|
return posix_1str(args, "et:rmdir", rmdir);
|
|
#endif
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(posix_stat__doc__,
|
|
"stat(path) -> stat result\n\n\
|
|
Perform a stat system call on the given path.");
|
|
|
|
static PyObject *
|
|
posix_stat(PyObject *self, PyObject *args)
|
|
{
|
|
#ifdef MS_WINDOWS
|
|
return posix_do_stat(self, args, "et:stat", STAT, "U:stat", win32_wstat);
|
|
#else
|
|
return posix_do_stat(self, args, "et:stat", STAT, NULL, NULL);
|
|
#endif
|
|
}
|
|
|
|
|
|
#ifdef HAVE_SYSTEM
|
|
PyDoc_STRVAR(posix_system__doc__,
|
|
"system(command) -> exit_status\n\n\
|
|
Execute the command (a string) in a subshell.");
|
|
|
|
static PyObject *
|
|
posix_system(PyObject *self, PyObject *args)
|
|
{
|
|
char *command;
|
|
long sts;
|
|
if (!PyArg_ParseTuple(args, "s:system", &command))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
sts = system(command);
|
|
Py_END_ALLOW_THREADS
|
|
return PyInt_FromLong(sts);
|
|
}
|
|
#endif
|
|
|
|
|
|
PyDoc_STRVAR(posix_umask__doc__,
|
|
"umask(new_mask) -> old_mask\n\n\
|
|
Set the current numeric umask and return the previous umask.");
|
|
|
|
static PyObject *
|
|
posix_umask(PyObject *self, PyObject *args)
|
|
{
|
|
int i;
|
|
if (!PyArg_ParseTuple(args, "i:umask", &i))
|
|
return NULL;
|
|
i = (int)umask(i);
|
|
if (i < 0)
|
|
return posix_error();
|
|
return PyInt_FromLong((long)i);
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(posix_unlink__doc__,
|
|
"unlink(path)\n\n\
|
|
Remove a file (same as remove(path)).");
|
|
|
|
PyDoc_STRVAR(posix_remove__doc__,
|
|
"remove(path)\n\n\
|
|
Remove a file (same as unlink(path)).");
|
|
|
|
static PyObject *
|
|
posix_unlink(PyObject *self, PyObject *args)
|
|
{
|
|
#ifdef MS_WINDOWS
|
|
return win32_1str(args, "remove", "s:remove", DeleteFileA, "U:remove", DeleteFileW);
|
|
#else
|
|
return posix_1str(args, "et:remove", unlink);
|
|
#endif
|
|
}
|
|
|
|
|
|
#ifdef HAVE_UNAME
|
|
PyDoc_STRVAR(posix_uname__doc__,
|
|
"uname() -> (sysname, nodename, release, version, machine)\n\n\
|
|
Return a tuple identifying the current operating system.");
|
|
|
|
static PyObject *
|
|
posix_uname(PyObject *self, PyObject *noargs)
|
|
{
|
|
struct utsname u;
|
|
int res;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = uname(&u);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return posix_error();
|
|
return Py_BuildValue("(sssss)",
|
|
u.sysname,
|
|
u.nodename,
|
|
u.release,
|
|
u.version,
|
|
u.machine);
|
|
}
|
|
#endif /* HAVE_UNAME */
|
|
|
|
static int
|
|
extract_time(PyObject *t, long* sec, long* usec)
|
|
{
|
|
long intval;
|
|
if (PyFloat_Check(t)) {
|
|
double tval = PyFloat_AsDouble(t);
|
|
PyObject *intobj = t->ob_type->tp_as_number->nb_int(t);
|
|
if (!intobj)
|
|
return -1;
|
|
intval = PyInt_AsLong(intobj);
|
|
Py_DECREF(intobj);
|
|
if (intval == -1 && PyErr_Occurred())
|
|
return -1;
|
|
*sec = intval;
|
|
*usec = (long)((tval - intval) * 1e6); /* can't exceed 1000000 */
|
|
if (*usec < 0)
|
|
/* If rounding gave us a negative number,
|
|
truncate. */
|
|
*usec = 0;
|
|
return 0;
|
|
}
|
|
intval = PyInt_AsLong(t);
|
|
if (intval == -1 && PyErr_Occurred())
|
|
return -1;
|
|
*sec = intval;
|
|
*usec = 0;
|
|
return 0;
|
|
}
|
|
|
|
PyDoc_STRVAR(posix_utime__doc__,
|
|
"utime(path, (atime, mtime))\n\
|
|
utime(path, None)\n\n\
|
|
Set the access and modified time of the file to the given values. If the\n\
|
|
second form is used, set the access and modified times to the current time.");
|
|
|
|
static PyObject *
|
|
posix_utime(PyObject *self, PyObject *args)
|
|
{
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
PyObject *arg;
|
|
PyUnicodeObject *obwpath;
|
|
wchar_t *wpath = NULL;
|
|
char *apath = NULL;
|
|
HANDLE hFile;
|
|
long atimesec, mtimesec, ausec, musec;
|
|
FILETIME atime, mtime;
|
|
PyObject *result = NULL;
|
|
|
|
if (unicode_file_names()) {
|
|
if (PyArg_ParseTuple(args, "UO|:utime", &obwpath, &arg)) {
|
|
wpath = PyUnicode_AS_UNICODE(obwpath);
|
|
Py_BEGIN_ALLOW_THREADS
|
|
hFile = CreateFileW(wpath, FILE_WRITE_ATTRIBUTES, 0,
|
|
NULL, OPEN_EXISTING, 0, NULL);
|
|
Py_END_ALLOW_THREADS
|
|
if (hFile == INVALID_HANDLE_VALUE)
|
|
return win32_error_unicode("utime", wpath);
|
|
} else
|
|
/* Drop the argument parsing error as narrow strings
|
|
are also valid. */
|
|
PyErr_Clear();
|
|
}
|
|
if (!wpath) {
|
|
if (!PyArg_ParseTuple(args, "etO:utime",
|
|
Py_FileSystemDefaultEncoding, &apath, &arg))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
hFile = CreateFileA(apath, FILE_WRITE_ATTRIBUTES, 0,
|
|
NULL, OPEN_EXISTING, 0, NULL);
|
|
Py_END_ALLOW_THREADS
|
|
if (hFile == INVALID_HANDLE_VALUE) {
|
|
win32_error("utime", apath);
|
|
PyMem_Free(apath);
|
|
return NULL;
|
|
}
|
|
PyMem_Free(apath);
|
|
}
|
|
|
|
if (arg == Py_None) {
|
|
SYSTEMTIME now;
|
|
GetSystemTime(&now);
|
|
if (!SystemTimeToFileTime(&now, &mtime) ||
|
|
!SystemTimeToFileTime(&now, &atime)) {
|
|
win32_error("utime", NULL);
|
|
goto done;
|
|
}
|
|
}
|
|
else if (!PyTuple_Check(arg) || PyTuple_Size(arg) != 2) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"utime() arg 2 must be a tuple (atime, mtime)");
|
|
goto done;
|
|
}
|
|
else {
|
|
if (extract_time(PyTuple_GET_ITEM(arg, 0),
|
|
&atimesec, &ausec) == -1)
|
|
goto done;
|
|
time_t_to_FILE_TIME(atimesec, ausec, &atime);
|
|
if (extract_time(PyTuple_GET_ITEM(arg, 1),
|
|
&mtimesec, &musec) == -1)
|
|
goto done;
|
|
time_t_to_FILE_TIME(mtimesec, musec, &mtime);
|
|
}
|
|
if (!SetFileTime(hFile, NULL, &atime, &mtime)) {
|
|
/* Avoid putting the file name into the error here,
|
|
as that may confuse the user into believing that
|
|
something is wrong with the file, when it also
|
|
could be the time stamp that gives a problem. */
|
|
win32_error("utime", NULL);
|
|
}
|
|
Py_INCREF(Py_None);
|
|
result = Py_None;
|
|
done:
|
|
CloseHandle(hFile);
|
|
return result;
|
|
#else /* Py_WIN_WIDE_FILENAMES */
|
|
|
|
char *path = NULL;
|
|
long atime, mtime, ausec, musec;
|
|
int res;
|
|
PyObject* arg;
|
|
|
|
#if defined(HAVE_UTIMES)
|
|
struct timeval buf[2];
|
|
#define ATIME buf[0].tv_sec
|
|
#define MTIME buf[1].tv_sec
|
|
#elif defined(HAVE_UTIME_H)
|
|
/* XXX should define struct utimbuf instead, above */
|
|
struct utimbuf buf;
|
|
#define ATIME buf.actime
|
|
#define MTIME buf.modtime
|
|
#define UTIME_ARG &buf
|
|
#else /* HAVE_UTIMES */
|
|
time_t buf[2];
|
|
#define ATIME buf[0]
|
|
#define MTIME buf[1]
|
|
#define UTIME_ARG buf
|
|
#endif /* HAVE_UTIMES */
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "etO:utime",
|
|
Py_FileSystemDefaultEncoding, &path, &arg))
|
|
return NULL;
|
|
if (arg == Py_None) {
|
|
/* optional time values not given */
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = utime(path, NULL);
|
|
Py_END_ALLOW_THREADS
|
|
}
|
|
else if (!PyTuple_Check(arg) || PyTuple_Size(arg) != 2) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"utime() arg 2 must be a tuple (atime, mtime)");
|
|
PyMem_Free(path);
|
|
return NULL;
|
|
}
|
|
else {
|
|
if (extract_time(PyTuple_GET_ITEM(arg, 0),
|
|
&atime, &ausec) == -1) {
|
|
PyMem_Free(path);
|
|
return NULL;
|
|
}
|
|
if (extract_time(PyTuple_GET_ITEM(arg, 1),
|
|
&mtime, &musec) == -1) {
|
|
PyMem_Free(path);
|
|
return NULL;
|
|
}
|
|
ATIME = atime;
|
|
MTIME = mtime;
|
|
#ifdef HAVE_UTIMES
|
|
buf[0].tv_usec = ausec;
|
|
buf[1].tv_usec = musec;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = utimes(path, buf);
|
|
Py_END_ALLOW_THREADS
|
|
#else
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = utime(path, UTIME_ARG);
|
|
Py_END_ALLOW_THREADS
|
|
#endif /* HAVE_UTIMES */
|
|
}
|
|
if (res < 0) {
|
|
return posix_error_with_allocated_filename(path);
|
|
}
|
|
PyMem_Free(path);
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
#undef UTIME_ARG
|
|
#undef ATIME
|
|
#undef MTIME
|
|
#endif /* Py_WIN_WIDE_FILENAMES */
|
|
}
|
|
|
|
|
|
/* Process operations */
|
|
|
|
PyDoc_STRVAR(posix__exit__doc__,
|
|
"_exit(status)\n\n\
|
|
Exit to the system with specified status, without normal exit processing.");
|
|
|
|
static PyObject *
|
|
posix__exit(PyObject *self, PyObject *args)
|
|
{
|
|
int sts;
|
|
if (!PyArg_ParseTuple(args, "i:_exit", &sts))
|
|
return NULL;
|
|
_exit(sts);
|
|
return NULL; /* Make gcc -Wall happy */
|
|
}
|
|
|
|
#if defined(HAVE_EXECV) || defined(HAVE_SPAWNV)
|
|
static void
|
|
free_string_array(char **array, Py_ssize_t count)
|
|
{
|
|
Py_ssize_t i;
|
|
for (i = 0; i < count; i++)
|
|
PyMem_Free(array[i]);
|
|
PyMem_DEL(array);
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_EXECV
|
|
PyDoc_STRVAR(posix_execv__doc__,
|
|
"execv(path, args)\n\n\
|
|
Execute an executable path with arguments, replacing current process.\n\
|
|
\n\
|
|
path: path of executable file\n\
|
|
args: tuple or list of strings");
|
|
|
|
static PyObject *
|
|
posix_execv(PyObject *self, PyObject *args)
|
|
{
|
|
char *path;
|
|
PyObject *argv;
|
|
char **argvlist;
|
|
Py_ssize_t i, argc;
|
|
PyObject *(*getitem)(PyObject *, Py_ssize_t);
|
|
|
|
/* execv has two arguments: (path, argv), where
|
|
argv is a list or tuple of strings. */
|
|
|
|
if (!PyArg_ParseTuple(args, "etO:execv",
|
|
Py_FileSystemDefaultEncoding,
|
|
&path, &argv))
|
|
return NULL;
|
|
if (PyList_Check(argv)) {
|
|
argc = PyList_Size(argv);
|
|
getitem = PyList_GetItem;
|
|
}
|
|
else if (PyTuple_Check(argv)) {
|
|
argc = PyTuple_Size(argv);
|
|
getitem = PyTuple_GetItem;
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError, "execv() arg 2 must be a tuple or list");
|
|
PyMem_Free(path);
|
|
return NULL;
|
|
}
|
|
|
|
argvlist = PyMem_NEW(char *, argc+1);
|
|
if (argvlist == NULL) {
|
|
PyMem_Free(path);
|
|
return PyErr_NoMemory();
|
|
}
|
|
for (i = 0; i < argc; i++) {
|
|
if (!PyArg_Parse((*getitem)(argv, i), "et",
|
|
Py_FileSystemDefaultEncoding,
|
|
&argvlist[i])) {
|
|
free_string_array(argvlist, i);
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"execv() arg 2 must contain only strings");
|
|
PyMem_Free(path);
|
|
return NULL;
|
|
|
|
}
|
|
}
|
|
argvlist[argc] = NULL;
|
|
|
|
execv(path, argvlist);
|
|
|
|
/* If we get here it's definitely an error */
|
|
|
|
free_string_array(argvlist, argc);
|
|
PyMem_Free(path);
|
|
return posix_error();
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(posix_execve__doc__,
|
|
"execve(path, args, env)\n\n\
|
|
Execute a path with arguments and environment, replacing current process.\n\
|
|
\n\
|
|
path: path of executable file\n\
|
|
args: tuple or list of arguments\n\
|
|
env: dictionary of strings mapping to strings");
|
|
|
|
static PyObject *
|
|
posix_execve(PyObject *self, PyObject *args)
|
|
{
|
|
char *path;
|
|
PyObject *argv, *env;
|
|
char **argvlist;
|
|
char **envlist;
|
|
PyObject *key, *val, *keys=NULL, *vals=NULL;
|
|
Py_ssize_t i, pos, argc, envc;
|
|
PyObject *(*getitem)(PyObject *, Py_ssize_t);
|
|
Py_ssize_t lastarg = 0;
|
|
|
|
/* execve has three arguments: (path, argv, env), where
|
|
argv is a list or tuple of strings and env is a dictionary
|
|
like posix.environ. */
|
|
|
|
if (!PyArg_ParseTuple(args, "etOO:execve",
|
|
Py_FileSystemDefaultEncoding,
|
|
&path, &argv, &env))
|
|
return NULL;
|
|
if (PyList_Check(argv)) {
|
|
argc = PyList_Size(argv);
|
|
getitem = PyList_GetItem;
|
|
}
|
|
else if (PyTuple_Check(argv)) {
|
|
argc = PyTuple_Size(argv);
|
|
getitem = PyTuple_GetItem;
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"execve() arg 2 must be a tuple or list");
|
|
goto fail_0;
|
|
}
|
|
if (!PyMapping_Check(env)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"execve() arg 3 must be a mapping object");
|
|
goto fail_0;
|
|
}
|
|
|
|
argvlist = PyMem_NEW(char *, argc+1);
|
|
if (argvlist == NULL) {
|
|
PyErr_NoMemory();
|
|
goto fail_0;
|
|
}
|
|
for (i = 0; i < argc; i++) {
|
|
if (!PyArg_Parse((*getitem)(argv, i),
|
|
"et;execve() arg 2 must contain only strings",
|
|
Py_FileSystemDefaultEncoding,
|
|
&argvlist[i]))
|
|
{
|
|
lastarg = i;
|
|
goto fail_1;
|
|
}
|
|
}
|
|
lastarg = argc;
|
|
argvlist[argc] = NULL;
|
|
|
|
i = PyMapping_Size(env);
|
|
if (i < 0)
|
|
goto fail_1;
|
|
envlist = PyMem_NEW(char *, i + 1);
|
|
if (envlist == NULL) {
|
|
PyErr_NoMemory();
|
|
goto fail_1;
|
|
}
|
|
envc = 0;
|
|
keys = PyMapping_Keys(env);
|
|
vals = PyMapping_Values(env);
|
|
if (!keys || !vals)
|
|
goto fail_2;
|
|
if (!PyList_Check(keys) || !PyList_Check(vals)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"execve(): env.keys() or env.values() is not a list");
|
|
goto fail_2;
|
|
}
|
|
|
|
for (pos = 0; pos < i; pos++) {
|
|
char *p, *k, *v;
|
|
size_t len;
|
|
|
|
key = PyList_GetItem(keys, pos);
|
|
val = PyList_GetItem(vals, pos);
|
|
if (!key || !val)
|
|
goto fail_2;
|
|
|
|
if (!PyArg_Parse(
|
|
key,
|
|
"s;execve() arg 3 contains a non-string key",
|
|
&k) ||
|
|
!PyArg_Parse(
|
|
val,
|
|
"s;execve() arg 3 contains a non-string value",
|
|
&v))
|
|
{
|
|
goto fail_2;
|
|
}
|
|
|
|
#if defined(PYOS_OS2)
|
|
/* Omit Pseudo-Env Vars that Would Confuse Programs if Passed On */
|
|
if (stricmp(k, "BEGINLIBPATH") != 0 && stricmp(k, "ENDLIBPATH") != 0) {
|
|
#endif
|
|
len = PyString_Size(key) + PyString_Size(val) + 2;
|
|
p = PyMem_NEW(char, len);
|
|
if (p == NULL) {
|
|
PyErr_NoMemory();
|
|
goto fail_2;
|
|
}
|
|
PyOS_snprintf(p, len, "%s=%s", k, v);
|
|
envlist[envc++] = p;
|
|
#if defined(PYOS_OS2)
|
|
}
|
|
#endif
|
|
}
|
|
envlist[envc] = 0;
|
|
|
|
execve(path, argvlist, envlist);
|
|
|
|
/* If we get here it's definitely an error */
|
|
|
|
(void) posix_error();
|
|
|
|
fail_2:
|
|
while (--envc >= 0)
|
|
PyMem_DEL(envlist[envc]);
|
|
PyMem_DEL(envlist);
|
|
fail_1:
|
|
free_string_array(argvlist, lastarg);
|
|
Py_XDECREF(vals);
|
|
Py_XDECREF(keys);
|
|
fail_0:
|
|
PyMem_Free(path);
|
|
return NULL;
|
|
}
|
|
#endif /* HAVE_EXECV */
|
|
|
|
|
|
#ifdef HAVE_SPAWNV
|
|
PyDoc_STRVAR(posix_spawnv__doc__,
|
|
"spawnv(mode, path, args)\n\n\
|
|
Execute the program 'path' in a new process.\n\
|
|
\n\
|
|
mode: mode of process creation\n\
|
|
path: path of executable file\n\
|
|
args: tuple or list of strings");
|
|
|
|
static PyObject *
|
|
posix_spawnv(PyObject *self, PyObject *args)
|
|
{
|
|
char *path;
|
|
PyObject *argv;
|
|
char **argvlist;
|
|
int mode, i;
|
|
Py_ssize_t argc;
|
|
Py_intptr_t spawnval;
|
|
PyObject *(*getitem)(PyObject *, Py_ssize_t);
|
|
|
|
/* spawnv has three arguments: (mode, path, argv), where
|
|
argv is a list or tuple of strings. */
|
|
|
|
if (!PyArg_ParseTuple(args, "ietO:spawnv", &mode,
|
|
Py_FileSystemDefaultEncoding,
|
|
&path, &argv))
|
|
return NULL;
|
|
if (PyList_Check(argv)) {
|
|
argc = PyList_Size(argv);
|
|
getitem = PyList_GetItem;
|
|
}
|
|
else if (PyTuple_Check(argv)) {
|
|
argc = PyTuple_Size(argv);
|
|
getitem = PyTuple_GetItem;
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"spawnv() arg 2 must be a tuple or list");
|
|
PyMem_Free(path);
|
|
return NULL;
|
|
}
|
|
|
|
argvlist = PyMem_NEW(char *, argc+1);
|
|
if (argvlist == NULL) {
|
|
PyMem_Free(path);
|
|
return PyErr_NoMemory();
|
|
}
|
|
for (i = 0; i < argc; i++) {
|
|
if (!PyArg_Parse((*getitem)(argv, i), "et",
|
|
Py_FileSystemDefaultEncoding,
|
|
&argvlist[i])) {
|
|
free_string_array(argvlist, i);
|
|
PyErr_SetString(
|
|
PyExc_TypeError,
|
|
"spawnv() arg 2 must contain only strings");
|
|
PyMem_Free(path);
|
|
return NULL;
|
|
}
|
|
}
|
|
argvlist[argc] = NULL;
|
|
|
|
#if defined(PYOS_OS2) && defined(PYCC_GCC)
|
|
Py_BEGIN_ALLOW_THREADS
|
|
spawnval = spawnv(mode, path, argvlist);
|
|
Py_END_ALLOW_THREADS
|
|
#else
|
|
if (mode == _OLD_P_OVERLAY)
|
|
mode = _P_OVERLAY;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
spawnval = _spawnv(mode, path, argvlist);
|
|
Py_END_ALLOW_THREADS
|
|
#endif
|
|
|
|
free_string_array(argvlist, argc);
|
|
PyMem_Free(path);
|
|
|
|
if (spawnval == -1)
|
|
return posix_error();
|
|
else
|
|
#if SIZEOF_LONG == SIZEOF_VOID_P
|
|
return Py_BuildValue("l", (long) spawnval);
|
|
#else
|
|
return Py_BuildValue("L", (PY_LONG_LONG) spawnval);
|
|
#endif
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(posix_spawnve__doc__,
|
|
"spawnve(mode, path, args, env)\n\n\
|
|
Execute the program 'path' in a new process.\n\
|
|
\n\
|
|
mode: mode of process creation\n\
|
|
path: path of executable file\n\
|
|
args: tuple or list of arguments\n\
|
|
env: dictionary of strings mapping to strings");
|
|
|
|
static PyObject *
|
|
posix_spawnve(PyObject *self, PyObject *args)
|
|
{
|
|
char *path;
|
|
PyObject *argv, *env;
|
|
char **argvlist;
|
|
char **envlist;
|
|
PyObject *key, *val, *keys=NULL, *vals=NULL, *res=NULL;
|
|
int mode, pos, envc;
|
|
Py_ssize_t argc, i;
|
|
Py_intptr_t spawnval;
|
|
PyObject *(*getitem)(PyObject *, Py_ssize_t);
|
|
Py_ssize_t lastarg = 0;
|
|
|
|
/* spawnve has four arguments: (mode, path, argv, env), where
|
|
argv is a list or tuple of strings and env is a dictionary
|
|
like posix.environ. */
|
|
|
|
if (!PyArg_ParseTuple(args, "ietOO:spawnve", &mode,
|
|
Py_FileSystemDefaultEncoding,
|
|
&path, &argv, &env))
|
|
return NULL;
|
|
if (PyList_Check(argv)) {
|
|
argc = PyList_Size(argv);
|
|
getitem = PyList_GetItem;
|
|
}
|
|
else if (PyTuple_Check(argv)) {
|
|
argc = PyTuple_Size(argv);
|
|
getitem = PyTuple_GetItem;
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"spawnve() arg 2 must be a tuple or list");
|
|
goto fail_0;
|
|
}
|
|
if (!PyMapping_Check(env)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"spawnve() arg 3 must be a mapping object");
|
|
goto fail_0;
|
|
}
|
|
|
|
argvlist = PyMem_NEW(char *, argc+1);
|
|
if (argvlist == NULL) {
|
|
PyErr_NoMemory();
|
|
goto fail_0;
|
|
}
|
|
for (i = 0; i < argc; i++) {
|
|
if (!PyArg_Parse((*getitem)(argv, i),
|
|
"et;spawnve() arg 2 must contain only strings",
|
|
Py_FileSystemDefaultEncoding,
|
|
&argvlist[i]))
|
|
{
|
|
lastarg = i;
|
|
goto fail_1;
|
|
}
|
|
}
|
|
lastarg = argc;
|
|
argvlist[argc] = NULL;
|
|
|
|
i = PyMapping_Size(env);
|
|
if (i < 0)
|
|
goto fail_1;
|
|
envlist = PyMem_NEW(char *, i + 1);
|
|
if (envlist == NULL) {
|
|
PyErr_NoMemory();
|
|
goto fail_1;
|
|
}
|
|
envc = 0;
|
|
keys = PyMapping_Keys(env);
|
|
vals = PyMapping_Values(env);
|
|
if (!keys || !vals)
|
|
goto fail_2;
|
|
if (!PyList_Check(keys) || !PyList_Check(vals)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"spawnve(): env.keys() or env.values() is not a list");
|
|
goto fail_2;
|
|
}
|
|
|
|
for (pos = 0; pos < i; pos++) {
|
|
char *p, *k, *v;
|
|
size_t len;
|
|
|
|
key = PyList_GetItem(keys, pos);
|
|
val = PyList_GetItem(vals, pos);
|
|
if (!key || !val)
|
|
goto fail_2;
|
|
|
|
if (!PyArg_Parse(
|
|
key,
|
|
"s;spawnve() arg 3 contains a non-string key",
|
|
&k) ||
|
|
!PyArg_Parse(
|
|
val,
|
|
"s;spawnve() arg 3 contains a non-string value",
|
|
&v))
|
|
{
|
|
goto fail_2;
|
|
}
|
|
len = PyString_Size(key) + PyString_Size(val) + 2;
|
|
p = PyMem_NEW(char, len);
|
|
if (p == NULL) {
|
|
PyErr_NoMemory();
|
|
goto fail_2;
|
|
}
|
|
PyOS_snprintf(p, len, "%s=%s", k, v);
|
|
envlist[envc++] = p;
|
|
}
|
|
envlist[envc] = 0;
|
|
|
|
#if defined(PYOS_OS2) && defined(PYCC_GCC)
|
|
Py_BEGIN_ALLOW_THREADS
|
|
spawnval = spawnve(mode, path, argvlist, envlist);
|
|
Py_END_ALLOW_THREADS
|
|
#else
|
|
if (mode == _OLD_P_OVERLAY)
|
|
mode = _P_OVERLAY;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
spawnval = _spawnve(mode, path, argvlist, envlist);
|
|
Py_END_ALLOW_THREADS
|
|
#endif
|
|
|
|
if (spawnval == -1)
|
|
(void) posix_error();
|
|
else
|
|
#if SIZEOF_LONG == SIZEOF_VOID_P
|
|
res = Py_BuildValue("l", (long) spawnval);
|
|
#else
|
|
res = Py_BuildValue("L", (PY_LONG_LONG) spawnval);
|
|
#endif
|
|
|
|
fail_2:
|
|
while (--envc >= 0)
|
|
PyMem_DEL(envlist[envc]);
|
|
PyMem_DEL(envlist);
|
|
fail_1:
|
|
free_string_array(argvlist, lastarg);
|
|
Py_XDECREF(vals);
|
|
Py_XDECREF(keys);
|
|
fail_0:
|
|
PyMem_Free(path);
|
|
return res;
|
|
}
|
|
|
|
/* OS/2 supports spawnvp & spawnvpe natively */
|
|
#if defined(PYOS_OS2)
|
|
PyDoc_STRVAR(posix_spawnvp__doc__,
|
|
"spawnvp(mode, file, args)\n\n\
|
|
Execute the program 'file' in a new process, using the environment\n\
|
|
search path to find the file.\n\
|
|
\n\
|
|
mode: mode of process creation\n\
|
|
file: executable file name\n\
|
|
args: tuple or list of strings");
|
|
|
|
static PyObject *
|
|
posix_spawnvp(PyObject *self, PyObject *args)
|
|
{
|
|
char *path;
|
|
PyObject *argv;
|
|
char **argvlist;
|
|
int mode, i, argc;
|
|
Py_intptr_t spawnval;
|
|
PyObject *(*getitem)(PyObject *, Py_ssize_t);
|
|
|
|
/* spawnvp has three arguments: (mode, path, argv), where
|
|
argv is a list or tuple of strings. */
|
|
|
|
if (!PyArg_ParseTuple(args, "ietO:spawnvp", &mode,
|
|
Py_FileSystemDefaultEncoding,
|
|
&path, &argv))
|
|
return NULL;
|
|
if (PyList_Check(argv)) {
|
|
argc = PyList_Size(argv);
|
|
getitem = PyList_GetItem;
|
|
}
|
|
else if (PyTuple_Check(argv)) {
|
|
argc = PyTuple_Size(argv);
|
|
getitem = PyTuple_GetItem;
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"spawnvp() arg 2 must be a tuple or list");
|
|
PyMem_Free(path);
|
|
return NULL;
|
|
}
|
|
|
|
argvlist = PyMem_NEW(char *, argc+1);
|
|
if (argvlist == NULL) {
|
|
PyMem_Free(path);
|
|
return PyErr_NoMemory();
|
|
}
|
|
for (i = 0; i < argc; i++) {
|
|
if (!PyArg_Parse((*getitem)(argv, i), "et",
|
|
Py_FileSystemDefaultEncoding,
|
|
&argvlist[i])) {
|
|
free_string_array(argvlist, i);
|
|
PyErr_SetString(
|
|
PyExc_TypeError,
|
|
"spawnvp() arg 2 must contain only strings");
|
|
PyMem_Free(path);
|
|
return NULL;
|
|
}
|
|
}
|
|
argvlist[argc] = NULL;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#if defined(PYCC_GCC)
|
|
spawnval = spawnvp(mode, path, argvlist);
|
|
#else
|
|
spawnval = _spawnvp(mode, path, argvlist);
|
|
#endif
|
|
Py_END_ALLOW_THREADS
|
|
|
|
free_string_array(argvlist, argc);
|
|
PyMem_Free(path);
|
|
|
|
if (spawnval == -1)
|
|
return posix_error();
|
|
else
|
|
return Py_BuildValue("l", (long) spawnval);
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(posix_spawnvpe__doc__,
|
|
"spawnvpe(mode, file, args, env)\n\n\
|
|
Execute the program 'file' in a new process, using the environment\n\
|
|
search path to find the file.\n\
|
|
\n\
|
|
mode: mode of process creation\n\
|
|
file: executable file name\n\
|
|
args: tuple or list of arguments\n\
|
|
env: dictionary of strings mapping to strings");
|
|
|
|
static PyObject *
|
|
posix_spawnvpe(PyObject *self, PyObject *args)
|
|
{
|
|
char *path;
|
|
PyObject *argv, *env;
|
|
char **argvlist;
|
|
char **envlist;
|
|
PyObject *key, *val, *keys=NULL, *vals=NULL, *res=NULL;
|
|
int mode, i, pos, argc, envc;
|
|
Py_intptr_t spawnval;
|
|
PyObject *(*getitem)(PyObject *, Py_ssize_t);
|
|
int lastarg = 0;
|
|
|
|
/* spawnvpe has four arguments: (mode, path, argv, env), where
|
|
argv is a list or tuple of strings and env is a dictionary
|
|
like posix.environ. */
|
|
|
|
if (!PyArg_ParseTuple(args, "ietOO:spawnvpe", &mode,
|
|
Py_FileSystemDefaultEncoding,
|
|
&path, &argv, &env))
|
|
return NULL;
|
|
if (PyList_Check(argv)) {
|
|
argc = PyList_Size(argv);
|
|
getitem = PyList_GetItem;
|
|
}
|
|
else if (PyTuple_Check(argv)) {
|
|
argc = PyTuple_Size(argv);
|
|
getitem = PyTuple_GetItem;
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"spawnvpe() arg 2 must be a tuple or list");
|
|
goto fail_0;
|
|
}
|
|
if (!PyMapping_Check(env)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"spawnvpe() arg 3 must be a mapping object");
|
|
goto fail_0;
|
|
}
|
|
|
|
argvlist = PyMem_NEW(char *, argc+1);
|
|
if (argvlist == NULL) {
|
|
PyErr_NoMemory();
|
|
goto fail_0;
|
|
}
|
|
for (i = 0; i < argc; i++) {
|
|
if (!PyArg_Parse((*getitem)(argv, i),
|
|
"et;spawnvpe() arg 2 must contain only strings",
|
|
Py_FileSystemDefaultEncoding,
|
|
&argvlist[i]))
|
|
{
|
|
lastarg = i;
|
|
goto fail_1;
|
|
}
|
|
}
|
|
lastarg = argc;
|
|
argvlist[argc] = NULL;
|
|
|
|
i = PyMapping_Size(env);
|
|
if (i < 0)
|
|
goto fail_1;
|
|
envlist = PyMem_NEW(char *, i + 1);
|
|
if (envlist == NULL) {
|
|
PyErr_NoMemory();
|
|
goto fail_1;
|
|
}
|
|
envc = 0;
|
|
keys = PyMapping_Keys(env);
|
|
vals = PyMapping_Values(env);
|
|
if (!keys || !vals)
|
|
goto fail_2;
|
|
if (!PyList_Check(keys) || !PyList_Check(vals)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"spawnvpe(): env.keys() or env.values() is not a list");
|
|
goto fail_2;
|
|
}
|
|
|
|
for (pos = 0; pos < i; pos++) {
|
|
char *p, *k, *v;
|
|
size_t len;
|
|
|
|
key = PyList_GetItem(keys, pos);
|
|
val = PyList_GetItem(vals, pos);
|
|
if (!key || !val)
|
|
goto fail_2;
|
|
|
|
if (!PyArg_Parse(
|
|
key,
|
|
"s;spawnvpe() arg 3 contains a non-string key",
|
|
&k) ||
|
|
!PyArg_Parse(
|
|
val,
|
|
"s;spawnvpe() arg 3 contains a non-string value",
|
|
&v))
|
|
{
|
|
goto fail_2;
|
|
}
|
|
len = PyString_Size(key) + PyString_Size(val) + 2;
|
|
p = PyMem_NEW(char, len);
|
|
if (p == NULL) {
|
|
PyErr_NoMemory();
|
|
goto fail_2;
|
|
}
|
|
PyOS_snprintf(p, len, "%s=%s", k, v);
|
|
envlist[envc++] = p;
|
|
}
|
|
envlist[envc] = 0;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#if defined(PYCC_GCC)
|
|
spawnval = spawnve(mode, path, argvlist, envlist);
|
|
#else
|
|
spawnval = _spawnve(mode, path, argvlist, envlist);
|
|
#endif
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (spawnval == -1)
|
|
(void) posix_error();
|
|
else
|
|
res = Py_BuildValue("l", (long) spawnval);
|
|
|
|
fail_2:
|
|
while (--envc >= 0)
|
|
PyMem_DEL(envlist[envc]);
|
|
PyMem_DEL(envlist);
|
|
fail_1:
|
|
free_string_array(argvlist, lastarg);
|
|
Py_XDECREF(vals);
|
|
Py_XDECREF(keys);
|
|
fail_0:
|
|
PyMem_Free(path);
|
|
return res;
|
|
}
|
|
#endif /* PYOS_OS2 */
|
|
#endif /* HAVE_SPAWNV */
|
|
|
|
|
|
#ifdef HAVE_FORK1
|
|
PyDoc_STRVAR(posix_fork1__doc__,
|
|
"fork1() -> pid\n\n\
|
|
Fork a child process with a single multiplexed (i.e., not bound) thread.\n\
|
|
\n\
|
|
Return 0 to child process and PID of child to parent process.");
|
|
|
|
static PyObject *
|
|
posix_fork1(PyObject *self, PyObject *noargs)
|
|
{
|
|
int pid = fork1();
|
|
if (pid == -1)
|
|
return posix_error();
|
|
PyOS_AfterFork();
|
|
return PyInt_FromLong((long)pid);
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_FORK
|
|
PyDoc_STRVAR(posix_fork__doc__,
|
|
"fork() -> pid\n\n\
|
|
Fork a child process.\n\
|
|
Return 0 to child process and PID of child to parent process.");
|
|
|
|
static PyObject *
|
|
posix_fork(PyObject *self, PyObject *noargs)
|
|
{
|
|
int pid = fork();
|
|
if (pid == -1)
|
|
return posix_error();
|
|
if (pid == 0)
|
|
PyOS_AfterFork();
|
|
return PyInt_FromLong((long)pid);
|
|
}
|
|
#endif
|
|
|
|
/* AIX uses /dev/ptc but is otherwise the same as /dev/ptmx */
|
|
/* IRIX has both /dev/ptc and /dev/ptmx, use ptmx */
|
|
#if defined(HAVE_DEV_PTC) && !defined(HAVE_DEV_PTMX)
|
|
#define DEV_PTY_FILE "/dev/ptc"
|
|
#define HAVE_DEV_PTMX
|
|
#else
|
|
#define DEV_PTY_FILE "/dev/ptmx"
|
|
#endif
|
|
|
|
#if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) || defined(HAVE_DEV_PTMX)
|
|
#ifdef HAVE_PTY_H
|
|
#include <pty.h>
|
|
#else
|
|
#ifdef HAVE_LIBUTIL_H
|
|
#include <libutil.h>
|
|
#endif /* HAVE_LIBUTIL_H */
|
|
#endif /* HAVE_PTY_H */
|
|
#ifdef HAVE_STROPTS_H
|
|
#include <stropts.h>
|
|
#endif
|
|
#endif /* defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) || defined(HAVE_DEV_PTMX */
|
|
|
|
#if defined(HAVE_OPENPTY) || defined(HAVE__GETPTY) || defined(HAVE_DEV_PTMX)
|
|
PyDoc_STRVAR(posix_openpty__doc__,
|
|
"openpty() -> (master_fd, slave_fd)\n\n\
|
|
Open a pseudo-terminal, returning open fd's for both master and slave end.\n");
|
|
|
|
static PyObject *
|
|
posix_openpty(PyObject *self, PyObject *noargs)
|
|
{
|
|
int master_fd, slave_fd;
|
|
#ifndef HAVE_OPENPTY
|
|
char * slave_name;
|
|
#endif
|
|
#if defined(HAVE_DEV_PTMX) && !defined(HAVE_OPENPTY) && !defined(HAVE__GETPTY)
|
|
PyOS_sighandler_t sig_saved;
|
|
#ifdef sun
|
|
extern char *ptsname(int fildes);
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef HAVE_OPENPTY
|
|
if (openpty(&master_fd, &slave_fd, NULL, NULL, NULL) != 0)
|
|
return posix_error();
|
|
#elif defined(HAVE__GETPTY)
|
|
slave_name = _getpty(&master_fd, O_RDWR, 0666, 0);
|
|
if (slave_name == NULL)
|
|
return posix_error();
|
|
|
|
slave_fd = open(slave_name, O_RDWR);
|
|
if (slave_fd < 0)
|
|
return posix_error();
|
|
#else
|
|
master_fd = open(DEV_PTY_FILE, O_RDWR | O_NOCTTY); /* open master */
|
|
if (master_fd < 0)
|
|
return posix_error();
|
|
sig_saved = PyOS_setsig(SIGCHLD, SIG_DFL);
|
|
/* change permission of slave */
|
|
if (grantpt(master_fd) < 0) {
|
|
PyOS_setsig(SIGCHLD, sig_saved);
|
|
return posix_error();
|
|
}
|
|
/* unlock slave */
|
|
if (unlockpt(master_fd) < 0) {
|
|
PyOS_setsig(SIGCHLD, sig_saved);
|
|
return posix_error();
|
|
}
|
|
PyOS_setsig(SIGCHLD, sig_saved);
|
|
slave_name = ptsname(master_fd); /* get name of slave */
|
|
if (slave_name == NULL)
|
|
return posix_error();
|
|
slave_fd = open(slave_name, O_RDWR | O_NOCTTY); /* open slave */
|
|
if (slave_fd < 0)
|
|
return posix_error();
|
|
#if !defined(__CYGWIN__) && !defined(HAVE_DEV_PTC)
|
|
ioctl(slave_fd, I_PUSH, "ptem"); /* push ptem */
|
|
ioctl(slave_fd, I_PUSH, "ldterm"); /* push ldterm */
|
|
#ifndef __hpux
|
|
ioctl(slave_fd, I_PUSH, "ttcompat"); /* push ttcompat */
|
|
#endif /* __hpux */
|
|
#endif /* HAVE_CYGWIN */
|
|
#endif /* HAVE_OPENPTY */
|
|
|
|
return Py_BuildValue("(ii)", master_fd, slave_fd);
|
|
|
|
}
|
|
#endif /* defined(HAVE_OPENPTY) || defined(HAVE__GETPTY) || defined(HAVE_DEV_PTMX) */
|
|
|
|
#ifdef HAVE_FORKPTY
|
|
PyDoc_STRVAR(posix_forkpty__doc__,
|
|
"forkpty() -> (pid, master_fd)\n\n\
|
|
Fork a new process with a new pseudo-terminal as controlling tty.\n\n\
|
|
Like fork(), return 0 as pid to child process, and PID of child to parent.\n\
|
|
To both, return fd of newly opened pseudo-terminal.\n");
|
|
|
|
static PyObject *
|
|
posix_forkpty(PyObject *self, PyObject *noargs)
|
|
{
|
|
int master_fd = -1, pid;
|
|
|
|
pid = forkpty(&master_fd, NULL, NULL, NULL);
|
|
if (pid == -1)
|
|
return posix_error();
|
|
if (pid == 0)
|
|
PyOS_AfterFork();
|
|
return Py_BuildValue("(ii)", pid, master_fd);
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_GETEGID
|
|
PyDoc_STRVAR(posix_getegid__doc__,
|
|
"getegid() -> egid\n\n\
|
|
Return the current process's effective group id.");
|
|
|
|
static PyObject *
|
|
posix_getegid(PyObject *self, PyObject *noargs)
|
|
{
|
|
return PyInt_FromLong((long)getegid());
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_GETEUID
|
|
PyDoc_STRVAR(posix_geteuid__doc__,
|
|
"geteuid() -> euid\n\n\
|
|
Return the current process's effective user id.");
|
|
|
|
static PyObject *
|
|
posix_geteuid(PyObject *self, PyObject *noargs)
|
|
{
|
|
return PyInt_FromLong((long)geteuid());
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_GETGID
|
|
PyDoc_STRVAR(posix_getgid__doc__,
|
|
"getgid() -> gid\n\n\
|
|
Return the current process's group id.");
|
|
|
|
static PyObject *
|
|
posix_getgid(PyObject *self, PyObject *noargs)
|
|
{
|
|
return PyInt_FromLong((long)getgid());
|
|
}
|
|
#endif
|
|
|
|
|
|
PyDoc_STRVAR(posix_getpid__doc__,
|
|
"getpid() -> pid\n\n\
|
|
Return the current process id");
|
|
|
|
static PyObject *
|
|
posix_getpid(PyObject *self, PyObject *noargs)
|
|
{
|
|
return PyInt_FromLong((long)getpid());
|
|
}
|
|
|
|
|
|
#ifdef HAVE_GETGROUPS
|
|
PyDoc_STRVAR(posix_getgroups__doc__,
|
|
"getgroups() -> list of group IDs\n\n\
|
|
Return list of supplemental group IDs for the process.");
|
|
|
|
static PyObject *
|
|
posix_getgroups(PyObject *self, PyObject *noargs)
|
|
{
|
|
PyObject *result = NULL;
|
|
|
|
#ifdef NGROUPS_MAX
|
|
#define MAX_GROUPS NGROUPS_MAX
|
|
#else
|
|
/* defined to be 16 on Solaris7, so this should be a small number */
|
|
#define MAX_GROUPS 64
|
|
#endif
|
|
gid_t grouplist[MAX_GROUPS];
|
|
int n;
|
|
|
|
n = getgroups(MAX_GROUPS, grouplist);
|
|
if (n < 0)
|
|
posix_error();
|
|
else {
|
|
result = PyList_New(n);
|
|
if (result != NULL) {
|
|
int i;
|
|
for (i = 0; i < n; ++i) {
|
|
PyObject *o = PyInt_FromLong((long)grouplist[i]);
|
|
if (o == NULL) {
|
|
Py_DECREF(result);
|
|
result = NULL;
|
|
break;
|
|
}
|
|
PyList_SET_ITEM(result, i, o);
|
|
}
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_GETPGID
|
|
PyDoc_STRVAR(posix_getpgid__doc__,
|
|
"getpgid(pid) -> pgid\n\n\
|
|
Call the system call getpgid().");
|
|
|
|
static PyObject *
|
|
posix_getpgid(PyObject *self, PyObject *args)
|
|
{
|
|
int pid, pgid;
|
|
if (!PyArg_ParseTuple(args, "i:getpgid", &pid))
|
|
return NULL;
|
|
pgid = getpgid(pid);
|
|
if (pgid < 0)
|
|
return posix_error();
|
|
return PyInt_FromLong((long)pgid);
|
|
}
|
|
#endif /* HAVE_GETPGID */
|
|
|
|
|
|
#ifdef HAVE_GETPGRP
|
|
PyDoc_STRVAR(posix_getpgrp__doc__,
|
|
"getpgrp() -> pgrp\n\n\
|
|
Return the current process group id.");
|
|
|
|
static PyObject *
|
|
posix_getpgrp(PyObject *self, PyObject *noargs)
|
|
{
|
|
#ifdef GETPGRP_HAVE_ARG
|
|
return PyInt_FromLong((long)getpgrp(0));
|
|
#else /* GETPGRP_HAVE_ARG */
|
|
return PyInt_FromLong((long)getpgrp());
|
|
#endif /* GETPGRP_HAVE_ARG */
|
|
}
|
|
#endif /* HAVE_GETPGRP */
|
|
|
|
|
|
#ifdef HAVE_SETPGRP
|
|
PyDoc_STRVAR(posix_setpgrp__doc__,
|
|
"setpgrp()\n\n\
|
|
Make this process a session leader.");
|
|
|
|
static PyObject *
|
|
posix_setpgrp(PyObject *self, PyObject *noargs)
|
|
{
|
|
#ifdef SETPGRP_HAVE_ARG
|
|
if (setpgrp(0, 0) < 0)
|
|
#else /* SETPGRP_HAVE_ARG */
|
|
if (setpgrp() < 0)
|
|
#endif /* SETPGRP_HAVE_ARG */
|
|
return posix_error();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
#endif /* HAVE_SETPGRP */
|
|
|
|
#ifdef HAVE_GETPPID
|
|
PyDoc_STRVAR(posix_getppid__doc__,
|
|
"getppid() -> ppid\n\n\
|
|
Return the parent's process id.");
|
|
|
|
static PyObject *
|
|
posix_getppid(PyObject *self, PyObject *noargs)
|
|
{
|
|
return PyInt_FromLong((long)getppid());
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_GETLOGIN
|
|
PyDoc_STRVAR(posix_getlogin__doc__,
|
|
"getlogin() -> string\n\n\
|
|
Return the actual login name.");
|
|
|
|
static PyObject *
|
|
posix_getlogin(PyObject *self, PyObject *noargs)
|
|
{
|
|
PyObject *result = NULL;
|
|
char *name;
|
|
int old_errno = errno;
|
|
|
|
errno = 0;
|
|
name = getlogin();
|
|
if (name == NULL) {
|
|
if (errno)
|
|
posix_error();
|
|
else
|
|
PyErr_SetString(PyExc_OSError,
|
|
"unable to determine login name");
|
|
}
|
|
else
|
|
result = PyString_FromString(name);
|
|
errno = old_errno;
|
|
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_GETUID
|
|
PyDoc_STRVAR(posix_getuid__doc__,
|
|
"getuid() -> uid\n\n\
|
|
Return the current process's user id.");
|
|
|
|
static PyObject *
|
|
posix_getuid(PyObject *self, PyObject *noargs)
|
|
{
|
|
return PyInt_FromLong((long)getuid());
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_KILL
|
|
PyDoc_STRVAR(posix_kill__doc__,
|
|
"kill(pid, sig)\n\n\
|
|
Kill a process with a signal.");
|
|
|
|
static PyObject *
|
|
posix_kill(PyObject *self, PyObject *args)
|
|
{
|
|
int pid, sig;
|
|
if (!PyArg_ParseTuple(args, "ii:kill", &pid, &sig))
|
|
return NULL;
|
|
#if defined(PYOS_OS2) && !defined(PYCC_GCC)
|
|
if (sig == XCPT_SIGNAL_INTR || sig == XCPT_SIGNAL_BREAK) {
|
|
APIRET rc;
|
|
if ((rc = DosSendSignalException(pid, sig)) != NO_ERROR)
|
|
return os2_error(rc);
|
|
|
|
} else if (sig == XCPT_SIGNAL_KILLPROC) {
|
|
APIRET rc;
|
|
if ((rc = DosKillProcess(DKP_PROCESS, pid)) != NO_ERROR)
|
|
return os2_error(rc);
|
|
|
|
} else
|
|
return NULL; /* Unrecognized Signal Requested */
|
|
#else
|
|
if (kill(pid, sig) == -1)
|
|
return posix_error();
|
|
#endif
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_KILLPG
|
|
PyDoc_STRVAR(posix_killpg__doc__,
|
|
"killpg(pgid, sig)\n\n\
|
|
Kill a process group with a signal.");
|
|
|
|
static PyObject *
|
|
posix_killpg(PyObject *self, PyObject *args)
|
|
{
|
|
int pgid, sig;
|
|
if (!PyArg_ParseTuple(args, "ii:killpg", &pgid, &sig))
|
|
return NULL;
|
|
if (killpg(pgid, sig) == -1)
|
|
return posix_error();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_PLOCK
|
|
|
|
#ifdef HAVE_SYS_LOCK_H
|
|
#include <sys/lock.h>
|
|
#endif
|
|
|
|
PyDoc_STRVAR(posix_plock__doc__,
|
|
"plock(op)\n\n\
|
|
Lock program segments into memory.");
|
|
|
|
static PyObject *
|
|
posix_plock(PyObject *self, PyObject *args)
|
|
{
|
|
int op;
|
|
if (!PyArg_ParseTuple(args, "i:plock", &op))
|
|
return NULL;
|
|
if (plock(op) == -1)
|
|
return posix_error();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_POPEN
|
|
PyDoc_STRVAR(posix_popen__doc__,
|
|
"popen(command [, mode='r' [, bufsize]]) -> pipe\n\n\
|
|
Open a pipe to/from a command returning a file object.");
|
|
|
|
#if defined(PYOS_OS2)
|
|
#if defined(PYCC_VACPP)
|
|
static int
|
|
async_system(const char *command)
|
|
{
|
|
char errormsg[256], args[1024];
|
|
RESULTCODES rcodes;
|
|
APIRET rc;
|
|
|
|
char *shell = getenv("COMSPEC");
|
|
if (!shell)
|
|
shell = "cmd";
|
|
|
|
/* avoid overflowing the argument buffer */
|
|
if (strlen(shell) + 3 + strlen(command) >= 1024)
|
|
return ERROR_NOT_ENOUGH_MEMORY
|
|
|
|
args[0] = '\0';
|
|
strcat(args, shell);
|
|
strcat(args, "/c ");
|
|
strcat(args, command);
|
|
|
|
/* execute asynchronously, inheriting the environment */
|
|
rc = DosExecPgm(errormsg,
|
|
sizeof(errormsg),
|
|
EXEC_ASYNC,
|
|
args,
|
|
NULL,
|
|
&rcodes,
|
|
shell);
|
|
return rc;
|
|
}
|
|
|
|
static FILE *
|
|
popen(const char *command, const char *mode, int pipesize, int *err)
|
|
{
|
|
int oldfd, tgtfd;
|
|
HFILE pipeh[2];
|
|
APIRET rc;
|
|
|
|
/* mode determines which of stdin or stdout is reconnected to
|
|
* the pipe to the child
|
|
*/
|
|
if (strchr(mode, 'r') != NULL) {
|
|
tgt_fd = 1; /* stdout */
|
|
} else if (strchr(mode, 'w')) {
|
|
tgt_fd = 0; /* stdin */
|
|
} else {
|
|
*err = ERROR_INVALID_ACCESS;
|
|
return NULL;
|
|
}
|
|
|
|
/* setup the pipe */
|
|
if ((rc = DosCreatePipe(&pipeh[0], &pipeh[1], pipesize)) != NO_ERROR) {
|
|
*err = rc;
|
|
return NULL;
|
|
}
|
|
|
|
/* prevent other threads accessing stdio */
|
|
DosEnterCritSec();
|
|
|
|
/* reconnect stdio and execute child */
|
|
oldfd = dup(tgtfd);
|
|
close(tgtfd);
|
|
if (dup2(pipeh[tgtfd], tgtfd) == 0) {
|
|
DosClose(pipeh[tgtfd]);
|
|
rc = async_system(command);
|
|
}
|
|
|
|
/* restore stdio */
|
|
dup2(oldfd, tgtfd);
|
|
close(oldfd);
|
|
|
|
/* allow other threads access to stdio */
|
|
DosExitCritSec();
|
|
|
|
/* if execution of child was successful return file stream */
|
|
if (rc == NO_ERROR)
|
|
return fdopen(pipeh[1 - tgtfd], mode);
|
|
else {
|
|
DosClose(pipeh[1 - tgtfd]);
|
|
*err = rc;
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
static PyObject *
|
|
posix_popen(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
char *mode = "r";
|
|
int err, bufsize = -1;
|
|
FILE *fp;
|
|
PyObject *f;
|
|
if (!PyArg_ParseTuple(args, "s|si:popen", &name, &mode, &bufsize))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
fp = popen(name, mode, (bufsize > 0) ? bufsize : 4096, &err);
|
|
Py_END_ALLOW_THREADS
|
|
if (fp == NULL)
|
|
return os2_error(err);
|
|
|
|
f = PyFile_FromFile(fp, name, mode, fclose);
|
|
if (f != NULL)
|
|
PyFile_SetBufSize(f, bufsize);
|
|
return f;
|
|
}
|
|
|
|
#elif defined(PYCC_GCC)
|
|
|
|
/* standard posix version of popen() support */
|
|
static PyObject *
|
|
posix_popen(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
char *mode = "r";
|
|
int bufsize = -1;
|
|
FILE *fp;
|
|
PyObject *f;
|
|
if (!PyArg_ParseTuple(args, "s|si:popen", &name, &mode, &bufsize))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
fp = popen(name, mode);
|
|
Py_END_ALLOW_THREADS
|
|
if (fp == NULL)
|
|
return posix_error();
|
|
f = PyFile_FromFile(fp, name, mode, pclose);
|
|
if (f != NULL)
|
|
PyFile_SetBufSize(f, bufsize);
|
|
return f;
|
|
}
|
|
|
|
/* fork() under OS/2 has lots'o'warts
|
|
* EMX supports pipe() and spawn*() so we can synthesize popen[234]()
|
|
* most of this code is a ripoff of the win32 code, but using the
|
|
* capabilities of EMX's C library routines
|
|
*/
|
|
|
|
/* These tell _PyPopen() whether to return 1, 2, or 3 file objects. */
|
|
#define POPEN_1 1
|
|
#define POPEN_2 2
|
|
#define POPEN_3 3
|
|
#define POPEN_4 4
|
|
|
|
static PyObject *_PyPopen(char *, int, int, int);
|
|
static int _PyPclose(FILE *file);
|
|
|
|
/*
|
|
* Internal dictionary mapping popen* file pointers to process handles,
|
|
* for use when retrieving the process exit code. See _PyPclose() below
|
|
* for more information on this dictionary's use.
|
|
*/
|
|
static PyObject *_PyPopenProcs = NULL;
|
|
|
|
/* os2emx version of popen2()
|
|
*
|
|
* The result of this function is a pipe (file) connected to the
|
|
* process's stdin, and a pipe connected to the process's stdout.
|
|
*/
|
|
|
|
static PyObject *
|
|
os2emx_popen2(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *f;
|
|
int tm=0;
|
|
|
|
char *cmdstring;
|
|
char *mode = "t";
|
|
int bufsize = -1;
|
|
if (!PyArg_ParseTuple(args, "s|si:popen2", &cmdstring, &mode, &bufsize))
|
|
return NULL;
|
|
|
|
if (*mode == 't')
|
|
tm = O_TEXT;
|
|
else if (*mode != 'b') {
|
|
PyErr_SetString(PyExc_ValueError, "mode must be 't' or 'b'");
|
|
return NULL;
|
|
} else
|
|
tm = O_BINARY;
|
|
|
|
f = _PyPopen(cmdstring, tm, POPEN_2, bufsize);
|
|
|
|
return f;
|
|
}
|
|
|
|
/*
|
|
* Variation on os2emx.popen2
|
|
*
|
|
* The result of this function is 3 pipes - the process's stdin,
|
|
* stdout and stderr
|
|
*/
|
|
|
|
static PyObject *
|
|
os2emx_popen3(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *f;
|
|
int tm = 0;
|
|
|
|
char *cmdstring;
|
|
char *mode = "t";
|
|
int bufsize = -1;
|
|
if (!PyArg_ParseTuple(args, "s|si:popen3", &cmdstring, &mode, &bufsize))
|
|
return NULL;
|
|
|
|
if (*mode == 't')
|
|
tm = O_TEXT;
|
|
else if (*mode != 'b') {
|
|
PyErr_SetString(PyExc_ValueError, "mode must be 't' or 'b'");
|
|
return NULL;
|
|
} else
|
|
tm = O_BINARY;
|
|
|
|
f = _PyPopen(cmdstring, tm, POPEN_3, bufsize);
|
|
|
|
return f;
|
|
}
|
|
|
|
/*
|
|
* Variation on os2emx.popen2
|
|
*
|
|
* The result of this function is 2 pipes - the processes stdin,
|
|
* and stdout+stderr combined as a single pipe.
|
|
*/
|
|
|
|
static PyObject *
|
|
os2emx_popen4(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *f;
|
|
int tm = 0;
|
|
|
|
char *cmdstring;
|
|
char *mode = "t";
|
|
int bufsize = -1;
|
|
if (!PyArg_ParseTuple(args, "s|si:popen4", &cmdstring, &mode, &bufsize))
|
|
return NULL;
|
|
|
|
if (*mode == 't')
|
|
tm = O_TEXT;
|
|
else if (*mode != 'b') {
|
|
PyErr_SetString(PyExc_ValueError, "mode must be 't' or 'b'");
|
|
return NULL;
|
|
} else
|
|
tm = O_BINARY;
|
|
|
|
f = _PyPopen(cmdstring, tm, POPEN_4, bufsize);
|
|
|
|
return f;
|
|
}
|
|
|
|
/* a couple of structures for convenient handling of multiple
|
|
* file handles and pipes
|
|
*/
|
|
struct file_ref
|
|
{
|
|
int handle;
|
|
int flags;
|
|
};
|
|
|
|
struct pipe_ref
|
|
{
|
|
int rd;
|
|
int wr;
|
|
};
|
|
|
|
/* The following code is derived from the win32 code */
|
|
|
|
static PyObject *
|
|
_PyPopen(char *cmdstring, int mode, int n, int bufsize)
|
|
{
|
|
struct file_ref stdio[3];
|
|
struct pipe_ref p_fd[3];
|
|
FILE *p_s[3];
|
|
int file_count, i, pipe_err, pipe_pid;
|
|
char *shell, *sh_name, *opt, *rd_mode, *wr_mode;
|
|
PyObject *f, *p_f[3];
|
|
|
|
/* file modes for subsequent fdopen's on pipe handles */
|
|
if (mode == O_TEXT)
|
|
{
|
|
rd_mode = "rt";
|
|
wr_mode = "wt";
|
|
}
|
|
else
|
|
{
|
|
rd_mode = "rb";
|
|
wr_mode = "wb";
|
|
}
|
|
|
|
/* prepare shell references */
|
|
if ((shell = getenv("EMXSHELL")) == NULL)
|
|
if ((shell = getenv("COMSPEC")) == NULL)
|
|
{
|
|
errno = ENOENT;
|
|
return posix_error();
|
|
}
|
|
|
|
sh_name = _getname(shell);
|
|
if (stricmp(sh_name, "cmd.exe") == 0 || stricmp(sh_name, "4os2.exe") == 0)
|
|
opt = "/c";
|
|
else
|
|
opt = "-c";
|
|
|
|
/* save current stdio fds + their flags, and set not inheritable */
|
|
i = pipe_err = 0;
|
|
while (pipe_err >= 0 && i < 3)
|
|
{
|
|
pipe_err = stdio[i].handle = dup(i);
|
|
stdio[i].flags = fcntl(i, F_GETFD, 0);
|
|
fcntl(stdio[i].handle, F_SETFD, stdio[i].flags | FD_CLOEXEC);
|
|
i++;
|
|
}
|
|
if (pipe_err < 0)
|
|
{
|
|
/* didn't get them all saved - clean up and bail out */
|
|
int saved_err = errno;
|
|
while (i-- > 0)
|
|
{
|
|
close(stdio[i].handle);
|
|
}
|
|
errno = saved_err;
|
|
return posix_error();
|
|
}
|
|
|
|
/* create pipe ends */
|
|
file_count = 2;
|
|
if (n == POPEN_3)
|
|
file_count = 3;
|
|
i = pipe_err = 0;
|
|
while ((pipe_err == 0) && (i < file_count))
|
|
pipe_err = pipe((int *)&p_fd[i++]);
|
|
if (pipe_err < 0)
|
|
{
|
|
/* didn't get them all made - clean up and bail out */
|
|
while (i-- > 0)
|
|
{
|
|
close(p_fd[i].wr);
|
|
close(p_fd[i].rd);
|
|
}
|
|
errno = EPIPE;
|
|
return posix_error();
|
|
}
|
|
|
|
/* change the actual standard IO streams over temporarily,
|
|
* making the retained pipe ends non-inheritable
|
|
*/
|
|
pipe_err = 0;
|
|
|
|
/* - stdin */
|
|
if (dup2(p_fd[0].rd, 0) == 0)
|
|
{
|
|
close(p_fd[0].rd);
|
|
i = fcntl(p_fd[0].wr, F_GETFD, 0);
|
|
fcntl(p_fd[0].wr, F_SETFD, i | FD_CLOEXEC);
|
|
if ((p_s[0] = fdopen(p_fd[0].wr, wr_mode)) == NULL)
|
|
{
|
|
close(p_fd[0].wr);
|
|
pipe_err = -1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
pipe_err = -1;
|
|
}
|
|
|
|
/* - stdout */
|
|
if (pipe_err == 0)
|
|
{
|
|
if (dup2(p_fd[1].wr, 1) == 1)
|
|
{
|
|
close(p_fd[1].wr);
|
|
i = fcntl(p_fd[1].rd, F_GETFD, 0);
|
|
fcntl(p_fd[1].rd, F_SETFD, i | FD_CLOEXEC);
|
|
if ((p_s[1] = fdopen(p_fd[1].rd, rd_mode)) == NULL)
|
|
{
|
|
close(p_fd[1].rd);
|
|
pipe_err = -1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
pipe_err = -1;
|
|
}
|
|
}
|
|
|
|
/* - stderr, as required */
|
|
if (pipe_err == 0)
|
|
switch (n)
|
|
{
|
|
case POPEN_3:
|
|
{
|
|
if (dup2(p_fd[2].wr, 2) == 2)
|
|
{
|
|
close(p_fd[2].wr);
|
|
i = fcntl(p_fd[2].rd, F_GETFD, 0);
|
|
fcntl(p_fd[2].rd, F_SETFD, i | FD_CLOEXEC);
|
|
if ((p_s[2] = fdopen(p_fd[2].rd, rd_mode)) == NULL)
|
|
{
|
|
close(p_fd[2].rd);
|
|
pipe_err = -1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
pipe_err = -1;
|
|
}
|
|
break;
|
|
}
|
|
|
|
case POPEN_4:
|
|
{
|
|
if (dup2(1, 2) != 2)
|
|
{
|
|
pipe_err = -1;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* spawn the child process */
|
|
if (pipe_err == 0)
|
|
{
|
|
pipe_pid = spawnlp(P_NOWAIT, shell, shell, opt, cmdstring, (char *)0);
|
|
if (pipe_pid == -1)
|
|
{
|
|
pipe_err = -1;
|
|
}
|
|
else
|
|
{
|
|
/* save the PID into the FILE structure
|
|
* NOTE: this implementation doesn't actually
|
|
* take advantage of this, but do it for
|
|
* completeness - AIM Apr01
|
|
*/
|
|
for (i = 0; i < file_count; i++)
|
|
p_s[i]->_pid = pipe_pid;
|
|
}
|
|
}
|
|
|
|
/* reset standard IO to normal */
|
|
for (i = 0; i < 3; i++)
|
|
{
|
|
dup2(stdio[i].handle, i);
|
|
fcntl(i, F_SETFD, stdio[i].flags);
|
|
close(stdio[i].handle);
|
|
}
|
|
|
|
/* if any remnant problems, clean up and bail out */
|
|
if (pipe_err < 0)
|
|
{
|
|
for (i = 0; i < 3; i++)
|
|
{
|
|
close(p_fd[i].rd);
|
|
close(p_fd[i].wr);
|
|
}
|
|
errno = EPIPE;
|
|
return posix_error_with_filename(cmdstring);
|
|
}
|
|
|
|
/* build tuple of file objects to return */
|
|
if ((p_f[0] = PyFile_FromFile(p_s[0], cmdstring, wr_mode, _PyPclose)) != NULL)
|
|
PyFile_SetBufSize(p_f[0], bufsize);
|
|
if ((p_f[1] = PyFile_FromFile(p_s[1], cmdstring, rd_mode, _PyPclose)) != NULL)
|
|
PyFile_SetBufSize(p_f[1], bufsize);
|
|
if (n == POPEN_3)
|
|
{
|
|
if ((p_f[2] = PyFile_FromFile(p_s[2], cmdstring, rd_mode, _PyPclose)) != NULL)
|
|
PyFile_SetBufSize(p_f[0], bufsize);
|
|
f = PyTuple_Pack(3, p_f[0], p_f[1], p_f[2]);
|
|
}
|
|
else
|
|
f = PyTuple_Pack(2, p_f[0], p_f[1]);
|
|
|
|
/*
|
|
* Insert the files we've created into the process dictionary
|
|
* all referencing the list with the process handle and the
|
|
* initial number of files (see description below in _PyPclose).
|
|
* Since if _PyPclose later tried to wait on a process when all
|
|
* handles weren't closed, it could create a deadlock with the
|
|
* child, we spend some energy here to try to ensure that we
|
|
* either insert all file handles into the dictionary or none
|
|
* at all. It's a little clumsy with the various popen modes
|
|
* and variable number of files involved.
|
|
*/
|
|
if (!_PyPopenProcs)
|
|
{
|
|
_PyPopenProcs = PyDict_New();
|
|
}
|
|
|
|
if (_PyPopenProcs)
|
|
{
|
|
PyObject *procObj, *pidObj, *intObj, *fileObj[3];
|
|
int ins_rc[3];
|
|
|
|
fileObj[0] = fileObj[1] = fileObj[2] = NULL;
|
|
ins_rc[0] = ins_rc[1] = ins_rc[2] = 0;
|
|
|
|
procObj = PyList_New(2);
|
|
pidObj = PyInt_FromLong((long) pipe_pid);
|
|
intObj = PyInt_FromLong((long) file_count);
|
|
|
|
if (procObj && pidObj && intObj)
|
|
{
|
|
PyList_SetItem(procObj, 0, pidObj);
|
|
PyList_SetItem(procObj, 1, intObj);
|
|
|
|
fileObj[0] = PyLong_FromVoidPtr(p_s[0]);
|
|
if (fileObj[0])
|
|
{
|
|
ins_rc[0] = PyDict_SetItem(_PyPopenProcs,
|
|
fileObj[0],
|
|
procObj);
|
|
}
|
|
fileObj[1] = PyLong_FromVoidPtr(p_s[1]);
|
|
if (fileObj[1])
|
|
{
|
|
ins_rc[1] = PyDict_SetItem(_PyPopenProcs,
|
|
fileObj[1],
|
|
procObj);
|
|
}
|
|
if (file_count >= 3)
|
|
{
|
|
fileObj[2] = PyLong_FromVoidPtr(p_s[2]);
|
|
if (fileObj[2])
|
|
{
|
|
ins_rc[2] = PyDict_SetItem(_PyPopenProcs,
|
|
fileObj[2],
|
|
procObj);
|
|
}
|
|
}
|
|
|
|
if (ins_rc[0] < 0 || !fileObj[0] ||
|
|
ins_rc[1] < 0 || (file_count > 1 && !fileObj[1]) ||
|
|
ins_rc[2] < 0 || (file_count > 2 && !fileObj[2]))
|
|
{
|
|
/* Something failed - remove any dictionary
|
|
* entries that did make it.
|
|
*/
|
|
if (!ins_rc[0] && fileObj[0])
|
|
{
|
|
PyDict_DelItem(_PyPopenProcs,
|
|
fileObj[0]);
|
|
}
|
|
if (!ins_rc[1] && fileObj[1])
|
|
{
|
|
PyDict_DelItem(_PyPopenProcs,
|
|
fileObj[1]);
|
|
}
|
|
if (!ins_rc[2] && fileObj[2])
|
|
{
|
|
PyDict_DelItem(_PyPopenProcs,
|
|
fileObj[2]);
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Clean up our localized references for the dictionary keys
|
|
* and value since PyDict_SetItem will Py_INCREF any copies
|
|
* that got placed in the dictionary.
|
|
*/
|
|
Py_XDECREF(procObj);
|
|
Py_XDECREF(fileObj[0]);
|
|
Py_XDECREF(fileObj[1]);
|
|
Py_XDECREF(fileObj[2]);
|
|
}
|
|
|
|
/* Child is launched. */
|
|
return f;
|
|
}
|
|
|
|
/*
|
|
* Wrapper for fclose() to use for popen* files, so we can retrieve the
|
|
* exit code for the child process and return as a result of the close.
|
|
*
|
|
* This function uses the _PyPopenProcs dictionary in order to map the
|
|
* input file pointer to information about the process that was
|
|
* originally created by the popen* call that created the file pointer.
|
|
* The dictionary uses the file pointer as a key (with one entry
|
|
* inserted for each file returned by the original popen* call) and a
|
|
* single list object as the value for all files from a single call.
|
|
* The list object contains the Win32 process handle at [0], and a file
|
|
* count at [1], which is initialized to the total number of file
|
|
* handles using that list.
|
|
*
|
|
* This function closes whichever handle it is passed, and decrements
|
|
* the file count in the dictionary for the process handle pointed to
|
|
* by this file. On the last close (when the file count reaches zero),
|
|
* this function will wait for the child process and then return its
|
|
* exit code as the result of the close() operation. This permits the
|
|
* files to be closed in any order - it is always the close() of the
|
|
* final handle that will return the exit code.
|
|
*
|
|
* NOTE: This function is currently called with the GIL released.
|
|
* hence we use the GILState API to manage our state.
|
|
*/
|
|
|
|
static int _PyPclose(FILE *file)
|
|
{
|
|
int result;
|
|
int exit_code;
|
|
int pipe_pid;
|
|
PyObject *procObj, *pidObj, *intObj, *fileObj;
|
|
int file_count;
|
|
#ifdef WITH_THREAD
|
|
PyGILState_STATE state;
|
|
#endif
|
|
|
|
/* Close the file handle first, to ensure it can't block the
|
|
* child from exiting if it's the last handle.
|
|
*/
|
|
result = fclose(file);
|
|
|
|
#ifdef WITH_THREAD
|
|
state = PyGILState_Ensure();
|
|
#endif
|
|
if (_PyPopenProcs)
|
|
{
|
|
if ((fileObj = PyLong_FromVoidPtr(file)) != NULL &&
|
|
(procObj = PyDict_GetItem(_PyPopenProcs,
|
|
fileObj)) != NULL &&
|
|
(pidObj = PyList_GetItem(procObj,0)) != NULL &&
|
|
(intObj = PyList_GetItem(procObj,1)) != NULL)
|
|
{
|
|
pipe_pid = (int) PyInt_AsLong(pidObj);
|
|
file_count = (int) PyInt_AsLong(intObj);
|
|
|
|
if (file_count > 1)
|
|
{
|
|
/* Still other files referencing process */
|
|
file_count--;
|
|
PyList_SetItem(procObj,1,
|
|
PyInt_FromLong((long) file_count));
|
|
}
|
|
else
|
|
{
|
|
/* Last file for this process */
|
|
if (result != EOF &&
|
|
waitpid(pipe_pid, &exit_code, 0) == pipe_pid)
|
|
{
|
|
/* extract exit status */
|
|
if (WIFEXITED(exit_code))
|
|
{
|
|
result = WEXITSTATUS(exit_code);
|
|
}
|
|
else
|
|
{
|
|
errno = EPIPE;
|
|
result = -1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* Indicate failure - this will cause the file object
|
|
* to raise an I/O error and translate the last
|
|
* error code from errno. We do have a problem with
|
|
* last errors that overlap the normal errno table,
|
|
* but that's a consistent problem with the file object.
|
|
*/
|
|
result = -1;
|
|
}
|
|
}
|
|
|
|
/* Remove this file pointer from dictionary */
|
|
PyDict_DelItem(_PyPopenProcs, fileObj);
|
|
|
|
if (PyDict_Size(_PyPopenProcs) == 0)
|
|
{
|
|
Py_DECREF(_PyPopenProcs);
|
|
_PyPopenProcs = NULL;
|
|
}
|
|
|
|
} /* if object retrieval ok */
|
|
|
|
Py_XDECREF(fileObj);
|
|
} /* if _PyPopenProcs */
|
|
|
|
#ifdef WITH_THREAD
|
|
PyGILState_Release(state);
|
|
#endif
|
|
return result;
|
|
}
|
|
|
|
#endif /* PYCC_??? */
|
|
|
|
#elif defined(MS_WINDOWS)
|
|
|
|
/*
|
|
* Portable 'popen' replacement for Win32.
|
|
*
|
|
* Written by Bill Tutt <billtut@microsoft.com>. Minor tweaks
|
|
* and 2.0 integration by Fredrik Lundh <fredrik@pythonware.com>
|
|
* Return code handling by David Bolen <db3l@fitlinxx.com>.
|
|
*/
|
|
|
|
#include <malloc.h>
|
|
#include <io.h>
|
|
#include <fcntl.h>
|
|
|
|
/* These tell _PyPopen() wether to return 1, 2, or 3 file objects. */
|
|
#define POPEN_1 1
|
|
#define POPEN_2 2
|
|
#define POPEN_3 3
|
|
#define POPEN_4 4
|
|
|
|
static PyObject *_PyPopen(char *, int, int);
|
|
static int _PyPclose(FILE *file);
|
|
|
|
/*
|
|
* Internal dictionary mapping popen* file pointers to process handles,
|
|
* for use when retrieving the process exit code. See _PyPclose() below
|
|
* for more information on this dictionary's use.
|
|
*/
|
|
static PyObject *_PyPopenProcs = NULL;
|
|
|
|
|
|
/* popen that works from a GUI.
|
|
*
|
|
* The result of this function is a pipe (file) connected to the
|
|
* processes stdin or stdout, depending on the requested mode.
|
|
*/
|
|
|
|
static PyObject *
|
|
posix_popen(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *f;
|
|
int tm = 0;
|
|
|
|
char *cmdstring;
|
|
char *mode = "r";
|
|
int bufsize = -1;
|
|
if (!PyArg_ParseTuple(args, "s|si:popen", &cmdstring, &mode, &bufsize))
|
|
return NULL;
|
|
|
|
if (*mode == 'r')
|
|
tm = _O_RDONLY;
|
|
else if (*mode != 'w') {
|
|
PyErr_SetString(PyExc_ValueError, "popen() arg 2 must be 'r' or 'w'");
|
|
return NULL;
|
|
} else
|
|
tm = _O_WRONLY;
|
|
|
|
if (bufsize != -1) {
|
|
PyErr_SetString(PyExc_ValueError, "popen() arg 3 must be -1");
|
|
return NULL;
|
|
}
|
|
|
|
if (*(mode+1) == 't')
|
|
f = _PyPopen(cmdstring, tm | _O_TEXT, POPEN_1);
|
|
else if (*(mode+1) == 'b')
|
|
f = _PyPopen(cmdstring, tm | _O_BINARY, POPEN_1);
|
|
else
|
|
f = _PyPopen(cmdstring, tm | _O_TEXT, POPEN_1);
|
|
|
|
return f;
|
|
}
|
|
|
|
/* Variation on win32pipe.popen
|
|
*
|
|
* The result of this function is a pipe (file) connected to the
|
|
* process's stdin, and a pipe connected to the process's stdout.
|
|
*/
|
|
|
|
static PyObject *
|
|
win32_popen2(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *f;
|
|
int tm=0;
|
|
|
|
char *cmdstring;
|
|
char *mode = "t";
|
|
int bufsize = -1;
|
|
if (!PyArg_ParseTuple(args, "s|si:popen2", &cmdstring, &mode, &bufsize))
|
|
return NULL;
|
|
|
|
if (*mode == 't')
|
|
tm = _O_TEXT;
|
|
else if (*mode != 'b') {
|
|
PyErr_SetString(PyExc_ValueError, "popen2() arg 2 must be 't' or 'b'");
|
|
return NULL;
|
|
} else
|
|
tm = _O_BINARY;
|
|
|
|
if (bufsize != -1) {
|
|
PyErr_SetString(PyExc_ValueError, "popen2() arg 3 must be -1");
|
|
return NULL;
|
|
}
|
|
|
|
f = _PyPopen(cmdstring, tm, POPEN_2);
|
|
|
|
return f;
|
|
}
|
|
|
|
/*
|
|
* Variation on <om win32pipe.popen>
|
|
*
|
|
* The result of this function is 3 pipes - the process's stdin,
|
|
* stdout and stderr
|
|
*/
|
|
|
|
static PyObject *
|
|
win32_popen3(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *f;
|
|
int tm = 0;
|
|
|
|
char *cmdstring;
|
|
char *mode = "t";
|
|
int bufsize = -1;
|
|
if (!PyArg_ParseTuple(args, "s|si:popen3", &cmdstring, &mode, &bufsize))
|
|
return NULL;
|
|
|
|
if (*mode == 't')
|
|
tm = _O_TEXT;
|
|
else if (*mode != 'b') {
|
|
PyErr_SetString(PyExc_ValueError, "popen3() arg 2 must be 't' or 'b'");
|
|
return NULL;
|
|
} else
|
|
tm = _O_BINARY;
|
|
|
|
if (bufsize != -1) {
|
|
PyErr_SetString(PyExc_ValueError, "popen3() arg 3 must be -1");
|
|
return NULL;
|
|
}
|
|
|
|
f = _PyPopen(cmdstring, tm, POPEN_3);
|
|
|
|
return f;
|
|
}
|
|
|
|
/*
|
|
* Variation on win32pipe.popen
|
|
*
|
|
* The result of this function is 2 pipes - the processes stdin,
|
|
* and stdout+stderr combined as a single pipe.
|
|
*/
|
|
|
|
static PyObject *
|
|
win32_popen4(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *f;
|
|
int tm = 0;
|
|
|
|
char *cmdstring;
|
|
char *mode = "t";
|
|
int bufsize = -1;
|
|
if (!PyArg_ParseTuple(args, "s|si:popen4", &cmdstring, &mode, &bufsize))
|
|
return NULL;
|
|
|
|
if (*mode == 't')
|
|
tm = _O_TEXT;
|
|
else if (*mode != 'b') {
|
|
PyErr_SetString(PyExc_ValueError, "popen4() arg 2 must be 't' or 'b'");
|
|
return NULL;
|
|
} else
|
|
tm = _O_BINARY;
|
|
|
|
if (bufsize != -1) {
|
|
PyErr_SetString(PyExc_ValueError, "popen4() arg 3 must be -1");
|
|
return NULL;
|
|
}
|
|
|
|
f = _PyPopen(cmdstring, tm, POPEN_4);
|
|
|
|
return f;
|
|
}
|
|
|
|
static BOOL
|
|
_PyPopenCreateProcess(char *cmdstring,
|
|
HANDLE hStdin,
|
|
HANDLE hStdout,
|
|
HANDLE hStderr,
|
|
HANDLE *hProcess)
|
|
{
|
|
PROCESS_INFORMATION piProcInfo;
|
|
STARTUPINFO siStartInfo;
|
|
DWORD dwProcessFlags = 0; /* no NEW_CONSOLE by default for Ctrl+C handling */
|
|
char *s1,*s2, *s3 = " /c ";
|
|
const char *szConsoleSpawn = "w9xpopen.exe";
|
|
int i;
|
|
Py_ssize_t x;
|
|
|
|
if (i = GetEnvironmentVariable("COMSPEC",NULL,0)) {
|
|
char *comshell;
|
|
|
|
s1 = (char *)alloca(i);
|
|
if (!(x = GetEnvironmentVariable("COMSPEC", s1, i)))
|
|
/* x < i, so x fits into an integer */
|
|
return (int)x;
|
|
|
|
/* Explicitly check if we are using COMMAND.COM. If we are
|
|
* then use the w9xpopen hack.
|
|
*/
|
|
comshell = s1 + x;
|
|
while (comshell >= s1 && *comshell != '\\')
|
|
--comshell;
|
|
++comshell;
|
|
|
|
if (GetVersion() < 0x80000000 &&
|
|
_stricmp(comshell, "command.com") != 0) {
|
|
/* NT/2000 and not using command.com. */
|
|
x = i + strlen(s3) + strlen(cmdstring) + 1;
|
|
s2 = (char *)alloca(x);
|
|
ZeroMemory(s2, x);
|
|
PyOS_snprintf(s2, x, "%s%s%s", s1, s3, cmdstring);
|
|
}
|
|
else {
|
|
/*
|
|
* Oh gag, we're on Win9x or using COMMAND.COM. Use
|
|
* the workaround listed in KB: Q150956
|
|
*/
|
|
char modulepath[_MAX_PATH];
|
|
struct stat statinfo;
|
|
GetModuleFileName(NULL, modulepath, sizeof(modulepath));
|
|
for (x = i = 0; modulepath[i]; i++)
|
|
if (modulepath[i] == SEP)
|
|
x = i+1;
|
|
modulepath[x] = '\0';
|
|
/* Create the full-name to w9xpopen, so we can test it exists */
|
|
strncat(modulepath,
|
|
szConsoleSpawn,
|
|
(sizeof(modulepath)/sizeof(modulepath[0]))
|
|
-strlen(modulepath));
|
|
if (stat(modulepath, &statinfo) != 0) {
|
|
/* Eeek - file-not-found - possibly an embedding
|
|
situation - see if we can locate it in sys.prefix
|
|
*/
|
|
strncpy(modulepath,
|
|
Py_GetExecPrefix(),
|
|
sizeof(modulepath)/sizeof(modulepath[0]));
|
|
if (modulepath[strlen(modulepath)-1] != '\\')
|
|
strcat(modulepath, "\\");
|
|
strncat(modulepath,
|
|
szConsoleSpawn,
|
|
(sizeof(modulepath)/sizeof(modulepath[0]))
|
|
-strlen(modulepath));
|
|
/* No where else to look - raise an easily identifiable
|
|
error, rather than leaving Windows to report
|
|
"file not found" - as the user is probably blissfully
|
|
unaware this shim EXE is used, and it will confuse them.
|
|
(well, it confused me for a while ;-)
|
|
*/
|
|
if (stat(modulepath, &statinfo) != 0) {
|
|
PyErr_Format(PyExc_RuntimeError,
|
|
"Can not locate '%s' which is needed "
|
|
"for popen to work with your shell "
|
|
"or platform.",
|
|
szConsoleSpawn);
|
|
return FALSE;
|
|
}
|
|
}
|
|
x = i + strlen(s3) + strlen(cmdstring) + 1 +
|
|
strlen(modulepath) +
|
|
strlen(szConsoleSpawn) + 1;
|
|
|
|
s2 = (char *)alloca(x);
|
|
ZeroMemory(s2, x);
|
|
/* To maintain correct argument passing semantics,
|
|
we pass the command-line as it stands, and allow
|
|
quoting to be applied. w9xpopen.exe will then
|
|
use its argv vector, and re-quote the necessary
|
|
args for the ultimate child process.
|
|
*/
|
|
PyOS_snprintf(
|
|
s2, x,
|
|
"\"%s\" %s%s%s",
|
|
modulepath,
|
|
s1,
|
|
s3,
|
|
cmdstring);
|
|
/* Not passing CREATE_NEW_CONSOLE has been known to
|
|
cause random failures on win9x. Specifically a
|
|
dialog:
|
|
"Your program accessed mem currently in use at xxx"
|
|
and a hopeful warning about the stability of your
|
|
system.
|
|
Cost is Ctrl+C wont kill children, but anyone
|
|
who cares can have a go!
|
|
*/
|
|
dwProcessFlags |= CREATE_NEW_CONSOLE;
|
|
}
|
|
}
|
|
|
|
/* Could be an else here to try cmd.exe / command.com in the path
|
|
Now we'll just error out.. */
|
|
else {
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"Cannot locate a COMSPEC environment variable to "
|
|
"use as the shell");
|
|
return FALSE;
|
|
}
|
|
|
|
ZeroMemory(&siStartInfo, sizeof(STARTUPINFO));
|
|
siStartInfo.cb = sizeof(STARTUPINFO);
|
|
siStartInfo.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
|
|
siStartInfo.hStdInput = hStdin;
|
|
siStartInfo.hStdOutput = hStdout;
|
|
siStartInfo.hStdError = hStderr;
|
|
siStartInfo.wShowWindow = SW_HIDE;
|
|
|
|
if (CreateProcess(NULL,
|
|
s2,
|
|
NULL,
|
|
NULL,
|
|
TRUE,
|
|
dwProcessFlags,
|
|
NULL,
|
|
NULL,
|
|
&siStartInfo,
|
|
&piProcInfo) ) {
|
|
/* Close the handles now so anyone waiting is woken. */
|
|
CloseHandle(piProcInfo.hThread);
|
|
|
|
/* Return process handle */
|
|
*hProcess = piProcInfo.hProcess;
|
|
return TRUE;
|
|
}
|
|
win32_error("CreateProcess", s2);
|
|
return FALSE;
|
|
}
|
|
|
|
/* The following code is based off of KB: Q190351 */
|
|
|
|
static PyObject *
|
|
_PyPopen(char *cmdstring, int mode, int n)
|
|
{
|
|
HANDLE hChildStdinRd, hChildStdinWr, hChildStdoutRd, hChildStdoutWr,
|
|
hChildStderrRd, hChildStderrWr, hChildStdinWrDup, hChildStdoutRdDup,
|
|
hChildStderrRdDup, hProcess; /* hChildStdoutWrDup; */
|
|
|
|
SECURITY_ATTRIBUTES saAttr;
|
|
BOOL fSuccess;
|
|
int fd1, fd2, fd3;
|
|
FILE *f1, *f2, *f3;
|
|
long file_count;
|
|
PyObject *f;
|
|
|
|
saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
|
|
saAttr.bInheritHandle = TRUE;
|
|
saAttr.lpSecurityDescriptor = NULL;
|
|
|
|
if (!CreatePipe(&hChildStdinRd, &hChildStdinWr, &saAttr, 0))
|
|
return win32_error("CreatePipe", NULL);
|
|
|
|
/* Create new output read handle and the input write handle. Set
|
|
* the inheritance properties to FALSE. Otherwise, the child inherits
|
|
* these handles; resulting in non-closeable handles to the pipes
|
|
* being created. */
|
|
fSuccess = DuplicateHandle(GetCurrentProcess(), hChildStdinWr,
|
|
GetCurrentProcess(), &hChildStdinWrDup, 0,
|
|
FALSE,
|
|
DUPLICATE_SAME_ACCESS);
|
|
if (!fSuccess)
|
|
return win32_error("DuplicateHandle", NULL);
|
|
|
|
/* Close the inheritable version of ChildStdin
|
|
that we're using. */
|
|
CloseHandle(hChildStdinWr);
|
|
|
|
if (!CreatePipe(&hChildStdoutRd, &hChildStdoutWr, &saAttr, 0))
|
|
return win32_error("CreatePipe", NULL);
|
|
|
|
fSuccess = DuplicateHandle(GetCurrentProcess(), hChildStdoutRd,
|
|
GetCurrentProcess(), &hChildStdoutRdDup, 0,
|
|
FALSE, DUPLICATE_SAME_ACCESS);
|
|
if (!fSuccess)
|
|
return win32_error("DuplicateHandle", NULL);
|
|
|
|
/* Close the inheritable version of ChildStdout
|
|
that we're using. */
|
|
CloseHandle(hChildStdoutRd);
|
|
|
|
if (n != POPEN_4) {
|
|
if (!CreatePipe(&hChildStderrRd, &hChildStderrWr, &saAttr, 0))
|
|
return win32_error("CreatePipe", NULL);
|
|
fSuccess = DuplicateHandle(GetCurrentProcess(),
|
|
hChildStderrRd,
|
|
GetCurrentProcess(),
|
|
&hChildStderrRdDup, 0,
|
|
FALSE, DUPLICATE_SAME_ACCESS);
|
|
if (!fSuccess)
|
|
return win32_error("DuplicateHandle", NULL);
|
|
/* Close the inheritable version of ChildStdErr that we're using. */
|
|
CloseHandle(hChildStderrRd);
|
|
}
|
|
|
|
switch (n) {
|
|
case POPEN_1:
|
|
switch (mode & (_O_RDONLY | _O_TEXT | _O_BINARY | _O_WRONLY)) {
|
|
case _O_WRONLY | _O_TEXT:
|
|
/* Case for writing to child Stdin in text mode. */
|
|
fd1 = _open_osfhandle((Py_intptr_t)hChildStdinWrDup, mode);
|
|
f1 = _fdopen(fd1, "w");
|
|
f = PyFile_FromFile(f1, cmdstring, "w", _PyPclose);
|
|
PyFile_SetBufSize(f, 0);
|
|
/* We don't care about these pipes anymore, so close them. */
|
|
CloseHandle(hChildStdoutRdDup);
|
|
CloseHandle(hChildStderrRdDup);
|
|
break;
|
|
|
|
case _O_RDONLY | _O_TEXT:
|
|
/* Case for reading from child Stdout in text mode. */
|
|
fd1 = _open_osfhandle((Py_intptr_t)hChildStdoutRdDup, mode);
|
|
f1 = _fdopen(fd1, "r");
|
|
f = PyFile_FromFile(f1, cmdstring, "r", _PyPclose);
|
|
PyFile_SetBufSize(f, 0);
|
|
/* We don't care about these pipes anymore, so close them. */
|
|
CloseHandle(hChildStdinWrDup);
|
|
CloseHandle(hChildStderrRdDup);
|
|
break;
|
|
|
|
case _O_RDONLY | _O_BINARY:
|
|
/* Case for readinig from child Stdout in binary mode. */
|
|
fd1 = _open_osfhandle((Py_intptr_t)hChildStdoutRdDup, mode);
|
|
f1 = _fdopen(fd1, "rb");
|
|
f = PyFile_FromFile(f1, cmdstring, "rb", _PyPclose);
|
|
PyFile_SetBufSize(f, 0);
|
|
/* We don't care about these pipes anymore, so close them. */
|
|
CloseHandle(hChildStdinWrDup);
|
|
CloseHandle(hChildStderrRdDup);
|
|
break;
|
|
|
|
case _O_WRONLY | _O_BINARY:
|
|
/* Case for writing to child Stdin in binary mode. */
|
|
fd1 = _open_osfhandle((Py_intptr_t)hChildStdinWrDup, mode);
|
|
f1 = _fdopen(fd1, "wb");
|
|
f = PyFile_FromFile(f1, cmdstring, "wb", _PyPclose);
|
|
PyFile_SetBufSize(f, 0);
|
|
/* We don't care about these pipes anymore, so close them. */
|
|
CloseHandle(hChildStdoutRdDup);
|
|
CloseHandle(hChildStderrRdDup);
|
|
break;
|
|
}
|
|
file_count = 1;
|
|
break;
|
|
|
|
case POPEN_2:
|
|
case POPEN_4:
|
|
{
|
|
char *m1, *m2;
|
|
PyObject *p1, *p2;
|
|
|
|
if (mode & _O_TEXT) {
|
|
m1 = "r";
|
|
m2 = "w";
|
|
} else {
|
|
m1 = "rb";
|
|
m2 = "wb";
|
|
}
|
|
|
|
fd1 = _open_osfhandle((Py_intptr_t)hChildStdinWrDup, mode);
|
|
f1 = _fdopen(fd1, m2);
|
|
fd2 = _open_osfhandle((Py_intptr_t)hChildStdoutRdDup, mode);
|
|
f2 = _fdopen(fd2, m1);
|
|
p1 = PyFile_FromFile(f1, cmdstring, m2, _PyPclose);
|
|
PyFile_SetBufSize(p1, 0);
|
|
p2 = PyFile_FromFile(f2, cmdstring, m1, _PyPclose);
|
|
PyFile_SetBufSize(p2, 0);
|
|
|
|
if (n != 4)
|
|
CloseHandle(hChildStderrRdDup);
|
|
|
|
f = PyTuple_Pack(2,p1,p2);
|
|
Py_XDECREF(p1);
|
|
Py_XDECREF(p2);
|
|
file_count = 2;
|
|
break;
|
|
}
|
|
|
|
case POPEN_3:
|
|
{
|
|
char *m1, *m2;
|
|
PyObject *p1, *p2, *p3;
|
|
|
|
if (mode & _O_TEXT) {
|
|
m1 = "r";
|
|
m2 = "w";
|
|
} else {
|
|
m1 = "rb";
|
|
m2 = "wb";
|
|
}
|
|
|
|
fd1 = _open_osfhandle((Py_intptr_t)hChildStdinWrDup, mode);
|
|
f1 = _fdopen(fd1, m2);
|
|
fd2 = _open_osfhandle((Py_intptr_t)hChildStdoutRdDup, mode);
|
|
f2 = _fdopen(fd2, m1);
|
|
fd3 = _open_osfhandle((Py_intptr_t)hChildStderrRdDup, mode);
|
|
f3 = _fdopen(fd3, m1);
|
|
p1 = PyFile_FromFile(f1, cmdstring, m2, _PyPclose);
|
|
p2 = PyFile_FromFile(f2, cmdstring, m1, _PyPclose);
|
|
p3 = PyFile_FromFile(f3, cmdstring, m1, _PyPclose);
|
|
PyFile_SetBufSize(p1, 0);
|
|
PyFile_SetBufSize(p2, 0);
|
|
PyFile_SetBufSize(p3, 0);
|
|
f = PyTuple_Pack(3,p1,p2,p3);
|
|
Py_XDECREF(p1);
|
|
Py_XDECREF(p2);
|
|
Py_XDECREF(p3);
|
|
file_count = 3;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (n == POPEN_4) {
|
|
if (!_PyPopenCreateProcess(cmdstring,
|
|
hChildStdinRd,
|
|
hChildStdoutWr,
|
|
hChildStdoutWr,
|
|
&hProcess))
|
|
return NULL;
|
|
}
|
|
else {
|
|
if (!_PyPopenCreateProcess(cmdstring,
|
|
hChildStdinRd,
|
|
hChildStdoutWr,
|
|
hChildStderrWr,
|
|
&hProcess))
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Insert the files we've created into the process dictionary
|
|
* all referencing the list with the process handle and the
|
|
* initial number of files (see description below in _PyPclose).
|
|
* Since if _PyPclose later tried to wait on a process when all
|
|
* handles weren't closed, it could create a deadlock with the
|
|
* child, we spend some energy here to try to ensure that we
|
|
* either insert all file handles into the dictionary or none
|
|
* at all. It's a little clumsy with the various popen modes
|
|
* and variable number of files involved.
|
|
*/
|
|
if (!_PyPopenProcs) {
|
|
_PyPopenProcs = PyDict_New();
|
|
}
|
|
|
|
if (_PyPopenProcs) {
|
|
PyObject *procObj, *hProcessObj, *intObj, *fileObj[3];
|
|
int ins_rc[3];
|
|
|
|
fileObj[0] = fileObj[1] = fileObj[2] = NULL;
|
|
ins_rc[0] = ins_rc[1] = ins_rc[2] = 0;
|
|
|
|
procObj = PyList_New(2);
|
|
hProcessObj = PyLong_FromVoidPtr(hProcess);
|
|
intObj = PyInt_FromLong(file_count);
|
|
|
|
if (procObj && hProcessObj && intObj) {
|
|
PyList_SetItem(procObj,0,hProcessObj);
|
|
PyList_SetItem(procObj,1,intObj);
|
|
|
|
fileObj[0] = PyLong_FromVoidPtr(f1);
|
|
if (fileObj[0]) {
|
|
ins_rc[0] = PyDict_SetItem(_PyPopenProcs,
|
|
fileObj[0],
|
|
procObj);
|
|
}
|
|
if (file_count >= 2) {
|
|
fileObj[1] = PyLong_FromVoidPtr(f2);
|
|
if (fileObj[1]) {
|
|
ins_rc[1] = PyDict_SetItem(_PyPopenProcs,
|
|
fileObj[1],
|
|
procObj);
|
|
}
|
|
}
|
|
if (file_count >= 3) {
|
|
fileObj[2] = PyLong_FromVoidPtr(f3);
|
|
if (fileObj[2]) {
|
|
ins_rc[2] = PyDict_SetItem(_PyPopenProcs,
|
|
fileObj[2],
|
|
procObj);
|
|
}
|
|
}
|
|
|
|
if (ins_rc[0] < 0 || !fileObj[0] ||
|
|
ins_rc[1] < 0 || (file_count > 1 && !fileObj[1]) ||
|
|
ins_rc[2] < 0 || (file_count > 2 && !fileObj[2])) {
|
|
/* Something failed - remove any dictionary
|
|
* entries that did make it.
|
|
*/
|
|
if (!ins_rc[0] && fileObj[0]) {
|
|
PyDict_DelItem(_PyPopenProcs,
|
|
fileObj[0]);
|
|
}
|
|
if (!ins_rc[1] && fileObj[1]) {
|
|
PyDict_DelItem(_PyPopenProcs,
|
|
fileObj[1]);
|
|
}
|
|
if (!ins_rc[2] && fileObj[2]) {
|
|
PyDict_DelItem(_PyPopenProcs,
|
|
fileObj[2]);
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Clean up our localized references for the dictionary keys
|
|
* and value since PyDict_SetItem will Py_INCREF any copies
|
|
* that got placed in the dictionary.
|
|
*/
|
|
Py_XDECREF(procObj);
|
|
Py_XDECREF(fileObj[0]);
|
|
Py_XDECREF(fileObj[1]);
|
|
Py_XDECREF(fileObj[2]);
|
|
}
|
|
|
|
/* Child is launched. Close the parents copy of those pipe
|
|
* handles that only the child should have open. You need to
|
|
* make sure that no handles to the write end of the output pipe
|
|
* are maintained in this process or else the pipe will not close
|
|
* when the child process exits and the ReadFile will hang. */
|
|
|
|
if (!CloseHandle(hChildStdinRd))
|
|
return win32_error("CloseHandle", NULL);
|
|
|
|
if (!CloseHandle(hChildStdoutWr))
|
|
return win32_error("CloseHandle", NULL);
|
|
|
|
if ((n != 4) && (!CloseHandle(hChildStderrWr)))
|
|
return win32_error("CloseHandle", NULL);
|
|
|
|
return f;
|
|
}
|
|
|
|
/*
|
|
* Wrapper for fclose() to use for popen* files, so we can retrieve the
|
|
* exit code for the child process and return as a result of the close.
|
|
*
|
|
* This function uses the _PyPopenProcs dictionary in order to map the
|
|
* input file pointer to information about the process that was
|
|
* originally created by the popen* call that created the file pointer.
|
|
* The dictionary uses the file pointer as a key (with one entry
|
|
* inserted for each file returned by the original popen* call) and a
|
|
* single list object as the value for all files from a single call.
|
|
* The list object contains the Win32 process handle at [0], and a file
|
|
* count at [1], which is initialized to the total number of file
|
|
* handles using that list.
|
|
*
|
|
* This function closes whichever handle it is passed, and decrements
|
|
* the file count in the dictionary for the process handle pointed to
|
|
* by this file. On the last close (when the file count reaches zero),
|
|
* this function will wait for the child process and then return its
|
|
* exit code as the result of the close() operation. This permits the
|
|
* files to be closed in any order - it is always the close() of the
|
|
* final handle that will return the exit code.
|
|
*
|
|
* NOTE: This function is currently called with the GIL released.
|
|
* hence we use the GILState API to manage our state.
|
|
*/
|
|
|
|
static int _PyPclose(FILE *file)
|
|
{
|
|
int result;
|
|
DWORD exit_code;
|
|
HANDLE hProcess;
|
|
PyObject *procObj, *hProcessObj, *intObj, *fileObj;
|
|
long file_count;
|
|
#ifdef WITH_THREAD
|
|
PyGILState_STATE state;
|
|
#endif
|
|
|
|
/* Close the file handle first, to ensure it can't block the
|
|
* child from exiting if it's the last handle.
|
|
*/
|
|
result = fclose(file);
|
|
#ifdef WITH_THREAD
|
|
state = PyGILState_Ensure();
|
|
#endif
|
|
if (_PyPopenProcs) {
|
|
if ((fileObj = PyLong_FromVoidPtr(file)) != NULL &&
|
|
(procObj = PyDict_GetItem(_PyPopenProcs,
|
|
fileObj)) != NULL &&
|
|
(hProcessObj = PyList_GetItem(procObj,0)) != NULL &&
|
|
(intObj = PyList_GetItem(procObj,1)) != NULL) {
|
|
|
|
hProcess = PyLong_AsVoidPtr(hProcessObj);
|
|
file_count = PyInt_AsLong(intObj);
|
|
|
|
if (file_count > 1) {
|
|
/* Still other files referencing process */
|
|
file_count--;
|
|
PyList_SetItem(procObj,1,
|
|
PyInt_FromLong(file_count));
|
|
} else {
|
|
/* Last file for this process */
|
|
if (result != EOF &&
|
|
WaitForSingleObject(hProcess, INFINITE) != WAIT_FAILED &&
|
|
GetExitCodeProcess(hProcess, &exit_code)) {
|
|
/* Possible truncation here in 16-bit environments, but
|
|
* real exit codes are just the lower byte in any event.
|
|
*/
|
|
result = exit_code;
|
|
} else {
|
|
/* Indicate failure - this will cause the file object
|
|
* to raise an I/O error and translate the last Win32
|
|
* error code from errno. We do have a problem with
|
|
* last errors that overlap the normal errno table,
|
|
* but that's a consistent problem with the file object.
|
|
*/
|
|
if (result != EOF) {
|
|
/* If the error wasn't from the fclose(), then
|
|
* set errno for the file object error handling.
|
|
*/
|
|
errno = GetLastError();
|
|
}
|
|
result = -1;
|
|
}
|
|
|
|
/* Free up the native handle at this point */
|
|
CloseHandle(hProcess);
|
|
}
|
|
|
|
/* Remove this file pointer from dictionary */
|
|
PyDict_DelItem(_PyPopenProcs, fileObj);
|
|
|
|
if (PyDict_Size(_PyPopenProcs) == 0) {
|
|
Py_DECREF(_PyPopenProcs);
|
|
_PyPopenProcs = NULL;
|
|
}
|
|
|
|
} /* if object retrieval ok */
|
|
|
|
Py_XDECREF(fileObj);
|
|
} /* if _PyPopenProcs */
|
|
|
|
#ifdef WITH_THREAD
|
|
PyGILState_Release(state);
|
|
#endif
|
|
return result;
|
|
}
|
|
|
|
#else /* which OS? */
|
|
static PyObject *
|
|
posix_popen(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
char *mode = "r";
|
|
int bufsize = -1;
|
|
FILE *fp;
|
|
PyObject *f;
|
|
if (!PyArg_ParseTuple(args, "s|si:popen", &name, &mode, &bufsize))
|
|
return NULL;
|
|
/* Strip mode of binary or text modifiers */
|
|
if (strcmp(mode, "rb") == 0 || strcmp(mode, "rt") == 0)
|
|
mode = "r";
|
|
else if (strcmp(mode, "wb") == 0 || strcmp(mode, "wt") == 0)
|
|
mode = "w";
|
|
Py_BEGIN_ALLOW_THREADS
|
|
fp = popen(name, mode);
|
|
Py_END_ALLOW_THREADS
|
|
if (fp == NULL)
|
|
return posix_error();
|
|
f = PyFile_FromFile(fp, name, mode, pclose);
|
|
if (f != NULL)
|
|
PyFile_SetBufSize(f, bufsize);
|
|
return f;
|
|
}
|
|
|
|
#endif /* PYOS_??? */
|
|
#endif /* HAVE_POPEN */
|
|
|
|
|
|
#ifdef HAVE_SETUID
|
|
PyDoc_STRVAR(posix_setuid__doc__,
|
|
"setuid(uid)\n\n\
|
|
Set the current process's user id.");
|
|
|
|
static PyObject *
|
|
posix_setuid(PyObject *self, PyObject *args)
|
|
{
|
|
int uid;
|
|
if (!PyArg_ParseTuple(args, "i:setuid", &uid))
|
|
return NULL;
|
|
if (setuid(uid) < 0)
|
|
return posix_error();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif /* HAVE_SETUID */
|
|
|
|
|
|
#ifdef HAVE_SETEUID
|
|
PyDoc_STRVAR(posix_seteuid__doc__,
|
|
"seteuid(uid)\n\n\
|
|
Set the current process's effective user id.");
|
|
|
|
static PyObject *
|
|
posix_seteuid (PyObject *self, PyObject *args)
|
|
{
|
|
int euid;
|
|
if (!PyArg_ParseTuple(args, "i", &euid)) {
|
|
return NULL;
|
|
} else if (seteuid(euid) < 0) {
|
|
return posix_error();
|
|
} else {
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
}
|
|
#endif /* HAVE_SETEUID */
|
|
|
|
#ifdef HAVE_SETEGID
|
|
PyDoc_STRVAR(posix_setegid__doc__,
|
|
"setegid(gid)\n\n\
|
|
Set the current process's effective group id.");
|
|
|
|
static PyObject *
|
|
posix_setegid (PyObject *self, PyObject *args)
|
|
{
|
|
int egid;
|
|
if (!PyArg_ParseTuple(args, "i", &egid)) {
|
|
return NULL;
|
|
} else if (setegid(egid) < 0) {
|
|
return posix_error();
|
|
} else {
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
}
|
|
#endif /* HAVE_SETEGID */
|
|
|
|
#ifdef HAVE_SETREUID
|
|
PyDoc_STRVAR(posix_setreuid__doc__,
|
|
"setreuid(ruid, euid)\n\n\
|
|
Set the current process's real and effective user ids.");
|
|
|
|
static PyObject *
|
|
posix_setreuid (PyObject *self, PyObject *args)
|
|
{
|
|
int ruid, euid;
|
|
if (!PyArg_ParseTuple(args, "ii", &ruid, &euid)) {
|
|
return NULL;
|
|
} else if (setreuid(ruid, euid) < 0) {
|
|
return posix_error();
|
|
} else {
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
}
|
|
#endif /* HAVE_SETREUID */
|
|
|
|
#ifdef HAVE_SETREGID
|
|
PyDoc_STRVAR(posix_setregid__doc__,
|
|
"setregid(rgid, egid)\n\n\
|
|
Set the current process's real and effective group ids.");
|
|
|
|
static PyObject *
|
|
posix_setregid (PyObject *self, PyObject *args)
|
|
{
|
|
int rgid, egid;
|
|
if (!PyArg_ParseTuple(args, "ii", &rgid, &egid)) {
|
|
return NULL;
|
|
} else if (setregid(rgid, egid) < 0) {
|
|
return posix_error();
|
|
} else {
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
}
|
|
#endif /* HAVE_SETREGID */
|
|
|
|
#ifdef HAVE_SETGID
|
|
PyDoc_STRVAR(posix_setgid__doc__,
|
|
"setgid(gid)\n\n\
|
|
Set the current process's group id.");
|
|
|
|
static PyObject *
|
|
posix_setgid(PyObject *self, PyObject *args)
|
|
{
|
|
int gid;
|
|
if (!PyArg_ParseTuple(args, "i:setgid", &gid))
|
|
return NULL;
|
|
if (setgid(gid) < 0)
|
|
return posix_error();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif /* HAVE_SETGID */
|
|
|
|
#ifdef HAVE_SETGROUPS
|
|
PyDoc_STRVAR(posix_setgroups__doc__,
|
|
"setgroups(list)\n\n\
|
|
Set the groups of the current process to list.");
|
|
|
|
static PyObject *
|
|
posix_setgroups(PyObject *self, PyObject *groups)
|
|
{
|
|
int i, len;
|
|
gid_t grouplist[MAX_GROUPS];
|
|
|
|
if (!PySequence_Check(groups)) {
|
|
PyErr_SetString(PyExc_TypeError, "setgroups argument must be a sequence");
|
|
return NULL;
|
|
}
|
|
len = PySequence_Size(groups);
|
|
if (len > MAX_GROUPS) {
|
|
PyErr_SetString(PyExc_ValueError, "too many groups");
|
|
return NULL;
|
|
}
|
|
for(i = 0; i < len; i++) {
|
|
PyObject *elem;
|
|
elem = PySequence_GetItem(groups, i);
|
|
if (!elem)
|
|
return NULL;
|
|
if (!PyInt_Check(elem)) {
|
|
if (!PyLong_Check(elem)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"groups must be integers");
|
|
Py_DECREF(elem);
|
|
return NULL;
|
|
} else {
|
|
unsigned long x = PyLong_AsUnsignedLong(elem);
|
|
if (PyErr_Occurred()) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"group id too big");
|
|
Py_DECREF(elem);
|
|
return NULL;
|
|
}
|
|
grouplist[i] = x;
|
|
/* read back the value to see if it fitted in gid_t */
|
|
if (grouplist[i] != x) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"group id too big");
|
|
Py_DECREF(elem);
|
|
return NULL;
|
|
}
|
|
}
|
|
} else {
|
|
long x = PyInt_AsLong(elem);
|
|
grouplist[i] = x;
|
|
if (grouplist[i] != x) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"group id too big");
|
|
Py_DECREF(elem);
|
|
return NULL;
|
|
}
|
|
}
|
|
Py_DECREF(elem);
|
|
}
|
|
|
|
if (setgroups(len, grouplist) < 0)
|
|
return posix_error();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif /* HAVE_SETGROUPS */
|
|
|
|
#if defined(HAVE_WAIT3) || defined(HAVE_WAIT4)
|
|
static PyObject *
|
|
wait_helper(int pid, int status, struct rusage *ru)
|
|
{
|
|
PyObject *result;
|
|
static PyObject *struct_rusage;
|
|
|
|
if (pid == -1)
|
|
return posix_error();
|
|
|
|
if (struct_rusage == NULL) {
|
|
PyObject *m = PyImport_ImportModule("resource");
|
|
if (m == NULL)
|
|
return NULL;
|
|
struct_rusage = PyObject_GetAttrString(m, "struct_rusage");
|
|
Py_DECREF(m);
|
|
if (struct_rusage == NULL)
|
|
return NULL;
|
|
}
|
|
|
|
/* XXX(nnorwitz): Copied (w/mods) from resource.c, there should be only one. */
|
|
result = PyStructSequence_New((PyTypeObject*) struct_rusage);
|
|
if (!result)
|
|
return NULL;
|
|
|
|
#ifndef doubletime
|
|
#define doubletime(TV) ((double)(TV).tv_sec + (TV).tv_usec * 0.000001)
|
|
#endif
|
|
|
|
PyStructSequence_SET_ITEM(result, 0,
|
|
PyFloat_FromDouble(doubletime(ru->ru_utime)));
|
|
PyStructSequence_SET_ITEM(result, 1,
|
|
PyFloat_FromDouble(doubletime(ru->ru_stime)));
|
|
#define SET_INT(result, index, value)\
|
|
PyStructSequence_SET_ITEM(result, index, PyInt_FromLong(value))
|
|
SET_INT(result, 2, ru->ru_maxrss);
|
|
SET_INT(result, 3, ru->ru_ixrss);
|
|
SET_INT(result, 4, ru->ru_idrss);
|
|
SET_INT(result, 5, ru->ru_isrss);
|
|
SET_INT(result, 6, ru->ru_minflt);
|
|
SET_INT(result, 7, ru->ru_majflt);
|
|
SET_INT(result, 8, ru->ru_nswap);
|
|
SET_INT(result, 9, ru->ru_inblock);
|
|
SET_INT(result, 10, ru->ru_oublock);
|
|
SET_INT(result, 11, ru->ru_msgsnd);
|
|
SET_INT(result, 12, ru->ru_msgrcv);
|
|
SET_INT(result, 13, ru->ru_nsignals);
|
|
SET_INT(result, 14, ru->ru_nvcsw);
|
|
SET_INT(result, 15, ru->ru_nivcsw);
|
|
#undef SET_INT
|
|
|
|
if (PyErr_Occurred()) {
|
|
Py_DECREF(result);
|
|
return NULL;
|
|
}
|
|
|
|
return Py_BuildValue("iiN", pid, status, result);
|
|
}
|
|
#endif /* HAVE_WAIT3 || HAVE_WAIT4 */
|
|
|
|
#ifdef HAVE_WAIT3
|
|
PyDoc_STRVAR(posix_wait3__doc__,
|
|
"wait3(options) -> (pid, status, rusage)\n\n\
|
|
Wait for completion of a child process.");
|
|
|
|
static PyObject *
|
|
posix_wait3(PyObject *self, PyObject *args)
|
|
{
|
|
int pid, options;
|
|
struct rusage ru;
|
|
WAIT_TYPE status;
|
|
WAIT_STATUS_INT(status) = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:wait3", &options))
|
|
return NULL;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
pid = wait3(&status, options, &ru);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
return wait_helper(pid, WAIT_STATUS_INT(status), &ru);
|
|
}
|
|
#endif /* HAVE_WAIT3 */
|
|
|
|
#ifdef HAVE_WAIT4
|
|
PyDoc_STRVAR(posix_wait4__doc__,
|
|
"wait4(pid, options) -> (pid, status, rusage)\n\n\
|
|
Wait for completion of a given child process.");
|
|
|
|
static PyObject *
|
|
posix_wait4(PyObject *self, PyObject *args)
|
|
{
|
|
int pid, options;
|
|
struct rusage ru;
|
|
WAIT_TYPE status;
|
|
WAIT_STATUS_INT(status) = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "ii:wait4", &pid, &options))
|
|
return NULL;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
pid = wait4(pid, &status, options, &ru);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
return wait_helper(pid, WAIT_STATUS_INT(status), &ru);
|
|
}
|
|
#endif /* HAVE_WAIT4 */
|
|
|
|
#ifdef HAVE_WAITPID
|
|
PyDoc_STRVAR(posix_waitpid__doc__,
|
|
"waitpid(pid, options) -> (pid, status)\n\n\
|
|
Wait for completion of a given child process.");
|
|
|
|
static PyObject *
|
|
posix_waitpid(PyObject *self, PyObject *args)
|
|
{
|
|
int pid, options;
|
|
WAIT_TYPE status;
|
|
WAIT_STATUS_INT(status) = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "ii:waitpid", &pid, &options))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
pid = waitpid(pid, &status, options);
|
|
Py_END_ALLOW_THREADS
|
|
if (pid == -1)
|
|
return posix_error();
|
|
|
|
return Py_BuildValue("ii", pid, WAIT_STATUS_INT(status));
|
|
}
|
|
|
|
#elif defined(HAVE_CWAIT)
|
|
|
|
/* MS C has a variant of waitpid() that's usable for most purposes. */
|
|
PyDoc_STRVAR(posix_waitpid__doc__,
|
|
"waitpid(pid, options) -> (pid, status << 8)\n\n"
|
|
"Wait for completion of a given process. options is ignored on Windows.");
|
|
|
|
static PyObject *
|
|
posix_waitpid(PyObject *self, PyObject *args)
|
|
{
|
|
Py_intptr_t pid;
|
|
int status, options;
|
|
|
|
if (!PyArg_ParseTuple(args, "ii:waitpid", &pid, &options))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
pid = _cwait(&status, pid, options);
|
|
Py_END_ALLOW_THREADS
|
|
if (pid == -1)
|
|
return posix_error();
|
|
|
|
/* shift the status left a byte so this is more like the POSIX waitpid */
|
|
return Py_BuildValue("ii", pid, status << 8);
|
|
}
|
|
#endif /* HAVE_WAITPID || HAVE_CWAIT */
|
|
|
|
#ifdef HAVE_WAIT
|
|
PyDoc_STRVAR(posix_wait__doc__,
|
|
"wait() -> (pid, status)\n\n\
|
|
Wait for completion of a child process.");
|
|
|
|
static PyObject *
|
|
posix_wait(PyObject *self, PyObject *noargs)
|
|
{
|
|
int pid;
|
|
WAIT_TYPE status;
|
|
WAIT_STATUS_INT(status) = 0;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
pid = wait(&status);
|
|
Py_END_ALLOW_THREADS
|
|
if (pid == -1)
|
|
return posix_error();
|
|
|
|
return Py_BuildValue("ii", pid, WAIT_STATUS_INT(status));
|
|
}
|
|
#endif
|
|
|
|
|
|
PyDoc_STRVAR(posix_lstat__doc__,
|
|
"lstat(path) -> stat result\n\n\
|
|
Like stat(path), but do not follow symbolic links.");
|
|
|
|
static PyObject *
|
|
posix_lstat(PyObject *self, PyObject *args)
|
|
{
|
|
#ifdef HAVE_LSTAT
|
|
return posix_do_stat(self, args, "et:lstat", lstat, NULL, NULL);
|
|
#else /* !HAVE_LSTAT */
|
|
#ifdef MS_WINDOWS
|
|
return posix_do_stat(self, args, "et:lstat", STAT, "U:lstat", win32_wstat);
|
|
#else
|
|
return posix_do_stat(self, args, "et:lstat", STAT, NULL, NULL);
|
|
#endif
|
|
#endif /* !HAVE_LSTAT */
|
|
}
|
|
|
|
|
|
#ifdef HAVE_READLINK
|
|
PyDoc_STRVAR(posix_readlink__doc__,
|
|
"readlink(path) -> path\n\n\
|
|
Return a string representing the path to which the symbolic link points.");
|
|
|
|
static PyObject *
|
|
posix_readlink(PyObject *self, PyObject *args)
|
|
{
|
|
char buf[MAXPATHLEN];
|
|
char *path;
|
|
int n;
|
|
if (!PyArg_ParseTuple(args, "s:readlink", &path))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
n = readlink(path, buf, (int) sizeof buf);
|
|
Py_END_ALLOW_THREADS
|
|
if (n < 0)
|
|
return posix_error_with_filename(path);
|
|
return PyString_FromStringAndSize(buf, n);
|
|
}
|
|
#endif /* HAVE_READLINK */
|
|
|
|
|
|
#ifdef HAVE_SYMLINK
|
|
PyDoc_STRVAR(posix_symlink__doc__,
|
|
"symlink(src, dst)\n\n\
|
|
Create a symbolic link pointing to src named dst.");
|
|
|
|
static PyObject *
|
|
posix_symlink(PyObject *self, PyObject *args)
|
|
{
|
|
return posix_2str(args, "etet:symlink", symlink);
|
|
}
|
|
#endif /* HAVE_SYMLINK */
|
|
|
|
|
|
#ifdef HAVE_TIMES
|
|
#ifndef HZ
|
|
#define HZ 60 /* Universal constant :-) */
|
|
#endif /* HZ */
|
|
|
|
#if defined(PYCC_VACPP) && defined(PYOS_OS2)
|
|
static long
|
|
system_uptime(void)
|
|
{
|
|
ULONG value = 0;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT, &value, sizeof(value));
|
|
Py_END_ALLOW_THREADS
|
|
|
|
return value;
|
|
}
|
|
|
|
static PyObject *
|
|
posix_times(PyObject *self, PyObject *noargs)
|
|
{
|
|
/* Currently Only Uptime is Provided -- Others Later */
|
|
return Py_BuildValue("ddddd",
|
|
(double)0 /* t.tms_utime / HZ */,
|
|
(double)0 /* t.tms_stime / HZ */,
|
|
(double)0 /* t.tms_cutime / HZ */,
|
|
(double)0 /* t.tms_cstime / HZ */,
|
|
(double)system_uptime() / 1000);
|
|
}
|
|
#else /* not OS2 */
|
|
static PyObject *
|
|
posix_times(PyObject *self, PyObject *noargs)
|
|
{
|
|
struct tms t;
|
|
clock_t c;
|
|
errno = 0;
|
|
c = times(&t);
|
|
if (c == (clock_t) -1)
|
|
return posix_error();
|
|
return Py_BuildValue("ddddd",
|
|
(double)t.tms_utime / HZ,
|
|
(double)t.tms_stime / HZ,
|
|
(double)t.tms_cutime / HZ,
|
|
(double)t.tms_cstime / HZ,
|
|
(double)c / HZ);
|
|
}
|
|
#endif /* not OS2 */
|
|
#endif /* HAVE_TIMES */
|
|
|
|
|
|
#ifdef MS_WINDOWS
|
|
#define HAVE_TIMES /* so the method table will pick it up */
|
|
static PyObject *
|
|
posix_times(PyObject *self, PyObject *noargs)
|
|
{
|
|
FILETIME create, exit, kernel, user;
|
|
HANDLE hProc;
|
|
hProc = GetCurrentProcess();
|
|
GetProcessTimes(hProc, &create, &exit, &kernel, &user);
|
|
/* The fields of a FILETIME structure are the hi and lo part
|
|
of a 64-bit value expressed in 100 nanosecond units.
|
|
1e7 is one second in such units; 1e-7 the inverse.
|
|
429.4967296 is 2**32 / 1e7 or 2**32 * 1e-7.
|
|
*/
|
|
return Py_BuildValue(
|
|
"ddddd",
|
|
(double)(kernel.dwHighDateTime*429.4967296 +
|
|
kernel.dwLowDateTime*1e-7),
|
|
(double)(user.dwHighDateTime*429.4967296 +
|
|
user.dwLowDateTime*1e-7),
|
|
(double)0,
|
|
(double)0,
|
|
(double)0);
|
|
}
|
|
#endif /* MS_WINDOWS */
|
|
|
|
#ifdef HAVE_TIMES
|
|
PyDoc_STRVAR(posix_times__doc__,
|
|
"times() -> (utime, stime, cutime, cstime, elapsed_time)\n\n\
|
|
Return a tuple of floating point numbers indicating process times.");
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_GETSID
|
|
PyDoc_STRVAR(posix_getsid__doc__,
|
|
"getsid(pid) -> sid\n\n\
|
|
Call the system call getsid().");
|
|
|
|
static PyObject *
|
|
posix_getsid(PyObject *self, PyObject *args)
|
|
{
|
|
int pid, sid;
|
|
if (!PyArg_ParseTuple(args, "i:getsid", &pid))
|
|
return NULL;
|
|
sid = getsid(pid);
|
|
if (sid < 0)
|
|
return posix_error();
|
|
return PyInt_FromLong((long)sid);
|
|
}
|
|
#endif /* HAVE_GETSID */
|
|
|
|
|
|
#ifdef HAVE_SETSID
|
|
PyDoc_STRVAR(posix_setsid__doc__,
|
|
"setsid()\n\n\
|
|
Call the system call setsid().");
|
|
|
|
static PyObject *
|
|
posix_setsid(PyObject *self, PyObject *noargs)
|
|
{
|
|
if (setsid() < 0)
|
|
return posix_error();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif /* HAVE_SETSID */
|
|
|
|
#ifdef HAVE_SETPGID
|
|
PyDoc_STRVAR(posix_setpgid__doc__,
|
|
"setpgid(pid, pgrp)\n\n\
|
|
Call the system call setpgid().");
|
|
|
|
static PyObject *
|
|
posix_setpgid(PyObject *self, PyObject *args)
|
|
{
|
|
int pid, pgrp;
|
|
if (!PyArg_ParseTuple(args, "ii:setpgid", &pid, &pgrp))
|
|
return NULL;
|
|
if (setpgid(pid, pgrp) < 0)
|
|
return posix_error();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif /* HAVE_SETPGID */
|
|
|
|
|
|
#ifdef HAVE_TCGETPGRP
|
|
PyDoc_STRVAR(posix_tcgetpgrp__doc__,
|
|
"tcgetpgrp(fd) -> pgid\n\n\
|
|
Return the process group associated with the terminal given by a fd.");
|
|
|
|
static PyObject *
|
|
posix_tcgetpgrp(PyObject *self, PyObject *args)
|
|
{
|
|
int fd, pgid;
|
|
if (!PyArg_ParseTuple(args, "i:tcgetpgrp", &fd))
|
|
return NULL;
|
|
pgid = tcgetpgrp(fd);
|
|
if (pgid < 0)
|
|
return posix_error();
|
|
return PyInt_FromLong((long)pgid);
|
|
}
|
|
#endif /* HAVE_TCGETPGRP */
|
|
|
|
|
|
#ifdef HAVE_TCSETPGRP
|
|
PyDoc_STRVAR(posix_tcsetpgrp__doc__,
|
|
"tcsetpgrp(fd, pgid)\n\n\
|
|
Set the process group associated with the terminal given by a fd.");
|
|
|
|
static PyObject *
|
|
posix_tcsetpgrp(PyObject *self, PyObject *args)
|
|
{
|
|
int fd, pgid;
|
|
if (!PyArg_ParseTuple(args, "ii:tcsetpgrp", &fd, &pgid))
|
|
return NULL;
|
|
if (tcsetpgrp(fd, pgid) < 0)
|
|
return posix_error();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif /* HAVE_TCSETPGRP */
|
|
|
|
/* Functions acting on file descriptors */
|
|
|
|
PyDoc_STRVAR(posix_open__doc__,
|
|
"open(filename, flag [, mode=0777]) -> fd\n\n\
|
|
Open a file (for low level IO).");
|
|
|
|
static PyObject *
|
|
posix_open(PyObject *self, PyObject *args)
|
|
{
|
|
char *file = NULL;
|
|
int flag;
|
|
int mode = 0777;
|
|
int fd;
|
|
|
|
#ifdef MS_WINDOWS
|
|
if (unicode_file_names()) {
|
|
PyUnicodeObject *po;
|
|
if (PyArg_ParseTuple(args, "Ui|i:mkdir", &po, &flag, &mode)) {
|
|
Py_BEGIN_ALLOW_THREADS
|
|
/* PyUnicode_AS_UNICODE OK without thread
|
|
lock as it is a simple dereference. */
|
|
fd = _wopen(PyUnicode_AS_UNICODE(po), flag, mode);
|
|
Py_END_ALLOW_THREADS
|
|
if (fd < 0)
|
|
return posix_error();
|
|
return PyInt_FromLong((long)fd);
|
|
}
|
|
/* Drop the argument parsing error as narrow strings
|
|
are also valid. */
|
|
PyErr_Clear();
|
|
}
|
|
#endif
|
|
|
|
if (!PyArg_ParseTuple(args, "eti|i",
|
|
Py_FileSystemDefaultEncoding, &file,
|
|
&flag, &mode))
|
|
return NULL;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
fd = open(file, flag, mode);
|
|
Py_END_ALLOW_THREADS
|
|
if (fd < 0)
|
|
return posix_error_with_allocated_filename(file);
|
|
PyMem_Free(file);
|
|
return PyInt_FromLong((long)fd);
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(posix_close__doc__,
|
|
"close(fd)\n\n\
|
|
Close a file descriptor (for low level IO).");
|
|
|
|
static PyObject *
|
|
posix_close(PyObject *self, PyObject *args)
|
|
{
|
|
int fd, res;
|
|
if (!PyArg_ParseTuple(args, "i:close", &fd))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = close(fd);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return posix_error();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(posix_dup__doc__,
|
|
"dup(fd) -> fd2\n\n\
|
|
Return a duplicate of a file descriptor.");
|
|
|
|
static PyObject *
|
|
posix_dup(PyObject *self, PyObject *args)
|
|
{
|
|
int fd;
|
|
if (!PyArg_ParseTuple(args, "i:dup", &fd))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
fd = dup(fd);
|
|
Py_END_ALLOW_THREADS
|
|
if (fd < 0)
|
|
return posix_error();
|
|
return PyInt_FromLong((long)fd);
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(posix_dup2__doc__,
|
|
"dup2(old_fd, new_fd)\n\n\
|
|
Duplicate file descriptor.");
|
|
|
|
static PyObject *
|
|
posix_dup2(PyObject *self, PyObject *args)
|
|
{
|
|
int fd, fd2, res;
|
|
if (!PyArg_ParseTuple(args, "ii:dup2", &fd, &fd2))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = dup2(fd, fd2);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return posix_error();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(posix_lseek__doc__,
|
|
"lseek(fd, pos, how) -> newpos\n\n\
|
|
Set the current position of a file descriptor.");
|
|
|
|
static PyObject *
|
|
posix_lseek(PyObject *self, PyObject *args)
|
|
{
|
|
int fd, how;
|
|
#if defined(MS_WIN64) || defined(MS_WINDOWS)
|
|
PY_LONG_LONG pos, res;
|
|
#else
|
|
off_t pos, res;
|
|
#endif
|
|
PyObject *posobj;
|
|
if (!PyArg_ParseTuple(args, "iOi:lseek", &fd, &posobj, &how))
|
|
return NULL;
|
|
#ifdef SEEK_SET
|
|
/* Turn 0, 1, 2 into SEEK_{SET,CUR,END} */
|
|
switch (how) {
|
|
case 0: how = SEEK_SET; break;
|
|
case 1: how = SEEK_CUR; break;
|
|
case 2: how = SEEK_END; break;
|
|
}
|
|
#endif /* SEEK_END */
|
|
|
|
#if !defined(HAVE_LARGEFILE_SUPPORT)
|
|
pos = PyInt_AsLong(posobj);
|
|
#else
|
|
pos = PyLong_Check(posobj) ?
|
|
PyLong_AsLongLong(posobj) : PyInt_AsLong(posobj);
|
|
#endif
|
|
if (PyErr_Occurred())
|
|
return NULL;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#if defined(MS_WIN64) || defined(MS_WINDOWS)
|
|
res = _lseeki64(fd, pos, how);
|
|
#else
|
|
res = lseek(fd, pos, how);
|
|
#endif
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return posix_error();
|
|
|
|
#if !defined(HAVE_LARGEFILE_SUPPORT)
|
|
return PyInt_FromLong(res);
|
|
#else
|
|
return PyLong_FromLongLong(res);
|
|
#endif
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(posix_read__doc__,
|
|
"read(fd, buffersize) -> string\n\n\
|
|
Read a file descriptor.");
|
|
|
|
static PyObject *
|
|
posix_read(PyObject *self, PyObject *args)
|
|
{
|
|
int fd, size, n;
|
|
PyObject *buffer;
|
|
if (!PyArg_ParseTuple(args, "ii:read", &fd, &size))
|
|
return NULL;
|
|
if (size < 0) {
|
|
errno = EINVAL;
|
|
return posix_error();
|
|
}
|
|
buffer = PyString_FromStringAndSize((char *)NULL, size);
|
|
if (buffer == NULL)
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
n = read(fd, PyString_AsString(buffer), size);
|
|
Py_END_ALLOW_THREADS
|
|
if (n < 0) {
|
|
Py_DECREF(buffer);
|
|
return posix_error();
|
|
}
|
|
if (n != size)
|
|
_PyString_Resize(&buffer, n);
|
|
return buffer;
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(posix_write__doc__,
|
|
"write(fd, string) -> byteswritten\n\n\
|
|
Write a string to a file descriptor.");
|
|
|
|
static PyObject *
|
|
posix_write(PyObject *self, PyObject *args)
|
|
{
|
|
int fd;
|
|
Py_ssize_t size;
|
|
char *buffer;
|
|
|
|
if (!PyArg_ParseTuple(args, "is#:write", &fd, &buffer, &size))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
size = write(fd, buffer, (size_t)size);
|
|
Py_END_ALLOW_THREADS
|
|
if (size < 0)
|
|
return posix_error();
|
|
return PyInt_FromSsize_t(size);
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(posix_fstat__doc__,
|
|
"fstat(fd) -> stat result\n\n\
|
|
Like stat(), but for an open file descriptor.");
|
|
|
|
static PyObject *
|
|
posix_fstat(PyObject *self, PyObject *args)
|
|
{
|
|
int fd;
|
|
STRUCT_STAT st;
|
|
int res;
|
|
if (!PyArg_ParseTuple(args, "i:fstat", &fd))
|
|
return NULL;
|
|
#ifdef __VMS
|
|
/* on OpenVMS we must ensure that all bytes are written to the file */
|
|
fsync(fd);
|
|
#endif
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = FSTAT(fd, &st);
|
|
Py_END_ALLOW_THREADS
|
|
if (res != 0) {
|
|
#ifdef MS_WINDOWS
|
|
return win32_error("fstat", NULL);
|
|
#else
|
|
return posix_error();
|
|
#endif
|
|
}
|
|
|
|
return _pystat_fromstructstat(&st);
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(posix_fdopen__doc__,
|
|
"fdopen(fd [, mode='r' [, bufsize]]) -> file_object\n\n\
|
|
Return an open file object connected to a file descriptor.");
|
|
|
|
static PyObject *
|
|
posix_fdopen(PyObject *self, PyObject *args)
|
|
{
|
|
int fd;
|
|
char *mode = "r";
|
|
int bufsize = -1;
|
|
FILE *fp;
|
|
PyObject *f;
|
|
if (!PyArg_ParseTuple(args, "i|si", &fd, &mode, &bufsize))
|
|
return NULL;
|
|
|
|
if (mode[0] != 'r' && mode[0] != 'w' && mode[0] != 'a') {
|
|
PyErr_Format(PyExc_ValueError,
|
|
"invalid file mode '%s'", mode);
|
|
return NULL;
|
|
}
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#if !defined(MS_WINDOWS) && defined(HAVE_FCNTL_H)
|
|
if (mode[0] == 'a') {
|
|
/* try to make sure the O_APPEND flag is set */
|
|
int flags;
|
|
flags = fcntl(fd, F_GETFL);
|
|
if (flags != -1)
|
|
fcntl(fd, F_SETFL, flags | O_APPEND);
|
|
fp = fdopen(fd, mode);
|
|
if (fp == NULL && flags != -1)
|
|
/* restore old mode if fdopen failed */
|
|
fcntl(fd, F_SETFL, flags);
|
|
} else {
|
|
fp = fdopen(fd, mode);
|
|
}
|
|
#else
|
|
fp = fdopen(fd, mode);
|
|
#endif
|
|
Py_END_ALLOW_THREADS
|
|
if (fp == NULL)
|
|
return posix_error();
|
|
f = PyFile_FromFile(fp, "<fdopen>", mode, fclose);
|
|
if (f != NULL)
|
|
PyFile_SetBufSize(f, bufsize);
|
|
return f;
|
|
}
|
|
|
|
PyDoc_STRVAR(posix_isatty__doc__,
|
|
"isatty(fd) -> bool\n\n\
|
|
Return True if the file descriptor 'fd' is an open file descriptor\n\
|
|
connected to the slave end of a terminal.");
|
|
|
|
static PyObject *
|
|
posix_isatty(PyObject *self, PyObject *args)
|
|
{
|
|
int fd;
|
|
if (!PyArg_ParseTuple(args, "i:isatty", &fd))
|
|
return NULL;
|
|
return PyBool_FromLong(isatty(fd));
|
|
}
|
|
|
|
#ifdef HAVE_PIPE
|
|
PyDoc_STRVAR(posix_pipe__doc__,
|
|
"pipe() -> (read_end, write_end)\n\n\
|
|
Create a pipe.");
|
|
|
|
static PyObject *
|
|
posix_pipe(PyObject *self, PyObject *noargs)
|
|
{
|
|
#if defined(PYOS_OS2)
|
|
HFILE read, write;
|
|
APIRET rc;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
rc = DosCreatePipe( &read, &write, 4096);
|
|
Py_END_ALLOW_THREADS
|
|
if (rc != NO_ERROR)
|
|
return os2_error(rc);
|
|
|
|
return Py_BuildValue("(ii)", read, write);
|
|
#else
|
|
#if !defined(MS_WINDOWS)
|
|
int fds[2];
|
|
int res;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = pipe(fds);
|
|
Py_END_ALLOW_THREADS
|
|
if (res != 0)
|
|
return posix_error();
|
|
return Py_BuildValue("(ii)", fds[0], fds[1]);
|
|
#else /* MS_WINDOWS */
|
|
HANDLE read, write;
|
|
int read_fd, write_fd;
|
|
BOOL ok;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
ok = CreatePipe(&read, &write, NULL, 0);
|
|
Py_END_ALLOW_THREADS
|
|
if (!ok)
|
|
return win32_error("CreatePipe", NULL);
|
|
read_fd = _open_osfhandle((Py_intptr_t)read, 0);
|
|
write_fd = _open_osfhandle((Py_intptr_t)write, 1);
|
|
return Py_BuildValue("(ii)", read_fd, write_fd);
|
|
#endif /* MS_WINDOWS */
|
|
#endif
|
|
}
|
|
#endif /* HAVE_PIPE */
|
|
|
|
|
|
#ifdef HAVE_MKFIFO
|
|
PyDoc_STRVAR(posix_mkfifo__doc__,
|
|
"mkfifo(filename [, mode=0666])\n\n\
|
|
Create a FIFO (a POSIX named pipe).");
|
|
|
|
static PyObject *
|
|
posix_mkfifo(PyObject *self, PyObject *args)
|
|
{
|
|
char *filename;
|
|
int mode = 0666;
|
|
int res;
|
|
if (!PyArg_ParseTuple(args, "s|i:mkfifo", &filename, &mode))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = mkfifo(filename, mode);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return posix_error();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif
|
|
|
|
|
|
#if defined(HAVE_MKNOD) && defined(HAVE_MAKEDEV)
|
|
PyDoc_STRVAR(posix_mknod__doc__,
|
|
"mknod(filename [, mode=0600, device])\n\n\
|
|
Create a filesystem node (file, device special file or named pipe)\n\
|
|
named filename. mode specifies both the permissions to use and the\n\
|
|
type of node to be created, being combined (bitwise OR) with one of\n\
|
|
S_IFREG, S_IFCHR, S_IFBLK, and S_IFIFO. For S_IFCHR and S_IFBLK,\n\
|
|
device defines the newly created device special file (probably using\n\
|
|
os.makedev()), otherwise it is ignored.");
|
|
|
|
|
|
static PyObject *
|
|
posix_mknod(PyObject *self, PyObject *args)
|
|
{
|
|
char *filename;
|
|
int mode = 0600;
|
|
int device = 0;
|
|
int res;
|
|
if (!PyArg_ParseTuple(args, "s|ii:mknod", &filename, &mode, &device))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = mknod(filename, mode, device);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return posix_error();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_DEVICE_MACROS
|
|
PyDoc_STRVAR(posix_major__doc__,
|
|
"major(device) -> major number\n\
|
|
Extracts a device major number from a raw device number.");
|
|
|
|
static PyObject *
|
|
posix_major(PyObject *self, PyObject *args)
|
|
{
|
|
int device;
|
|
if (!PyArg_ParseTuple(args, "i:major", &device))
|
|
return NULL;
|
|
return PyInt_FromLong((long)major(device));
|
|
}
|
|
|
|
PyDoc_STRVAR(posix_minor__doc__,
|
|
"minor(device) -> minor number\n\
|
|
Extracts a device minor number from a raw device number.");
|
|
|
|
static PyObject *
|
|
posix_minor(PyObject *self, PyObject *args)
|
|
{
|
|
int device;
|
|
if (!PyArg_ParseTuple(args, "i:minor", &device))
|
|
return NULL;
|
|
return PyInt_FromLong((long)minor(device));
|
|
}
|
|
|
|
PyDoc_STRVAR(posix_makedev__doc__,
|
|
"makedev(major, minor) -> device number\n\
|
|
Composes a raw device number from the major and minor device numbers.");
|
|
|
|
static PyObject *
|
|
posix_makedev(PyObject *self, PyObject *args)
|
|
{
|
|
int major, minor;
|
|
if (!PyArg_ParseTuple(args, "ii:makedev", &major, &minor))
|
|
return NULL;
|
|
return PyInt_FromLong((long)makedev(major, minor));
|
|
}
|
|
#endif /* device macros */
|
|
|
|
|
|
#ifdef HAVE_FTRUNCATE
|
|
PyDoc_STRVAR(posix_ftruncate__doc__,
|
|
"ftruncate(fd, length)\n\n\
|
|
Truncate a file to a specified length.");
|
|
|
|
static PyObject *
|
|
posix_ftruncate(PyObject *self, PyObject *args)
|
|
{
|
|
int fd;
|
|
off_t length;
|
|
int res;
|
|
PyObject *lenobj;
|
|
|
|
if (!PyArg_ParseTuple(args, "iO:ftruncate", &fd, &lenobj))
|
|
return NULL;
|
|
|
|
#if !defined(HAVE_LARGEFILE_SUPPORT)
|
|
length = PyInt_AsLong(lenobj);
|
|
#else
|
|
length = PyLong_Check(lenobj) ?
|
|
PyLong_AsLongLong(lenobj) : PyInt_AsLong(lenobj);
|
|
#endif
|
|
if (PyErr_Occurred())
|
|
return NULL;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = ftruncate(fd, length);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0) {
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
return NULL;
|
|
}
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_PUTENV
|
|
PyDoc_STRVAR(posix_putenv__doc__,
|
|
"putenv(key, value)\n\n\
|
|
Change or add an environment variable.");
|
|
|
|
/* Save putenv() parameters as values here, so we can collect them when they
|
|
* get re-set with another call for the same key. */
|
|
static PyObject *posix_putenv_garbage;
|
|
|
|
static PyObject *
|
|
posix_putenv(PyObject *self, PyObject *args)
|
|
{
|
|
char *s1, *s2;
|
|
char *newenv;
|
|
PyObject *newstr;
|
|
size_t len;
|
|
|
|
if (!PyArg_ParseTuple(args, "ss:putenv", &s1, &s2))
|
|
return NULL;
|
|
|
|
#if defined(PYOS_OS2)
|
|
if (stricmp(s1, "BEGINLIBPATH") == 0) {
|
|
APIRET rc;
|
|
|
|
rc = DosSetExtLIBPATH(s2, BEGIN_LIBPATH);
|
|
if (rc != NO_ERROR)
|
|
return os2_error(rc);
|
|
|
|
} else if (stricmp(s1, "ENDLIBPATH") == 0) {
|
|
APIRET rc;
|
|
|
|
rc = DosSetExtLIBPATH(s2, END_LIBPATH);
|
|
if (rc != NO_ERROR)
|
|
return os2_error(rc);
|
|
} else {
|
|
#endif
|
|
|
|
/* XXX This can leak memory -- not easy to fix :-( */
|
|
len = strlen(s1) + strlen(s2) + 2;
|
|
/* len includes space for a trailing \0; the size arg to
|
|
PyString_FromStringAndSize does not count that */
|
|
newstr = PyString_FromStringAndSize(NULL, (int)len - 1);
|
|
if (newstr == NULL)
|
|
return PyErr_NoMemory();
|
|
newenv = PyString_AS_STRING(newstr);
|
|
PyOS_snprintf(newenv, len, "%s=%s", s1, s2);
|
|
if (putenv(newenv)) {
|
|
Py_DECREF(newstr);
|
|
posix_error();
|
|
return NULL;
|
|
}
|
|
/* Install the first arg and newstr in posix_putenv_garbage;
|
|
* this will cause previous value to be collected. This has to
|
|
* happen after the real putenv() call because the old value
|
|
* was still accessible until then. */
|
|
if (PyDict_SetItem(posix_putenv_garbage,
|
|
PyTuple_GET_ITEM(args, 0), newstr)) {
|
|
/* really not much we can do; just leak */
|
|
PyErr_Clear();
|
|
}
|
|
else {
|
|
Py_DECREF(newstr);
|
|
}
|
|
|
|
#if defined(PYOS_OS2)
|
|
}
|
|
#endif
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif /* putenv */
|
|
|
|
#ifdef HAVE_UNSETENV
|
|
PyDoc_STRVAR(posix_unsetenv__doc__,
|
|
"unsetenv(key)\n\n\
|
|
Delete an environment variable.");
|
|
|
|
static PyObject *
|
|
posix_unsetenv(PyObject *self, PyObject *args)
|
|
{
|
|
char *s1;
|
|
|
|
if (!PyArg_ParseTuple(args, "s:unsetenv", &s1))
|
|
return NULL;
|
|
|
|
unsetenv(s1);
|
|
|
|
/* Remove the key from posix_putenv_garbage;
|
|
* this will cause it to be collected. This has to
|
|
* happen after the real unsetenv() call because the
|
|
* old value was still accessible until then.
|
|
*/
|
|
if (PyDict_DelItem(posix_putenv_garbage,
|
|
PyTuple_GET_ITEM(args, 0))) {
|
|
/* really not much we can do; just leak */
|
|
PyErr_Clear();
|
|
}
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif /* unsetenv */
|
|
|
|
#ifdef HAVE_STRERROR
|
|
PyDoc_STRVAR(posix_strerror__doc__,
|
|
"strerror(code) -> string\n\n\
|
|
Translate an error code to a message string.");
|
|
|
|
static PyObject *
|
|
posix_strerror(PyObject *self, PyObject *args)
|
|
{
|
|
int code;
|
|
char *message;
|
|
if (!PyArg_ParseTuple(args, "i:strerror", &code))
|
|
return NULL;
|
|
message = strerror(code);
|
|
if (message == NULL) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"strerror() argument out of range");
|
|
return NULL;
|
|
}
|
|
return PyString_FromString(message);
|
|
}
|
|
#endif /* strerror */
|
|
|
|
|
|
#ifdef HAVE_SYS_WAIT_H
|
|
|
|
#ifdef WCOREDUMP
|
|
PyDoc_STRVAR(posix_WCOREDUMP__doc__,
|
|
"WCOREDUMP(status) -> bool\n\n\
|
|
Return True if the process returning 'status' was dumped to a core file.");
|
|
|
|
static PyObject *
|
|
posix_WCOREDUMP(PyObject *self, PyObject *args)
|
|
{
|
|
WAIT_TYPE status;
|
|
WAIT_STATUS_INT(status) = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:WCOREDUMP", &WAIT_STATUS_INT(status)))
|
|
return NULL;
|
|
|
|
return PyBool_FromLong(WCOREDUMP(status));
|
|
}
|
|
#endif /* WCOREDUMP */
|
|
|
|
#ifdef WIFCONTINUED
|
|
PyDoc_STRVAR(posix_WIFCONTINUED__doc__,
|
|
"WIFCONTINUED(status) -> bool\n\n\
|
|
Return True if the process returning 'status' was continued from a\n\
|
|
job control stop.");
|
|
|
|
static PyObject *
|
|
posix_WIFCONTINUED(PyObject *self, PyObject *args)
|
|
{
|
|
WAIT_TYPE status;
|
|
WAIT_STATUS_INT(status) = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:WCONTINUED", &WAIT_STATUS_INT(status)))
|
|
return NULL;
|
|
|
|
return PyBool_FromLong(WIFCONTINUED(status));
|
|
}
|
|
#endif /* WIFCONTINUED */
|
|
|
|
#ifdef WIFSTOPPED
|
|
PyDoc_STRVAR(posix_WIFSTOPPED__doc__,
|
|
"WIFSTOPPED(status) -> bool\n\n\
|
|
Return True if the process returning 'status' was stopped.");
|
|
|
|
static PyObject *
|
|
posix_WIFSTOPPED(PyObject *self, PyObject *args)
|
|
{
|
|
WAIT_TYPE status;
|
|
WAIT_STATUS_INT(status) = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:WIFSTOPPED", &WAIT_STATUS_INT(status)))
|
|
return NULL;
|
|
|
|
return PyBool_FromLong(WIFSTOPPED(status));
|
|
}
|
|
#endif /* WIFSTOPPED */
|
|
|
|
#ifdef WIFSIGNALED
|
|
PyDoc_STRVAR(posix_WIFSIGNALED__doc__,
|
|
"WIFSIGNALED(status) -> bool\n\n\
|
|
Return True if the process returning 'status' was terminated by a signal.");
|
|
|
|
static PyObject *
|
|
posix_WIFSIGNALED(PyObject *self, PyObject *args)
|
|
{
|
|
WAIT_TYPE status;
|
|
WAIT_STATUS_INT(status) = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:WIFSIGNALED", &WAIT_STATUS_INT(status)))
|
|
return NULL;
|
|
|
|
return PyBool_FromLong(WIFSIGNALED(status));
|
|
}
|
|
#endif /* WIFSIGNALED */
|
|
|
|
#ifdef WIFEXITED
|
|
PyDoc_STRVAR(posix_WIFEXITED__doc__,
|
|
"WIFEXITED(status) -> bool\n\n\
|
|
Return true if the process returning 'status' exited using the exit()\n\
|
|
system call.");
|
|
|
|
static PyObject *
|
|
posix_WIFEXITED(PyObject *self, PyObject *args)
|
|
{
|
|
WAIT_TYPE status;
|
|
WAIT_STATUS_INT(status) = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:WIFEXITED", &WAIT_STATUS_INT(status)))
|
|
return NULL;
|
|
|
|
return PyBool_FromLong(WIFEXITED(status));
|
|
}
|
|
#endif /* WIFEXITED */
|
|
|
|
#ifdef WEXITSTATUS
|
|
PyDoc_STRVAR(posix_WEXITSTATUS__doc__,
|
|
"WEXITSTATUS(status) -> integer\n\n\
|
|
Return the process return code from 'status'.");
|
|
|
|
static PyObject *
|
|
posix_WEXITSTATUS(PyObject *self, PyObject *args)
|
|
{
|
|
WAIT_TYPE status;
|
|
WAIT_STATUS_INT(status) = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:WEXITSTATUS", &WAIT_STATUS_INT(status)))
|
|
return NULL;
|
|
|
|
return Py_BuildValue("i", WEXITSTATUS(status));
|
|
}
|
|
#endif /* WEXITSTATUS */
|
|
|
|
#ifdef WTERMSIG
|
|
PyDoc_STRVAR(posix_WTERMSIG__doc__,
|
|
"WTERMSIG(status) -> integer\n\n\
|
|
Return the signal that terminated the process that provided the 'status'\n\
|
|
value.");
|
|
|
|
static PyObject *
|
|
posix_WTERMSIG(PyObject *self, PyObject *args)
|
|
{
|
|
WAIT_TYPE status;
|
|
WAIT_STATUS_INT(status) = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:WTERMSIG", &WAIT_STATUS_INT(status)))
|
|
return NULL;
|
|
|
|
return Py_BuildValue("i", WTERMSIG(status));
|
|
}
|
|
#endif /* WTERMSIG */
|
|
|
|
#ifdef WSTOPSIG
|
|
PyDoc_STRVAR(posix_WSTOPSIG__doc__,
|
|
"WSTOPSIG(status) -> integer\n\n\
|
|
Return the signal that stopped the process that provided\n\
|
|
the 'status' value.");
|
|
|
|
static PyObject *
|
|
posix_WSTOPSIG(PyObject *self, PyObject *args)
|
|
{
|
|
WAIT_TYPE status;
|
|
WAIT_STATUS_INT(status) = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:WSTOPSIG", &WAIT_STATUS_INT(status)))
|
|
return NULL;
|
|
|
|
return Py_BuildValue("i", WSTOPSIG(status));
|
|
}
|
|
#endif /* WSTOPSIG */
|
|
|
|
#endif /* HAVE_SYS_WAIT_H */
|
|
|
|
|
|
#if defined(HAVE_FSTATVFS) && defined(HAVE_SYS_STATVFS_H)
|
|
#ifdef _SCO_DS
|
|
/* SCO OpenServer 5.0 and later requires _SVID3 before it reveals the
|
|
needed definitions in sys/statvfs.h */
|
|
#define _SVID3
|
|
#endif
|
|
#include <sys/statvfs.h>
|
|
|
|
static PyObject*
|
|
_pystatvfs_fromstructstatvfs(struct statvfs st) {
|
|
PyObject *v = PyStructSequence_New(&StatVFSResultType);
|
|
if (v == NULL)
|
|
return NULL;
|
|
|
|
#if !defined(HAVE_LARGEFILE_SUPPORT)
|
|
PyStructSequence_SET_ITEM(v, 0, PyInt_FromLong((long) st.f_bsize));
|
|
PyStructSequence_SET_ITEM(v, 1, PyInt_FromLong((long) st.f_frsize));
|
|
PyStructSequence_SET_ITEM(v, 2, PyInt_FromLong((long) st.f_blocks));
|
|
PyStructSequence_SET_ITEM(v, 3, PyInt_FromLong((long) st.f_bfree));
|
|
PyStructSequence_SET_ITEM(v, 4, PyInt_FromLong((long) st.f_bavail));
|
|
PyStructSequence_SET_ITEM(v, 5, PyInt_FromLong((long) st.f_files));
|
|
PyStructSequence_SET_ITEM(v, 6, PyInt_FromLong((long) st.f_ffree));
|
|
PyStructSequence_SET_ITEM(v, 7, PyInt_FromLong((long) st.f_favail));
|
|
PyStructSequence_SET_ITEM(v, 8, PyInt_FromLong((long) st.f_flag));
|
|
PyStructSequence_SET_ITEM(v, 9, PyInt_FromLong((long) st.f_namemax));
|
|
#else
|
|
PyStructSequence_SET_ITEM(v, 0, PyInt_FromLong((long) st.f_bsize));
|
|
PyStructSequence_SET_ITEM(v, 1, PyInt_FromLong((long) st.f_frsize));
|
|
PyStructSequence_SET_ITEM(v, 2,
|
|
PyLong_FromLongLong((PY_LONG_LONG) st.f_blocks));
|
|
PyStructSequence_SET_ITEM(v, 3,
|
|
PyLong_FromLongLong((PY_LONG_LONG) st.f_bfree));
|
|
PyStructSequence_SET_ITEM(v, 4,
|
|
PyLong_FromLongLong((PY_LONG_LONG) st.f_bavail));
|
|
PyStructSequence_SET_ITEM(v, 5,
|
|
PyLong_FromLongLong((PY_LONG_LONG) st.f_files));
|
|
PyStructSequence_SET_ITEM(v, 6,
|
|
PyLong_FromLongLong((PY_LONG_LONG) st.f_ffree));
|
|
PyStructSequence_SET_ITEM(v, 7,
|
|
PyLong_FromLongLong((PY_LONG_LONG) st.f_favail));
|
|
PyStructSequence_SET_ITEM(v, 8, PyInt_FromLong((long) st.f_flag));
|
|
PyStructSequence_SET_ITEM(v, 9, PyInt_FromLong((long) st.f_namemax));
|
|
#endif
|
|
|
|
return v;
|
|
}
|
|
|
|
PyDoc_STRVAR(posix_fstatvfs__doc__,
|
|
"fstatvfs(fd) -> statvfs result\n\n\
|
|
Perform an fstatvfs system call on the given fd.");
|
|
|
|
static PyObject *
|
|
posix_fstatvfs(PyObject *self, PyObject *args)
|
|
{
|
|
int fd, res;
|
|
struct statvfs st;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:fstatvfs", &fd))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = fstatvfs(fd, &st);
|
|
Py_END_ALLOW_THREADS
|
|
if (res != 0)
|
|
return posix_error();
|
|
|
|
return _pystatvfs_fromstructstatvfs(st);
|
|
}
|
|
#endif /* HAVE_FSTATVFS && HAVE_SYS_STATVFS_H */
|
|
|
|
|
|
#if defined(HAVE_STATVFS) && defined(HAVE_SYS_STATVFS_H)
|
|
#include <sys/statvfs.h>
|
|
|
|
PyDoc_STRVAR(posix_statvfs__doc__,
|
|
"statvfs(path) -> statvfs result\n\n\
|
|
Perform a statvfs system call on the given path.");
|
|
|
|
static PyObject *
|
|
posix_statvfs(PyObject *self, PyObject *args)
|
|
{
|
|
char *path;
|
|
int res;
|
|
struct statvfs st;
|
|
if (!PyArg_ParseTuple(args, "s:statvfs", &path))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = statvfs(path, &st);
|
|
Py_END_ALLOW_THREADS
|
|
if (res != 0)
|
|
return posix_error_with_filename(path);
|
|
|
|
return _pystatvfs_fromstructstatvfs(st);
|
|
}
|
|
#endif /* HAVE_STATVFS */
|
|
|
|
|
|
#ifdef HAVE_TEMPNAM
|
|
PyDoc_STRVAR(posix_tempnam__doc__,
|
|
"tempnam([dir[, prefix]]) -> string\n\n\
|
|
Return a unique name for a temporary file.\n\
|
|
The directory and a prefix may be specified as strings; they may be omitted\n\
|
|
or None if not needed.");
|
|
|
|
static PyObject *
|
|
posix_tempnam(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *result = NULL;
|
|
char *dir = NULL;
|
|
char *pfx = NULL;
|
|
char *name;
|
|
|
|
if (!PyArg_ParseTuple(args, "|zz:tempnam", &dir, &pfx))
|
|
return NULL;
|
|
|
|
if (PyErr_Warn(PyExc_RuntimeWarning,
|
|
"tempnam is a potential security risk to your program") < 0)
|
|
return NULL;
|
|
|
|
#ifdef MS_WINDOWS
|
|
name = _tempnam(dir, pfx);
|
|
#else
|
|
name = tempnam(dir, pfx);
|
|
#endif
|
|
if (name == NULL)
|
|
return PyErr_NoMemory();
|
|
result = PyString_FromString(name);
|
|
free(name);
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_TMPFILE
|
|
PyDoc_STRVAR(posix_tmpfile__doc__,
|
|
"tmpfile() -> file object\n\n\
|
|
Create a temporary file with no directory entries.");
|
|
|
|
static PyObject *
|
|
posix_tmpfile(PyObject *self, PyObject *noargs)
|
|
{
|
|
FILE *fp;
|
|
|
|
fp = tmpfile();
|
|
if (fp == NULL)
|
|
return posix_error();
|
|
return PyFile_FromFile(fp, "<tmpfile>", "w+b", fclose);
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_TMPNAM
|
|
PyDoc_STRVAR(posix_tmpnam__doc__,
|
|
"tmpnam() -> string\n\n\
|
|
Return a unique name for a temporary file.");
|
|
|
|
static PyObject *
|
|
posix_tmpnam(PyObject *self, PyObject *noargs)
|
|
{
|
|
char buffer[L_tmpnam];
|
|
char *name;
|
|
|
|
if (PyErr_Warn(PyExc_RuntimeWarning,
|
|
"tmpnam is a potential security risk to your program") < 0)
|
|
return NULL;
|
|
|
|
#ifdef USE_TMPNAM_R
|
|
name = tmpnam_r(buffer);
|
|
#else
|
|
name = tmpnam(buffer);
|
|
#endif
|
|
if (name == NULL) {
|
|
PyObject *err = Py_BuildValue("is", 0,
|
|
#ifdef USE_TMPNAM_R
|
|
"unexpected NULL from tmpnam_r"
|
|
#else
|
|
"unexpected NULL from tmpnam"
|
|
#endif
|
|
);
|
|
PyErr_SetObject(PyExc_OSError, err);
|
|
Py_XDECREF(err);
|
|
return NULL;
|
|
}
|
|
return PyString_FromString(buffer);
|
|
}
|
|
#endif
|
|
|
|
|
|
/* This is used for fpathconf(), pathconf(), confstr() and sysconf().
|
|
* It maps strings representing configuration variable names to
|
|
* integer values, allowing those functions to be called with the
|
|
* magic names instead of polluting the module's namespace with tons of
|
|
* rarely-used constants. There are three separate tables that use
|
|
* these definitions.
|
|
*
|
|
* This code is always included, even if none of the interfaces that
|
|
* need it are included. The #if hackery needed to avoid it would be
|
|
* sufficiently pervasive that it's not worth the loss of readability.
|
|
*/
|
|
struct constdef {
|
|
char *name;
|
|
long value;
|
|
};
|
|
|
|
static int
|
|
conv_confname(PyObject *arg, int *valuep, struct constdef *table,
|
|
size_t tablesize)
|
|
{
|
|
if (PyInt_Check(arg)) {
|
|
*valuep = PyInt_AS_LONG(arg);
|
|
return 1;
|
|
}
|
|
if (PyString_Check(arg)) {
|
|
/* look up the value in the table using a binary search */
|
|
size_t lo = 0;
|
|
size_t mid;
|
|
size_t hi = tablesize;
|
|
int cmp;
|
|
char *confname = PyString_AS_STRING(arg);
|
|
while (lo < hi) {
|
|
mid = (lo + hi) / 2;
|
|
cmp = strcmp(confname, table[mid].name);
|
|
if (cmp < 0)
|
|
hi = mid;
|
|
else if (cmp > 0)
|
|
lo = mid + 1;
|
|
else {
|
|
*valuep = table[mid].value;
|
|
return 1;
|
|
}
|
|
}
|
|
PyErr_SetString(PyExc_ValueError, "unrecognized configuration name");
|
|
}
|
|
else
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"configuration names must be strings or integers");
|
|
return 0;
|
|
}
|
|
|
|
|
|
#if defined(HAVE_FPATHCONF) || defined(HAVE_PATHCONF)
|
|
static struct constdef posix_constants_pathconf[] = {
|
|
#ifdef _PC_ABI_AIO_XFER_MAX
|
|
{"PC_ABI_AIO_XFER_MAX", _PC_ABI_AIO_XFER_MAX},
|
|
#endif
|
|
#ifdef _PC_ABI_ASYNC_IO
|
|
{"PC_ABI_ASYNC_IO", _PC_ABI_ASYNC_IO},
|
|
#endif
|
|
#ifdef _PC_ASYNC_IO
|
|
{"PC_ASYNC_IO", _PC_ASYNC_IO},
|
|
#endif
|
|
#ifdef _PC_CHOWN_RESTRICTED
|
|
{"PC_CHOWN_RESTRICTED", _PC_CHOWN_RESTRICTED},
|
|
#endif
|
|
#ifdef _PC_FILESIZEBITS
|
|
{"PC_FILESIZEBITS", _PC_FILESIZEBITS},
|
|
#endif
|
|
#ifdef _PC_LAST
|
|
{"PC_LAST", _PC_LAST},
|
|
#endif
|
|
#ifdef _PC_LINK_MAX
|
|
{"PC_LINK_MAX", _PC_LINK_MAX},
|
|
#endif
|
|
#ifdef _PC_MAX_CANON
|
|
{"PC_MAX_CANON", _PC_MAX_CANON},
|
|
#endif
|
|
#ifdef _PC_MAX_INPUT
|
|
{"PC_MAX_INPUT", _PC_MAX_INPUT},
|
|
#endif
|
|
#ifdef _PC_NAME_MAX
|
|
{"PC_NAME_MAX", _PC_NAME_MAX},
|
|
#endif
|
|
#ifdef _PC_NO_TRUNC
|
|
{"PC_NO_TRUNC", _PC_NO_TRUNC},
|
|
#endif
|
|
#ifdef _PC_PATH_MAX
|
|
{"PC_PATH_MAX", _PC_PATH_MAX},
|
|
#endif
|
|
#ifdef _PC_PIPE_BUF
|
|
{"PC_PIPE_BUF", _PC_PIPE_BUF},
|
|
#endif
|
|
#ifdef _PC_PRIO_IO
|
|
{"PC_PRIO_IO", _PC_PRIO_IO},
|
|
#endif
|
|
#ifdef _PC_SOCK_MAXBUF
|
|
{"PC_SOCK_MAXBUF", _PC_SOCK_MAXBUF},
|
|
#endif
|
|
#ifdef _PC_SYNC_IO
|
|
{"PC_SYNC_IO", _PC_SYNC_IO},
|
|
#endif
|
|
#ifdef _PC_VDISABLE
|
|
{"PC_VDISABLE", _PC_VDISABLE},
|
|
#endif
|
|
};
|
|
|
|
static int
|
|
conv_path_confname(PyObject *arg, int *valuep)
|
|
{
|
|
return conv_confname(arg, valuep, posix_constants_pathconf,
|
|
sizeof(posix_constants_pathconf)
|
|
/ sizeof(struct constdef));
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_FPATHCONF
|
|
PyDoc_STRVAR(posix_fpathconf__doc__,
|
|
"fpathconf(fd, name) -> integer\n\n\
|
|
Return the configuration limit name for the file descriptor fd.\n\
|
|
If there is no limit, return -1.");
|
|
|
|
static PyObject *
|
|
posix_fpathconf(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *result = NULL;
|
|
int name, fd;
|
|
|
|
if (PyArg_ParseTuple(args, "iO&:fpathconf", &fd,
|
|
conv_path_confname, &name)) {
|
|
long limit;
|
|
|
|
errno = 0;
|
|
limit = fpathconf(fd, name);
|
|
if (limit == -1 && errno != 0)
|
|
posix_error();
|
|
else
|
|
result = PyInt_FromLong(limit);
|
|
}
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_PATHCONF
|
|
PyDoc_STRVAR(posix_pathconf__doc__,
|
|
"pathconf(path, name) -> integer\n\n\
|
|
Return the configuration limit name for the file or directory path.\n\
|
|
If there is no limit, return -1.");
|
|
|
|
static PyObject *
|
|
posix_pathconf(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *result = NULL;
|
|
int name;
|
|
char *path;
|
|
|
|
if (PyArg_ParseTuple(args, "sO&:pathconf", &path,
|
|
conv_path_confname, &name)) {
|
|
long limit;
|
|
|
|
errno = 0;
|
|
limit = pathconf(path, name);
|
|
if (limit == -1 && errno != 0) {
|
|
if (errno == EINVAL)
|
|
/* could be a path or name problem */
|
|
posix_error();
|
|
else
|
|
posix_error_with_filename(path);
|
|
}
|
|
else
|
|
result = PyInt_FromLong(limit);
|
|
}
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_CONFSTR
|
|
static struct constdef posix_constants_confstr[] = {
|
|
#ifdef _CS_ARCHITECTURE
|
|
{"CS_ARCHITECTURE", _CS_ARCHITECTURE},
|
|
#endif
|
|
#ifdef _CS_HOSTNAME
|
|
{"CS_HOSTNAME", _CS_HOSTNAME},
|
|
#endif
|
|
#ifdef _CS_HW_PROVIDER
|
|
{"CS_HW_PROVIDER", _CS_HW_PROVIDER},
|
|
#endif
|
|
#ifdef _CS_HW_SERIAL
|
|
{"CS_HW_SERIAL", _CS_HW_SERIAL},
|
|
#endif
|
|
#ifdef _CS_INITTAB_NAME
|
|
{"CS_INITTAB_NAME", _CS_INITTAB_NAME},
|
|
#endif
|
|
#ifdef _CS_LFS64_CFLAGS
|
|
{"CS_LFS64_CFLAGS", _CS_LFS64_CFLAGS},
|
|
#endif
|
|
#ifdef _CS_LFS64_LDFLAGS
|
|
{"CS_LFS64_LDFLAGS", _CS_LFS64_LDFLAGS},
|
|
#endif
|
|
#ifdef _CS_LFS64_LIBS
|
|
{"CS_LFS64_LIBS", _CS_LFS64_LIBS},
|
|
#endif
|
|
#ifdef _CS_LFS64_LINTFLAGS
|
|
{"CS_LFS64_LINTFLAGS", _CS_LFS64_LINTFLAGS},
|
|
#endif
|
|
#ifdef _CS_LFS_CFLAGS
|
|
{"CS_LFS_CFLAGS", _CS_LFS_CFLAGS},
|
|
#endif
|
|
#ifdef _CS_LFS_LDFLAGS
|
|
{"CS_LFS_LDFLAGS", _CS_LFS_LDFLAGS},
|
|
#endif
|
|
#ifdef _CS_LFS_LIBS
|
|
{"CS_LFS_LIBS", _CS_LFS_LIBS},
|
|
#endif
|
|
#ifdef _CS_LFS_LINTFLAGS
|
|
{"CS_LFS_LINTFLAGS", _CS_LFS_LINTFLAGS},
|
|
#endif
|
|
#ifdef _CS_MACHINE
|
|
{"CS_MACHINE", _CS_MACHINE},
|
|
#endif
|
|
#ifdef _CS_PATH
|
|
{"CS_PATH", _CS_PATH},
|
|
#endif
|
|
#ifdef _CS_RELEASE
|
|
{"CS_RELEASE", _CS_RELEASE},
|
|
#endif
|
|
#ifdef _CS_SRPC_DOMAIN
|
|
{"CS_SRPC_DOMAIN", _CS_SRPC_DOMAIN},
|
|
#endif
|
|
#ifdef _CS_SYSNAME
|
|
{"CS_SYSNAME", _CS_SYSNAME},
|
|
#endif
|
|
#ifdef _CS_VERSION
|
|
{"CS_VERSION", _CS_VERSION},
|
|
#endif
|
|
#ifdef _CS_XBS5_ILP32_OFF32_CFLAGS
|
|
{"CS_XBS5_ILP32_OFF32_CFLAGS", _CS_XBS5_ILP32_OFF32_CFLAGS},
|
|
#endif
|
|
#ifdef _CS_XBS5_ILP32_OFF32_LDFLAGS
|
|
{"CS_XBS5_ILP32_OFF32_LDFLAGS", _CS_XBS5_ILP32_OFF32_LDFLAGS},
|
|
#endif
|
|
#ifdef _CS_XBS5_ILP32_OFF32_LIBS
|
|
{"CS_XBS5_ILP32_OFF32_LIBS", _CS_XBS5_ILP32_OFF32_LIBS},
|
|
#endif
|
|
#ifdef _CS_XBS5_ILP32_OFF32_LINTFLAGS
|
|
{"CS_XBS5_ILP32_OFF32_LINTFLAGS", _CS_XBS5_ILP32_OFF32_LINTFLAGS},
|
|
#endif
|
|
#ifdef _CS_XBS5_ILP32_OFFBIG_CFLAGS
|
|
{"CS_XBS5_ILP32_OFFBIG_CFLAGS", _CS_XBS5_ILP32_OFFBIG_CFLAGS},
|
|
#endif
|
|
#ifdef _CS_XBS5_ILP32_OFFBIG_LDFLAGS
|
|
{"CS_XBS5_ILP32_OFFBIG_LDFLAGS", _CS_XBS5_ILP32_OFFBIG_LDFLAGS},
|
|
#endif
|
|
#ifdef _CS_XBS5_ILP32_OFFBIG_LIBS
|
|
{"CS_XBS5_ILP32_OFFBIG_LIBS", _CS_XBS5_ILP32_OFFBIG_LIBS},
|
|
#endif
|
|
#ifdef _CS_XBS5_ILP32_OFFBIG_LINTFLAGS
|
|
{"CS_XBS5_ILP32_OFFBIG_LINTFLAGS", _CS_XBS5_ILP32_OFFBIG_LINTFLAGS},
|
|
#endif
|
|
#ifdef _CS_XBS5_LP64_OFF64_CFLAGS
|
|
{"CS_XBS5_LP64_OFF64_CFLAGS", _CS_XBS5_LP64_OFF64_CFLAGS},
|
|
#endif
|
|
#ifdef _CS_XBS5_LP64_OFF64_LDFLAGS
|
|
{"CS_XBS5_LP64_OFF64_LDFLAGS", _CS_XBS5_LP64_OFF64_LDFLAGS},
|
|
#endif
|
|
#ifdef _CS_XBS5_LP64_OFF64_LIBS
|
|
{"CS_XBS5_LP64_OFF64_LIBS", _CS_XBS5_LP64_OFF64_LIBS},
|
|
#endif
|
|
#ifdef _CS_XBS5_LP64_OFF64_LINTFLAGS
|
|
{"CS_XBS5_LP64_OFF64_LINTFLAGS", _CS_XBS5_LP64_OFF64_LINTFLAGS},
|
|
#endif
|
|
#ifdef _CS_XBS5_LPBIG_OFFBIG_CFLAGS
|
|
{"CS_XBS5_LPBIG_OFFBIG_CFLAGS", _CS_XBS5_LPBIG_OFFBIG_CFLAGS},
|
|
#endif
|
|
#ifdef _CS_XBS5_LPBIG_OFFBIG_LDFLAGS
|
|
{"CS_XBS5_LPBIG_OFFBIG_LDFLAGS", _CS_XBS5_LPBIG_OFFBIG_LDFLAGS},
|
|
#endif
|
|
#ifdef _CS_XBS5_LPBIG_OFFBIG_LIBS
|
|
{"CS_XBS5_LPBIG_OFFBIG_LIBS", _CS_XBS5_LPBIG_OFFBIG_LIBS},
|
|
#endif
|
|
#ifdef _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS
|
|
{"CS_XBS5_LPBIG_OFFBIG_LINTFLAGS", _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS},
|
|
#endif
|
|
#ifdef _MIPS_CS_AVAIL_PROCESSORS
|
|
{"MIPS_CS_AVAIL_PROCESSORS", _MIPS_CS_AVAIL_PROCESSORS},
|
|
#endif
|
|
#ifdef _MIPS_CS_BASE
|
|
{"MIPS_CS_BASE", _MIPS_CS_BASE},
|
|
#endif
|
|
#ifdef _MIPS_CS_HOSTID
|
|
{"MIPS_CS_HOSTID", _MIPS_CS_HOSTID},
|
|
#endif
|
|
#ifdef _MIPS_CS_HW_NAME
|
|
{"MIPS_CS_HW_NAME", _MIPS_CS_HW_NAME},
|
|
#endif
|
|
#ifdef _MIPS_CS_NUM_PROCESSORS
|
|
{"MIPS_CS_NUM_PROCESSORS", _MIPS_CS_NUM_PROCESSORS},
|
|
#endif
|
|
#ifdef _MIPS_CS_OSREL_MAJ
|
|
{"MIPS_CS_OSREL_MAJ", _MIPS_CS_OSREL_MAJ},
|
|
#endif
|
|
#ifdef _MIPS_CS_OSREL_MIN
|
|
{"MIPS_CS_OSREL_MIN", _MIPS_CS_OSREL_MIN},
|
|
#endif
|
|
#ifdef _MIPS_CS_OSREL_PATCH
|
|
{"MIPS_CS_OSREL_PATCH", _MIPS_CS_OSREL_PATCH},
|
|
#endif
|
|
#ifdef _MIPS_CS_OS_NAME
|
|
{"MIPS_CS_OS_NAME", _MIPS_CS_OS_NAME},
|
|
#endif
|
|
#ifdef _MIPS_CS_OS_PROVIDER
|
|
{"MIPS_CS_OS_PROVIDER", _MIPS_CS_OS_PROVIDER},
|
|
#endif
|
|
#ifdef _MIPS_CS_PROCESSORS
|
|
{"MIPS_CS_PROCESSORS", _MIPS_CS_PROCESSORS},
|
|
#endif
|
|
#ifdef _MIPS_CS_SERIAL
|
|
{"MIPS_CS_SERIAL", _MIPS_CS_SERIAL},
|
|
#endif
|
|
#ifdef _MIPS_CS_VENDOR
|
|
{"MIPS_CS_VENDOR", _MIPS_CS_VENDOR},
|
|
#endif
|
|
};
|
|
|
|
static int
|
|
conv_confstr_confname(PyObject *arg, int *valuep)
|
|
{
|
|
return conv_confname(arg, valuep, posix_constants_confstr,
|
|
sizeof(posix_constants_confstr)
|
|
/ sizeof(struct constdef));
|
|
}
|
|
|
|
PyDoc_STRVAR(posix_confstr__doc__,
|
|
"confstr(name) -> string\n\n\
|
|
Return a string-valued system configuration variable.");
|
|
|
|
static PyObject *
|
|
posix_confstr(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *result = NULL;
|
|
int name;
|
|
char buffer[256];
|
|
|
|
if (PyArg_ParseTuple(args, "O&:confstr", conv_confstr_confname, &name)) {
|
|
int len;
|
|
|
|
errno = 0;
|
|
len = confstr(name, buffer, sizeof(buffer));
|
|
if (len == 0) {
|
|
if (errno) {
|
|
posix_error();
|
|
}
|
|
else {
|
|
result = Py_None;
|
|
Py_INCREF(Py_None);
|
|
}
|
|
}
|
|
else {
|
|
if ((unsigned int)len >= sizeof(buffer)) {
|
|
result = PyString_FromStringAndSize(NULL, len-1);
|
|
if (result != NULL)
|
|
confstr(name, PyString_AS_STRING(result), len);
|
|
}
|
|
else
|
|
result = PyString_FromStringAndSize(buffer, len-1);
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_SYSCONF
|
|
static struct constdef posix_constants_sysconf[] = {
|
|
#ifdef _SC_2_CHAR_TERM
|
|
{"SC_2_CHAR_TERM", _SC_2_CHAR_TERM},
|
|
#endif
|
|
#ifdef _SC_2_C_BIND
|
|
{"SC_2_C_BIND", _SC_2_C_BIND},
|
|
#endif
|
|
#ifdef _SC_2_C_DEV
|
|
{"SC_2_C_DEV", _SC_2_C_DEV},
|
|
#endif
|
|
#ifdef _SC_2_C_VERSION
|
|
{"SC_2_C_VERSION", _SC_2_C_VERSION},
|
|
#endif
|
|
#ifdef _SC_2_FORT_DEV
|
|
{"SC_2_FORT_DEV", _SC_2_FORT_DEV},
|
|
#endif
|
|
#ifdef _SC_2_FORT_RUN
|
|
{"SC_2_FORT_RUN", _SC_2_FORT_RUN},
|
|
#endif
|
|
#ifdef _SC_2_LOCALEDEF
|
|
{"SC_2_LOCALEDEF", _SC_2_LOCALEDEF},
|
|
#endif
|
|
#ifdef _SC_2_SW_DEV
|
|
{"SC_2_SW_DEV", _SC_2_SW_DEV},
|
|
#endif
|
|
#ifdef _SC_2_UPE
|
|
{"SC_2_UPE", _SC_2_UPE},
|
|
#endif
|
|
#ifdef _SC_2_VERSION
|
|
{"SC_2_VERSION", _SC_2_VERSION},
|
|
#endif
|
|
#ifdef _SC_ABI_ASYNCHRONOUS_IO
|
|
{"SC_ABI_ASYNCHRONOUS_IO", _SC_ABI_ASYNCHRONOUS_IO},
|
|
#endif
|
|
#ifdef _SC_ACL
|
|
{"SC_ACL", _SC_ACL},
|
|
#endif
|
|
#ifdef _SC_AIO_LISTIO_MAX
|
|
{"SC_AIO_LISTIO_MAX", _SC_AIO_LISTIO_MAX},
|
|
#endif
|
|
#ifdef _SC_AIO_MAX
|
|
{"SC_AIO_MAX", _SC_AIO_MAX},
|
|
#endif
|
|
#ifdef _SC_AIO_PRIO_DELTA_MAX
|
|
{"SC_AIO_PRIO_DELTA_MAX", _SC_AIO_PRIO_DELTA_MAX},
|
|
#endif
|
|
#ifdef _SC_ARG_MAX
|
|
{"SC_ARG_MAX", _SC_ARG_MAX},
|
|
#endif
|
|
#ifdef _SC_ASYNCHRONOUS_IO
|
|
{"SC_ASYNCHRONOUS_IO", _SC_ASYNCHRONOUS_IO},
|
|
#endif
|
|
#ifdef _SC_ATEXIT_MAX
|
|
{"SC_ATEXIT_MAX", _SC_ATEXIT_MAX},
|
|
#endif
|
|
#ifdef _SC_AUDIT
|
|
{"SC_AUDIT", _SC_AUDIT},
|
|
#endif
|
|
#ifdef _SC_AVPHYS_PAGES
|
|
{"SC_AVPHYS_PAGES", _SC_AVPHYS_PAGES},
|
|
#endif
|
|
#ifdef _SC_BC_BASE_MAX
|
|
{"SC_BC_BASE_MAX", _SC_BC_BASE_MAX},
|
|
#endif
|
|
#ifdef _SC_BC_DIM_MAX
|
|
{"SC_BC_DIM_MAX", _SC_BC_DIM_MAX},
|
|
#endif
|
|
#ifdef _SC_BC_SCALE_MAX
|
|
{"SC_BC_SCALE_MAX", _SC_BC_SCALE_MAX},
|
|
#endif
|
|
#ifdef _SC_BC_STRING_MAX
|
|
{"SC_BC_STRING_MAX", _SC_BC_STRING_MAX},
|
|
#endif
|
|
#ifdef _SC_CAP
|
|
{"SC_CAP", _SC_CAP},
|
|
#endif
|
|
#ifdef _SC_CHARCLASS_NAME_MAX
|
|
{"SC_CHARCLASS_NAME_MAX", _SC_CHARCLASS_NAME_MAX},
|
|
#endif
|
|
#ifdef _SC_CHAR_BIT
|
|
{"SC_CHAR_BIT", _SC_CHAR_BIT},
|
|
#endif
|
|
#ifdef _SC_CHAR_MAX
|
|
{"SC_CHAR_MAX", _SC_CHAR_MAX},
|
|
#endif
|
|
#ifdef _SC_CHAR_MIN
|
|
{"SC_CHAR_MIN", _SC_CHAR_MIN},
|
|
#endif
|
|
#ifdef _SC_CHILD_MAX
|
|
{"SC_CHILD_MAX", _SC_CHILD_MAX},
|
|
#endif
|
|
#ifdef _SC_CLK_TCK
|
|
{"SC_CLK_TCK", _SC_CLK_TCK},
|
|
#endif
|
|
#ifdef _SC_COHER_BLKSZ
|
|
{"SC_COHER_BLKSZ", _SC_COHER_BLKSZ},
|
|
#endif
|
|
#ifdef _SC_COLL_WEIGHTS_MAX
|
|
{"SC_COLL_WEIGHTS_MAX", _SC_COLL_WEIGHTS_MAX},
|
|
#endif
|
|
#ifdef _SC_DCACHE_ASSOC
|
|
{"SC_DCACHE_ASSOC", _SC_DCACHE_ASSOC},
|
|
#endif
|
|
#ifdef _SC_DCACHE_BLKSZ
|
|
{"SC_DCACHE_BLKSZ", _SC_DCACHE_BLKSZ},
|
|
#endif
|
|
#ifdef _SC_DCACHE_LINESZ
|
|
{"SC_DCACHE_LINESZ", _SC_DCACHE_LINESZ},
|
|
#endif
|
|
#ifdef _SC_DCACHE_SZ
|
|
{"SC_DCACHE_SZ", _SC_DCACHE_SZ},
|
|
#endif
|
|
#ifdef _SC_DCACHE_TBLKSZ
|
|
{"SC_DCACHE_TBLKSZ", _SC_DCACHE_TBLKSZ},
|
|
#endif
|
|
#ifdef _SC_DELAYTIMER_MAX
|
|
{"SC_DELAYTIMER_MAX", _SC_DELAYTIMER_MAX},
|
|
#endif
|
|
#ifdef _SC_EQUIV_CLASS_MAX
|
|
{"SC_EQUIV_CLASS_MAX", _SC_EQUIV_CLASS_MAX},
|
|
#endif
|
|
#ifdef _SC_EXPR_NEST_MAX
|
|
{"SC_EXPR_NEST_MAX", _SC_EXPR_NEST_MAX},
|
|
#endif
|
|
#ifdef _SC_FSYNC
|
|
{"SC_FSYNC", _SC_FSYNC},
|
|
#endif
|
|
#ifdef _SC_GETGR_R_SIZE_MAX
|
|
{"SC_GETGR_R_SIZE_MAX", _SC_GETGR_R_SIZE_MAX},
|
|
#endif
|
|
#ifdef _SC_GETPW_R_SIZE_MAX
|
|
{"SC_GETPW_R_SIZE_MAX", _SC_GETPW_R_SIZE_MAX},
|
|
#endif
|
|
#ifdef _SC_ICACHE_ASSOC
|
|
{"SC_ICACHE_ASSOC", _SC_ICACHE_ASSOC},
|
|
#endif
|
|
#ifdef _SC_ICACHE_BLKSZ
|
|
{"SC_ICACHE_BLKSZ", _SC_ICACHE_BLKSZ},
|
|
#endif
|
|
#ifdef _SC_ICACHE_LINESZ
|
|
{"SC_ICACHE_LINESZ", _SC_ICACHE_LINESZ},
|
|
#endif
|
|
#ifdef _SC_ICACHE_SZ
|
|
{"SC_ICACHE_SZ", _SC_ICACHE_SZ},
|
|
#endif
|
|
#ifdef _SC_INF
|
|
{"SC_INF", _SC_INF},
|
|
#endif
|
|
#ifdef _SC_INT_MAX
|
|
{"SC_INT_MAX", _SC_INT_MAX},
|
|
#endif
|
|
#ifdef _SC_INT_MIN
|
|
{"SC_INT_MIN", _SC_INT_MIN},
|
|
#endif
|
|
#ifdef _SC_IOV_MAX
|
|
{"SC_IOV_MAX", _SC_IOV_MAX},
|
|
#endif
|
|
#ifdef _SC_IP_SECOPTS
|
|
{"SC_IP_SECOPTS", _SC_IP_SECOPTS},
|
|
#endif
|
|
#ifdef _SC_JOB_CONTROL
|
|
{"SC_JOB_CONTROL", _SC_JOB_CONTROL},
|
|
#endif
|
|
#ifdef _SC_KERN_POINTERS
|
|
{"SC_KERN_POINTERS", _SC_KERN_POINTERS},
|
|
#endif
|
|
#ifdef _SC_KERN_SIM
|
|
{"SC_KERN_SIM", _SC_KERN_SIM},
|
|
#endif
|
|
#ifdef _SC_LINE_MAX
|
|
{"SC_LINE_MAX", _SC_LINE_MAX},
|
|
#endif
|
|
#ifdef _SC_LOGIN_NAME_MAX
|
|
{"SC_LOGIN_NAME_MAX", _SC_LOGIN_NAME_MAX},
|
|
#endif
|
|
#ifdef _SC_LOGNAME_MAX
|
|
{"SC_LOGNAME_MAX", _SC_LOGNAME_MAX},
|
|
#endif
|
|
#ifdef _SC_LONG_BIT
|
|
{"SC_LONG_BIT", _SC_LONG_BIT},
|
|
#endif
|
|
#ifdef _SC_MAC
|
|
{"SC_MAC", _SC_MAC},
|
|
#endif
|
|
#ifdef _SC_MAPPED_FILES
|
|
{"SC_MAPPED_FILES", _SC_MAPPED_FILES},
|
|
#endif
|
|
#ifdef _SC_MAXPID
|
|
{"SC_MAXPID", _SC_MAXPID},
|
|
#endif
|
|
#ifdef _SC_MB_LEN_MAX
|
|
{"SC_MB_LEN_MAX", _SC_MB_LEN_MAX},
|
|
#endif
|
|
#ifdef _SC_MEMLOCK
|
|
{"SC_MEMLOCK", _SC_MEMLOCK},
|
|
#endif
|
|
#ifdef _SC_MEMLOCK_RANGE
|
|
{"SC_MEMLOCK_RANGE", _SC_MEMLOCK_RANGE},
|
|
#endif
|
|
#ifdef _SC_MEMORY_PROTECTION
|
|
{"SC_MEMORY_PROTECTION", _SC_MEMORY_PROTECTION},
|
|
#endif
|
|
#ifdef _SC_MESSAGE_PASSING
|
|
{"SC_MESSAGE_PASSING", _SC_MESSAGE_PASSING},
|
|
#endif
|
|
#ifdef _SC_MMAP_FIXED_ALIGNMENT
|
|
{"SC_MMAP_FIXED_ALIGNMENT", _SC_MMAP_FIXED_ALIGNMENT},
|
|
#endif
|
|
#ifdef _SC_MQ_OPEN_MAX
|
|
{"SC_MQ_OPEN_MAX", _SC_MQ_OPEN_MAX},
|
|
#endif
|
|
#ifdef _SC_MQ_PRIO_MAX
|
|
{"SC_MQ_PRIO_MAX", _SC_MQ_PRIO_MAX},
|
|
#endif
|
|
#ifdef _SC_NACLS_MAX
|
|
{"SC_NACLS_MAX", _SC_NACLS_MAX},
|
|
#endif
|
|
#ifdef _SC_NGROUPS_MAX
|
|
{"SC_NGROUPS_MAX", _SC_NGROUPS_MAX},
|
|
#endif
|
|
#ifdef _SC_NL_ARGMAX
|
|
{"SC_NL_ARGMAX", _SC_NL_ARGMAX},
|
|
#endif
|
|
#ifdef _SC_NL_LANGMAX
|
|
{"SC_NL_LANGMAX", _SC_NL_LANGMAX},
|
|
#endif
|
|
#ifdef _SC_NL_MSGMAX
|
|
{"SC_NL_MSGMAX", _SC_NL_MSGMAX},
|
|
#endif
|
|
#ifdef _SC_NL_NMAX
|
|
{"SC_NL_NMAX", _SC_NL_NMAX},
|
|
#endif
|
|
#ifdef _SC_NL_SETMAX
|
|
{"SC_NL_SETMAX", _SC_NL_SETMAX},
|
|
#endif
|
|
#ifdef _SC_NL_TEXTMAX
|
|
{"SC_NL_TEXTMAX", _SC_NL_TEXTMAX},
|
|
#endif
|
|
#ifdef _SC_NPROCESSORS_CONF
|
|
{"SC_NPROCESSORS_CONF", _SC_NPROCESSORS_CONF},
|
|
#endif
|
|
#ifdef _SC_NPROCESSORS_ONLN
|
|
{"SC_NPROCESSORS_ONLN", _SC_NPROCESSORS_ONLN},
|
|
#endif
|
|
#ifdef _SC_NPROC_CONF
|
|
{"SC_NPROC_CONF", _SC_NPROC_CONF},
|
|
#endif
|
|
#ifdef _SC_NPROC_ONLN
|
|
{"SC_NPROC_ONLN", _SC_NPROC_ONLN},
|
|
#endif
|
|
#ifdef _SC_NZERO
|
|
{"SC_NZERO", _SC_NZERO},
|
|
#endif
|
|
#ifdef _SC_OPEN_MAX
|
|
{"SC_OPEN_MAX", _SC_OPEN_MAX},
|
|
#endif
|
|
#ifdef _SC_PAGESIZE
|
|
{"SC_PAGESIZE", _SC_PAGESIZE},
|
|
#endif
|
|
#ifdef _SC_PAGE_SIZE
|
|
{"SC_PAGE_SIZE", _SC_PAGE_SIZE},
|
|
#endif
|
|
#ifdef _SC_PASS_MAX
|
|
{"SC_PASS_MAX", _SC_PASS_MAX},
|
|
#endif
|
|
#ifdef _SC_PHYS_PAGES
|
|
{"SC_PHYS_PAGES", _SC_PHYS_PAGES},
|
|
#endif
|
|
#ifdef _SC_PII
|
|
{"SC_PII", _SC_PII},
|
|
#endif
|
|
#ifdef _SC_PII_INTERNET
|
|
{"SC_PII_INTERNET", _SC_PII_INTERNET},
|
|
#endif
|
|
#ifdef _SC_PII_INTERNET_DGRAM
|
|
{"SC_PII_INTERNET_DGRAM", _SC_PII_INTERNET_DGRAM},
|
|
#endif
|
|
#ifdef _SC_PII_INTERNET_STREAM
|
|
{"SC_PII_INTERNET_STREAM", _SC_PII_INTERNET_STREAM},
|
|
#endif
|
|
#ifdef _SC_PII_OSI
|
|
{"SC_PII_OSI", _SC_PII_OSI},
|
|
#endif
|
|
#ifdef _SC_PII_OSI_CLTS
|
|
{"SC_PII_OSI_CLTS", _SC_PII_OSI_CLTS},
|
|
#endif
|
|
#ifdef _SC_PII_OSI_COTS
|
|
{"SC_PII_OSI_COTS", _SC_PII_OSI_COTS},
|
|
#endif
|
|
#ifdef _SC_PII_OSI_M
|
|
{"SC_PII_OSI_M", _SC_PII_OSI_M},
|
|
#endif
|
|
#ifdef _SC_PII_SOCKET
|
|
{"SC_PII_SOCKET", _SC_PII_SOCKET},
|
|
#endif
|
|
#ifdef _SC_PII_XTI
|
|
{"SC_PII_XTI", _SC_PII_XTI},
|
|
#endif
|
|
#ifdef _SC_POLL
|
|
{"SC_POLL", _SC_POLL},
|
|
#endif
|
|
#ifdef _SC_PRIORITIZED_IO
|
|
{"SC_PRIORITIZED_IO", _SC_PRIORITIZED_IO},
|
|
#endif
|
|
#ifdef _SC_PRIORITY_SCHEDULING
|
|
{"SC_PRIORITY_SCHEDULING", _SC_PRIORITY_SCHEDULING},
|
|
#endif
|
|
#ifdef _SC_REALTIME_SIGNALS
|
|
{"SC_REALTIME_SIGNALS", _SC_REALTIME_SIGNALS},
|
|
#endif
|
|
#ifdef _SC_RE_DUP_MAX
|
|
{"SC_RE_DUP_MAX", _SC_RE_DUP_MAX},
|
|
#endif
|
|
#ifdef _SC_RTSIG_MAX
|
|
{"SC_RTSIG_MAX", _SC_RTSIG_MAX},
|
|
#endif
|
|
#ifdef _SC_SAVED_IDS
|
|
{"SC_SAVED_IDS", _SC_SAVED_IDS},
|
|
#endif
|
|
#ifdef _SC_SCHAR_MAX
|
|
{"SC_SCHAR_MAX", _SC_SCHAR_MAX},
|
|
#endif
|
|
#ifdef _SC_SCHAR_MIN
|
|
{"SC_SCHAR_MIN", _SC_SCHAR_MIN},
|
|
#endif
|
|
#ifdef _SC_SELECT
|
|
{"SC_SELECT", _SC_SELECT},
|
|
#endif
|
|
#ifdef _SC_SEMAPHORES
|
|
{"SC_SEMAPHORES", _SC_SEMAPHORES},
|
|
#endif
|
|
#ifdef _SC_SEM_NSEMS_MAX
|
|
{"SC_SEM_NSEMS_MAX", _SC_SEM_NSEMS_MAX},
|
|
#endif
|
|
#ifdef _SC_SEM_VALUE_MAX
|
|
{"SC_SEM_VALUE_MAX", _SC_SEM_VALUE_MAX},
|
|
#endif
|
|
#ifdef _SC_SHARED_MEMORY_OBJECTS
|
|
{"SC_SHARED_MEMORY_OBJECTS", _SC_SHARED_MEMORY_OBJECTS},
|
|
#endif
|
|
#ifdef _SC_SHRT_MAX
|
|
{"SC_SHRT_MAX", _SC_SHRT_MAX},
|
|
#endif
|
|
#ifdef _SC_SHRT_MIN
|
|
{"SC_SHRT_MIN", _SC_SHRT_MIN},
|
|
#endif
|
|
#ifdef _SC_SIGQUEUE_MAX
|
|
{"SC_SIGQUEUE_MAX", _SC_SIGQUEUE_MAX},
|
|
#endif
|
|
#ifdef _SC_SIGRT_MAX
|
|
{"SC_SIGRT_MAX", _SC_SIGRT_MAX},
|
|
#endif
|
|
#ifdef _SC_SIGRT_MIN
|
|
{"SC_SIGRT_MIN", _SC_SIGRT_MIN},
|
|
#endif
|
|
#ifdef _SC_SOFTPOWER
|
|
{"SC_SOFTPOWER", _SC_SOFTPOWER},
|
|
#endif
|
|
#ifdef _SC_SPLIT_CACHE
|
|
{"SC_SPLIT_CACHE", _SC_SPLIT_CACHE},
|
|
#endif
|
|
#ifdef _SC_SSIZE_MAX
|
|
{"SC_SSIZE_MAX", _SC_SSIZE_MAX},
|
|
#endif
|
|
#ifdef _SC_STACK_PROT
|
|
{"SC_STACK_PROT", _SC_STACK_PROT},
|
|
#endif
|
|
#ifdef _SC_STREAM_MAX
|
|
{"SC_STREAM_MAX", _SC_STREAM_MAX},
|
|
#endif
|
|
#ifdef _SC_SYNCHRONIZED_IO
|
|
{"SC_SYNCHRONIZED_IO", _SC_SYNCHRONIZED_IO},
|
|
#endif
|
|
#ifdef _SC_THREADS
|
|
{"SC_THREADS", _SC_THREADS},
|
|
#endif
|
|
#ifdef _SC_THREAD_ATTR_STACKADDR
|
|
{"SC_THREAD_ATTR_STACKADDR", _SC_THREAD_ATTR_STACKADDR},
|
|
#endif
|
|
#ifdef _SC_THREAD_ATTR_STACKSIZE
|
|
{"SC_THREAD_ATTR_STACKSIZE", _SC_THREAD_ATTR_STACKSIZE},
|
|
#endif
|
|
#ifdef _SC_THREAD_DESTRUCTOR_ITERATIONS
|
|
{"SC_THREAD_DESTRUCTOR_ITERATIONS", _SC_THREAD_DESTRUCTOR_ITERATIONS},
|
|
#endif
|
|
#ifdef _SC_THREAD_KEYS_MAX
|
|
{"SC_THREAD_KEYS_MAX", _SC_THREAD_KEYS_MAX},
|
|
#endif
|
|
#ifdef _SC_THREAD_PRIORITY_SCHEDULING
|
|
{"SC_THREAD_PRIORITY_SCHEDULING", _SC_THREAD_PRIORITY_SCHEDULING},
|
|
#endif
|
|
#ifdef _SC_THREAD_PRIO_INHERIT
|
|
{"SC_THREAD_PRIO_INHERIT", _SC_THREAD_PRIO_INHERIT},
|
|
#endif
|
|
#ifdef _SC_THREAD_PRIO_PROTECT
|
|
{"SC_THREAD_PRIO_PROTECT", _SC_THREAD_PRIO_PROTECT},
|
|
#endif
|
|
#ifdef _SC_THREAD_PROCESS_SHARED
|
|
{"SC_THREAD_PROCESS_SHARED", _SC_THREAD_PROCESS_SHARED},
|
|
#endif
|
|
#ifdef _SC_THREAD_SAFE_FUNCTIONS
|
|
{"SC_THREAD_SAFE_FUNCTIONS", _SC_THREAD_SAFE_FUNCTIONS},
|
|
#endif
|
|
#ifdef _SC_THREAD_STACK_MIN
|
|
{"SC_THREAD_STACK_MIN", _SC_THREAD_STACK_MIN},
|
|
#endif
|
|
#ifdef _SC_THREAD_THREADS_MAX
|
|
{"SC_THREAD_THREADS_MAX", _SC_THREAD_THREADS_MAX},
|
|
#endif
|
|
#ifdef _SC_TIMERS
|
|
{"SC_TIMERS", _SC_TIMERS},
|
|
#endif
|
|
#ifdef _SC_TIMER_MAX
|
|
{"SC_TIMER_MAX", _SC_TIMER_MAX},
|
|
#endif
|
|
#ifdef _SC_TTY_NAME_MAX
|
|
{"SC_TTY_NAME_MAX", _SC_TTY_NAME_MAX},
|
|
#endif
|
|
#ifdef _SC_TZNAME_MAX
|
|
{"SC_TZNAME_MAX", _SC_TZNAME_MAX},
|
|
#endif
|
|
#ifdef _SC_T_IOV_MAX
|
|
{"SC_T_IOV_MAX", _SC_T_IOV_MAX},
|
|
#endif
|
|
#ifdef _SC_UCHAR_MAX
|
|
{"SC_UCHAR_MAX", _SC_UCHAR_MAX},
|
|
#endif
|
|
#ifdef _SC_UINT_MAX
|
|
{"SC_UINT_MAX", _SC_UINT_MAX},
|
|
#endif
|
|
#ifdef _SC_UIO_MAXIOV
|
|
{"SC_UIO_MAXIOV", _SC_UIO_MAXIOV},
|
|
#endif
|
|
#ifdef _SC_ULONG_MAX
|
|
{"SC_ULONG_MAX", _SC_ULONG_MAX},
|
|
#endif
|
|
#ifdef _SC_USHRT_MAX
|
|
{"SC_USHRT_MAX", _SC_USHRT_MAX},
|
|
#endif
|
|
#ifdef _SC_VERSION
|
|
{"SC_VERSION", _SC_VERSION},
|
|
#endif
|
|
#ifdef _SC_WORD_BIT
|
|
{"SC_WORD_BIT", _SC_WORD_BIT},
|
|
#endif
|
|
#ifdef _SC_XBS5_ILP32_OFF32
|
|
{"SC_XBS5_ILP32_OFF32", _SC_XBS5_ILP32_OFF32},
|
|
#endif
|
|
#ifdef _SC_XBS5_ILP32_OFFBIG
|
|
{"SC_XBS5_ILP32_OFFBIG", _SC_XBS5_ILP32_OFFBIG},
|
|
#endif
|
|
#ifdef _SC_XBS5_LP64_OFF64
|
|
{"SC_XBS5_LP64_OFF64", _SC_XBS5_LP64_OFF64},
|
|
#endif
|
|
#ifdef _SC_XBS5_LPBIG_OFFBIG
|
|
{"SC_XBS5_LPBIG_OFFBIG", _SC_XBS5_LPBIG_OFFBIG},
|
|
#endif
|
|
#ifdef _SC_XOPEN_CRYPT
|
|
{"SC_XOPEN_CRYPT", _SC_XOPEN_CRYPT},
|
|
#endif
|
|
#ifdef _SC_XOPEN_ENH_I18N
|
|
{"SC_XOPEN_ENH_I18N", _SC_XOPEN_ENH_I18N},
|
|
#endif
|
|
#ifdef _SC_XOPEN_LEGACY
|
|
{"SC_XOPEN_LEGACY", _SC_XOPEN_LEGACY},
|
|
#endif
|
|
#ifdef _SC_XOPEN_REALTIME
|
|
{"SC_XOPEN_REALTIME", _SC_XOPEN_REALTIME},
|
|
#endif
|
|
#ifdef _SC_XOPEN_REALTIME_THREADS
|
|
{"SC_XOPEN_REALTIME_THREADS", _SC_XOPEN_REALTIME_THREADS},
|
|
#endif
|
|
#ifdef _SC_XOPEN_SHM
|
|
{"SC_XOPEN_SHM", _SC_XOPEN_SHM},
|
|
#endif
|
|
#ifdef _SC_XOPEN_UNIX
|
|
{"SC_XOPEN_UNIX", _SC_XOPEN_UNIX},
|
|
#endif
|
|
#ifdef _SC_XOPEN_VERSION
|
|
{"SC_XOPEN_VERSION", _SC_XOPEN_VERSION},
|
|
#endif
|
|
#ifdef _SC_XOPEN_XCU_VERSION
|
|
{"SC_XOPEN_XCU_VERSION", _SC_XOPEN_XCU_VERSION},
|
|
#endif
|
|
#ifdef _SC_XOPEN_XPG2
|
|
{"SC_XOPEN_XPG2", _SC_XOPEN_XPG2},
|
|
#endif
|
|
#ifdef _SC_XOPEN_XPG3
|
|
{"SC_XOPEN_XPG3", _SC_XOPEN_XPG3},
|
|
#endif
|
|
#ifdef _SC_XOPEN_XPG4
|
|
{"SC_XOPEN_XPG4", _SC_XOPEN_XPG4},
|
|
#endif
|
|
};
|
|
|
|
static int
|
|
conv_sysconf_confname(PyObject *arg, int *valuep)
|
|
{
|
|
return conv_confname(arg, valuep, posix_constants_sysconf,
|
|
sizeof(posix_constants_sysconf)
|
|
/ sizeof(struct constdef));
|
|
}
|
|
|
|
PyDoc_STRVAR(posix_sysconf__doc__,
|
|
"sysconf(name) -> integer\n\n\
|
|
Return an integer-valued system configuration variable.");
|
|
|
|
static PyObject *
|
|
posix_sysconf(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *result = NULL;
|
|
int name;
|
|
|
|
if (PyArg_ParseTuple(args, "O&:sysconf", conv_sysconf_confname, &name)) {
|
|
int value;
|
|
|
|
errno = 0;
|
|
value = sysconf(name);
|
|
if (value == -1 && errno != 0)
|
|
posix_error();
|
|
else
|
|
result = PyInt_FromLong(value);
|
|
}
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
|
|
/* This code is used to ensure that the tables of configuration value names
|
|
* are in sorted order as required by conv_confname(), and also to build the
|
|
* the exported dictionaries that are used to publish information about the
|
|
* names available on the host platform.
|
|
*
|
|
* Sorting the table at runtime ensures that the table is properly ordered
|
|
* when used, even for platforms we're not able to test on. It also makes
|
|
* it easier to add additional entries to the tables.
|
|
*/
|
|
|
|
static int
|
|
cmp_constdefs(const void *v1, const void *v2)
|
|
{
|
|
const struct constdef *c1 =
|
|
(const struct constdef *) v1;
|
|
const struct constdef *c2 =
|
|
(const struct constdef *) v2;
|
|
|
|
return strcmp(c1->name, c2->name);
|
|
}
|
|
|
|
static int
|
|
setup_confname_table(struct constdef *table, size_t tablesize,
|
|
char *tablename, PyObject *module)
|
|
{
|
|
PyObject *d = NULL;
|
|
size_t i;
|
|
|
|
qsort(table, tablesize, sizeof(struct constdef), cmp_constdefs);
|
|
d = PyDict_New();
|
|
if (d == NULL)
|
|
return -1;
|
|
|
|
for (i=0; i < tablesize; ++i) {
|
|
PyObject *o = PyInt_FromLong(table[i].value);
|
|
if (o == NULL || PyDict_SetItemString(d, table[i].name, o) == -1) {
|
|
Py_XDECREF(o);
|
|
Py_DECREF(d);
|
|
return -1;
|
|
}
|
|
Py_DECREF(o);
|
|
}
|
|
return PyModule_AddObject(module, tablename, d);
|
|
}
|
|
|
|
/* Return -1 on failure, 0 on success. */
|
|
static int
|
|
setup_confname_tables(PyObject *module)
|
|
{
|
|
#if defined(HAVE_FPATHCONF) || defined(HAVE_PATHCONF)
|
|
if (setup_confname_table(posix_constants_pathconf,
|
|
sizeof(posix_constants_pathconf)
|
|
/ sizeof(struct constdef),
|
|
"pathconf_names", module))
|
|
return -1;
|
|
#endif
|
|
#ifdef HAVE_CONFSTR
|
|
if (setup_confname_table(posix_constants_confstr,
|
|
sizeof(posix_constants_confstr)
|
|
/ sizeof(struct constdef),
|
|
"confstr_names", module))
|
|
return -1;
|
|
#endif
|
|
#ifdef HAVE_SYSCONF
|
|
if (setup_confname_table(posix_constants_sysconf,
|
|
sizeof(posix_constants_sysconf)
|
|
/ sizeof(struct constdef),
|
|
"sysconf_names", module))
|
|
return -1;
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(posix_abort__doc__,
|
|
"abort() -> does not return!\n\n\
|
|
Abort the interpreter immediately. This 'dumps core' or otherwise fails\n\
|
|
in the hardest way possible on the hosting operating system.");
|
|
|
|
static PyObject *
|
|
posix_abort(PyObject *self, PyObject *noargs)
|
|
{
|
|
abort();
|
|
/*NOTREACHED*/
|
|
Py_FatalError("abort() called from Python code didn't abort!");
|
|
return NULL;
|
|
}
|
|
|
|
#ifdef MS_WINDOWS
|
|
PyDoc_STRVAR(win32_startfile__doc__,
|
|
"startfile(filepath [, operation]) - Start a file with its associated\n\
|
|
application.\n\
|
|
\n\
|
|
When \"operation\" is not specified or \"open\", this acts like\n\
|
|
double-clicking the file in Explorer, or giving the file name as an\n\
|
|
argument to the DOS \"start\" command: the file is opened with whatever\n\
|
|
application (if any) its extension is associated.\n\
|
|
When another \"operation\" is given, it specifies what should be done with\n\
|
|
the file. A typical operation is \"print\".\n\
|
|
\n\
|
|
startfile returns as soon as the associated application is launched.\n\
|
|
There is no option to wait for the application to close, and no way\n\
|
|
to retrieve the application's exit status.\n\
|
|
\n\
|
|
The filepath is relative to the current directory. If you want to use\n\
|
|
an absolute path, make sure the first character is not a slash (\"/\");\n\
|
|
the underlying Win32 ShellExecute function doesn't work if it is.");
|
|
|
|
static PyObject *
|
|
win32_startfile(PyObject *self, PyObject *args)
|
|
{
|
|
char *filepath;
|
|
char *operation = NULL;
|
|
HINSTANCE rc;
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
|
if (unicode_file_names()) {
|
|
PyObject *unipath, *woperation = NULL;
|
|
if (!PyArg_ParseTuple(args, "U|s:startfile",
|
|
&unipath, &operation)) {
|
|
PyErr_Clear();
|
|
goto normal;
|
|
}
|
|
|
|
|
|
if (operation) {
|
|
woperation = PyUnicode_DecodeASCII(operation,
|
|
strlen(operation), NULL);
|
|
if (!woperation) {
|
|
PyErr_Clear();
|
|
operation = NULL;
|
|
goto normal;
|
|
}
|
|
}
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
rc = ShellExecuteW((HWND)0, woperation ? PyUnicode_AS_UNICODE(woperation) : 0,
|
|
PyUnicode_AS_UNICODE(unipath),
|
|
NULL, NULL, SW_SHOWNORMAL);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
Py_XDECREF(woperation);
|
|
if (rc <= (HINSTANCE)32) {
|
|
PyObject *errval = win32_error_unicode("startfile",
|
|
PyUnicode_AS_UNICODE(unipath));
|
|
return errval;
|
|
}
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif
|
|
|
|
normal:
|
|
if (!PyArg_ParseTuple(args, "et|s:startfile",
|
|
Py_FileSystemDefaultEncoding, &filepath,
|
|
&operation))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
rc = ShellExecute((HWND)0, operation, filepath,
|
|
NULL, NULL, SW_SHOWNORMAL);
|
|
Py_END_ALLOW_THREADS
|
|
if (rc <= (HINSTANCE)32) {
|
|
PyObject *errval = win32_error("startfile", filepath);
|
|
PyMem_Free(filepath);
|
|
return errval;
|
|
}
|
|
PyMem_Free(filepath);
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_GETLOADAVG
|
|
PyDoc_STRVAR(posix_getloadavg__doc__,
|
|
"getloadavg() -> (float, float, float)\n\n\
|
|
Return the number of processes in the system run queue averaged over\n\
|
|
the last 1, 5, and 15 minutes or raises OSError if the load average\n\
|
|
was unobtainable");
|
|
|
|
static PyObject *
|
|
posix_getloadavg(PyObject *self, PyObject *noargs)
|
|
{
|
|
double loadavg[3];
|
|
if (getloadavg(loadavg, 3)!=3) {
|
|
PyErr_SetString(PyExc_OSError, "Load averages are unobtainable");
|
|
return NULL;
|
|
} else
|
|
return Py_BuildValue("ddd", loadavg[0], loadavg[1], loadavg[2]);
|
|
}
|
|
#endif
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
PyDoc_STRVAR(win32_urandom__doc__,
|
|
"urandom(n) -> str\n\n\
|
|
Return a string of n random bytes suitable for cryptographic use.");
|
|
|
|
typedef BOOL (WINAPI *CRYPTACQUIRECONTEXTA)(HCRYPTPROV *phProv,\
|
|
LPCSTR pszContainer, LPCSTR pszProvider, DWORD dwProvType,\
|
|
DWORD dwFlags );
|
|
typedef BOOL (WINAPI *CRYPTGENRANDOM)(HCRYPTPROV hProv, DWORD dwLen,\
|
|
BYTE *pbBuffer );
|
|
|
|
static CRYPTGENRANDOM pCryptGenRandom = NULL;
|
|
static HCRYPTPROV hCryptProv = 0;
|
|
|
|
static PyObject*
|
|
win32_urandom(PyObject *self, PyObject *args)
|
|
{
|
|
int howMany;
|
|
PyObject* result;
|
|
|
|
/* Read arguments */
|
|
if (! PyArg_ParseTuple(args, "i:urandom", &howMany))
|
|
return NULL;
|
|
if (howMany < 0)
|
|
return PyErr_Format(PyExc_ValueError,
|
|
"negative argument not allowed");
|
|
|
|
if (hCryptProv == 0) {
|
|
HINSTANCE hAdvAPI32 = NULL;
|
|
CRYPTACQUIRECONTEXTA pCryptAcquireContext = NULL;
|
|
|
|
/* Obtain handle to the DLL containing CryptoAPI
|
|
This should not fail */
|
|
hAdvAPI32 = GetModuleHandle("advapi32.dll");
|
|
if(hAdvAPI32 == NULL)
|
|
return win32_error("GetModuleHandle", NULL);
|
|
|
|
/* Obtain pointers to the CryptoAPI functions
|
|
This will fail on some early versions of Win95 */
|
|
pCryptAcquireContext = (CRYPTACQUIRECONTEXTA)GetProcAddress(
|
|
hAdvAPI32,
|
|
"CryptAcquireContextA");
|
|
if (pCryptAcquireContext == NULL)
|
|
return PyErr_Format(PyExc_NotImplementedError,
|
|
"CryptAcquireContextA not found");
|
|
|
|
pCryptGenRandom = (CRYPTGENRANDOM)GetProcAddress(
|
|
hAdvAPI32, "CryptGenRandom");
|
|
if (pCryptAcquireContext == NULL)
|
|
return PyErr_Format(PyExc_NotImplementedError,
|
|
"CryptGenRandom not found");
|
|
|
|
/* Acquire context */
|
|
if (! pCryptAcquireContext(&hCryptProv, NULL, NULL,
|
|
PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
|
|
return win32_error("CryptAcquireContext", NULL);
|
|
}
|
|
|
|
/* Allocate bytes */
|
|
result = PyString_FromStringAndSize(NULL, howMany);
|
|
if (result != NULL) {
|
|
/* Get random data */
|
|
if (! pCryptGenRandom(hCryptProv, howMany, (unsigned char*)
|
|
PyString_AS_STRING(result))) {
|
|
Py_DECREF(result);
|
|
return win32_error("CryptGenRandom", NULL);
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
#ifdef __VMS
|
|
/* Use openssl random routine */
|
|
#include <openssl/rand.h>
|
|
PyDoc_STRVAR(vms_urandom__doc__,
|
|
"urandom(n) -> str\n\n\
|
|
Return a string of n random bytes suitable for cryptographic use.");
|
|
|
|
static PyObject*
|
|
vms_urandom(PyObject *self, PyObject *args)
|
|
{
|
|
int howMany;
|
|
PyObject* result;
|
|
|
|
/* Read arguments */
|
|
if (! PyArg_ParseTuple(args, "i:urandom", &howMany))
|
|
return NULL;
|
|
if (howMany < 0)
|
|
return PyErr_Format(PyExc_ValueError,
|
|
"negative argument not allowed");
|
|
|
|
/* Allocate bytes */
|
|
result = PyString_FromStringAndSize(NULL, howMany);
|
|
if (result != NULL) {
|
|
/* Get random data */
|
|
if (RAND_pseudo_bytes((unsigned char*)
|
|
PyString_AS_STRING(result),
|
|
howMany) < 0) {
|
|
Py_DECREF(result);
|
|
return PyErr_Format(PyExc_ValueError,
|
|
"RAND_pseudo_bytes");
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
static PyMethodDef posix_methods[] = {
|
|
{"access", posix_access, METH_VARARGS, posix_access__doc__},
|
|
#ifdef HAVE_TTYNAME
|
|
{"ttyname", posix_ttyname, METH_VARARGS, posix_ttyname__doc__},
|
|
#endif
|
|
{"chdir", posix_chdir, METH_VARARGS, posix_chdir__doc__},
|
|
{"chmod", posix_chmod, METH_VARARGS, posix_chmod__doc__},
|
|
#ifdef HAVE_CHOWN
|
|
{"chown", posix_chown, METH_VARARGS, posix_chown__doc__},
|
|
#endif /* HAVE_CHOWN */
|
|
#ifdef HAVE_LCHOWN
|
|
{"lchown", posix_lchown, METH_VARARGS, posix_lchown__doc__},
|
|
#endif /* HAVE_LCHOWN */
|
|
#ifdef HAVE_CHROOT
|
|
{"chroot", posix_chroot, METH_VARARGS, posix_chroot__doc__},
|
|
#endif
|
|
#ifdef HAVE_CTERMID
|
|
{"ctermid", posix_ctermid, METH_NOARGS, posix_ctermid__doc__},
|
|
#endif
|
|
#ifdef HAVE_GETCWD
|
|
{"getcwd", posix_getcwd, METH_NOARGS, posix_getcwd__doc__},
|
|
#ifdef Py_USING_UNICODE
|
|
{"getcwdu", posix_getcwdu, METH_NOARGS, posix_getcwdu__doc__},
|
|
#endif
|
|
#endif
|
|
#ifdef HAVE_LINK
|
|
{"link", posix_link, METH_VARARGS, posix_link__doc__},
|
|
#endif /* HAVE_LINK */
|
|
{"listdir", posix_listdir, METH_VARARGS, posix_listdir__doc__},
|
|
{"lstat", posix_lstat, METH_VARARGS, posix_lstat__doc__},
|
|
{"mkdir", posix_mkdir, METH_VARARGS, posix_mkdir__doc__},
|
|
#ifdef HAVE_NICE
|
|
{"nice", posix_nice, METH_VARARGS, posix_nice__doc__},
|
|
#endif /* HAVE_NICE */
|
|
#ifdef HAVE_READLINK
|
|
{"readlink", posix_readlink, METH_VARARGS, posix_readlink__doc__},
|
|
#endif /* HAVE_READLINK */
|
|
{"rename", posix_rename, METH_VARARGS, posix_rename__doc__},
|
|
{"rmdir", posix_rmdir, METH_VARARGS, posix_rmdir__doc__},
|
|
{"stat", posix_stat, METH_VARARGS, posix_stat__doc__},
|
|
{"stat_float_times", stat_float_times, METH_VARARGS, stat_float_times__doc__},
|
|
#ifdef HAVE_SYMLINK
|
|
{"symlink", posix_symlink, METH_VARARGS, posix_symlink__doc__},
|
|
#endif /* HAVE_SYMLINK */
|
|
#ifdef HAVE_SYSTEM
|
|
{"system", posix_system, METH_VARARGS, posix_system__doc__},
|
|
#endif
|
|
{"umask", posix_umask, METH_VARARGS, posix_umask__doc__},
|
|
#ifdef HAVE_UNAME
|
|
{"uname", posix_uname, METH_NOARGS, posix_uname__doc__},
|
|
#endif /* HAVE_UNAME */
|
|
{"unlink", posix_unlink, METH_VARARGS, posix_unlink__doc__},
|
|
{"remove", posix_unlink, METH_VARARGS, posix_remove__doc__},
|
|
{"utime", posix_utime, METH_VARARGS, posix_utime__doc__},
|
|
#ifdef HAVE_TIMES
|
|
{"times", posix_times, METH_NOARGS, posix_times__doc__},
|
|
#endif /* HAVE_TIMES */
|
|
{"_exit", posix__exit, METH_VARARGS, posix__exit__doc__},
|
|
#ifdef HAVE_EXECV
|
|
{"execv", posix_execv, METH_VARARGS, posix_execv__doc__},
|
|
{"execve", posix_execve, METH_VARARGS, posix_execve__doc__},
|
|
#endif /* HAVE_EXECV */
|
|
#ifdef HAVE_SPAWNV
|
|
{"spawnv", posix_spawnv, METH_VARARGS, posix_spawnv__doc__},
|
|
{"spawnve", posix_spawnve, METH_VARARGS, posix_spawnve__doc__},
|
|
#if defined(PYOS_OS2)
|
|
{"spawnvp", posix_spawnvp, METH_VARARGS, posix_spawnvp__doc__},
|
|
{"spawnvpe", posix_spawnvpe, METH_VARARGS, posix_spawnvpe__doc__},
|
|
#endif /* PYOS_OS2 */
|
|
#endif /* HAVE_SPAWNV */
|
|
#ifdef HAVE_FORK1
|
|
{"fork1", posix_fork1, METH_NOARGS, posix_fork1__doc__},
|
|
#endif /* HAVE_FORK1 */
|
|
#ifdef HAVE_FORK
|
|
{"fork", posix_fork, METH_NOARGS, posix_fork__doc__},
|
|
#endif /* HAVE_FORK */
|
|
#if defined(HAVE_OPENPTY) || defined(HAVE__GETPTY) || defined(HAVE_DEV_PTMX)
|
|
{"openpty", posix_openpty, METH_NOARGS, posix_openpty__doc__},
|
|
#endif /* HAVE_OPENPTY || HAVE__GETPTY || HAVE_DEV_PTMX */
|
|
#ifdef HAVE_FORKPTY
|
|
{"forkpty", posix_forkpty, METH_NOARGS, posix_forkpty__doc__},
|
|
#endif /* HAVE_FORKPTY */
|
|
#ifdef HAVE_GETEGID
|
|
{"getegid", posix_getegid, METH_NOARGS, posix_getegid__doc__},
|
|
#endif /* HAVE_GETEGID */
|
|
#ifdef HAVE_GETEUID
|
|
{"geteuid", posix_geteuid, METH_NOARGS, posix_geteuid__doc__},
|
|
#endif /* HAVE_GETEUID */
|
|
#ifdef HAVE_GETGID
|
|
{"getgid", posix_getgid, METH_NOARGS, posix_getgid__doc__},
|
|
#endif /* HAVE_GETGID */
|
|
#ifdef HAVE_GETGROUPS
|
|
{"getgroups", posix_getgroups, METH_NOARGS, posix_getgroups__doc__},
|
|
#endif
|
|
{"getpid", posix_getpid, METH_NOARGS, posix_getpid__doc__},
|
|
#ifdef HAVE_GETPGRP
|
|
{"getpgrp", posix_getpgrp, METH_NOARGS, posix_getpgrp__doc__},
|
|
#endif /* HAVE_GETPGRP */
|
|
#ifdef HAVE_GETPPID
|
|
{"getppid", posix_getppid, METH_NOARGS, posix_getppid__doc__},
|
|
#endif /* HAVE_GETPPID */
|
|
#ifdef HAVE_GETUID
|
|
{"getuid", posix_getuid, METH_NOARGS, posix_getuid__doc__},
|
|
#endif /* HAVE_GETUID */
|
|
#ifdef HAVE_GETLOGIN
|
|
{"getlogin", posix_getlogin, METH_NOARGS, posix_getlogin__doc__},
|
|
#endif
|
|
#ifdef HAVE_KILL
|
|
{"kill", posix_kill, METH_VARARGS, posix_kill__doc__},
|
|
#endif /* HAVE_KILL */
|
|
#ifdef HAVE_KILLPG
|
|
{"killpg", posix_killpg, METH_VARARGS, posix_killpg__doc__},
|
|
#endif /* HAVE_KILLPG */
|
|
#ifdef HAVE_PLOCK
|
|
{"plock", posix_plock, METH_VARARGS, posix_plock__doc__},
|
|
#endif /* HAVE_PLOCK */
|
|
#ifdef HAVE_POPEN
|
|
{"popen", posix_popen, METH_VARARGS, posix_popen__doc__},
|
|
#ifdef MS_WINDOWS
|
|
{"popen2", win32_popen2, METH_VARARGS},
|
|
{"popen3", win32_popen3, METH_VARARGS},
|
|
{"popen4", win32_popen4, METH_VARARGS},
|
|
{"startfile", win32_startfile, METH_VARARGS, win32_startfile__doc__},
|
|
#else
|
|
#if defined(PYOS_OS2) && defined(PYCC_GCC)
|
|
{"popen2", os2emx_popen2, METH_VARARGS},
|
|
{"popen3", os2emx_popen3, METH_VARARGS},
|
|
{"popen4", os2emx_popen4, METH_VARARGS},
|
|
#endif
|
|
#endif
|
|
#endif /* HAVE_POPEN */
|
|
#ifdef HAVE_SETUID
|
|
{"setuid", posix_setuid, METH_VARARGS, posix_setuid__doc__},
|
|
#endif /* HAVE_SETUID */
|
|
#ifdef HAVE_SETEUID
|
|
{"seteuid", posix_seteuid, METH_VARARGS, posix_seteuid__doc__},
|
|
#endif /* HAVE_SETEUID */
|
|
#ifdef HAVE_SETEGID
|
|
{"setegid", posix_setegid, METH_VARARGS, posix_setegid__doc__},
|
|
#endif /* HAVE_SETEGID */
|
|
#ifdef HAVE_SETREUID
|
|
{"setreuid", posix_setreuid, METH_VARARGS, posix_setreuid__doc__},
|
|
#endif /* HAVE_SETREUID */
|
|
#ifdef HAVE_SETREGID
|
|
{"setregid", posix_setregid, METH_VARARGS, posix_setregid__doc__},
|
|
#endif /* HAVE_SETREGID */
|
|
#ifdef HAVE_SETGID
|
|
{"setgid", posix_setgid, METH_VARARGS, posix_setgid__doc__},
|
|
#endif /* HAVE_SETGID */
|
|
#ifdef HAVE_SETGROUPS
|
|
{"setgroups", posix_setgroups, METH_O, posix_setgroups__doc__},
|
|
#endif /* HAVE_SETGROUPS */
|
|
#ifdef HAVE_GETPGID
|
|
{"getpgid", posix_getpgid, METH_VARARGS, posix_getpgid__doc__},
|
|
#endif /* HAVE_GETPGID */
|
|
#ifdef HAVE_SETPGRP
|
|
{"setpgrp", posix_setpgrp, METH_NOARGS, posix_setpgrp__doc__},
|
|
#endif /* HAVE_SETPGRP */
|
|
#ifdef HAVE_WAIT
|
|
{"wait", posix_wait, METH_NOARGS, posix_wait__doc__},
|
|
#endif /* HAVE_WAIT */
|
|
#ifdef HAVE_WAIT3
|
|
{"wait3", posix_wait3, METH_VARARGS, posix_wait3__doc__},
|
|
#endif /* HAVE_WAIT3 */
|
|
#ifdef HAVE_WAIT4
|
|
{"wait4", posix_wait4, METH_VARARGS, posix_wait4__doc__},
|
|
#endif /* HAVE_WAIT4 */
|
|
#if defined(HAVE_WAITPID) || defined(HAVE_CWAIT)
|
|
{"waitpid", posix_waitpid, METH_VARARGS, posix_waitpid__doc__},
|
|
#endif /* HAVE_WAITPID */
|
|
#ifdef HAVE_GETSID
|
|
{"getsid", posix_getsid, METH_VARARGS, posix_getsid__doc__},
|
|
#endif /* HAVE_GETSID */
|
|
#ifdef HAVE_SETSID
|
|
{"setsid", posix_setsid, METH_NOARGS, posix_setsid__doc__},
|
|
#endif /* HAVE_SETSID */
|
|
#ifdef HAVE_SETPGID
|
|
{"setpgid", posix_setpgid, METH_VARARGS, posix_setpgid__doc__},
|
|
#endif /* HAVE_SETPGID */
|
|
#ifdef HAVE_TCGETPGRP
|
|
{"tcgetpgrp", posix_tcgetpgrp, METH_VARARGS, posix_tcgetpgrp__doc__},
|
|
#endif /* HAVE_TCGETPGRP */
|
|
#ifdef HAVE_TCSETPGRP
|
|
{"tcsetpgrp", posix_tcsetpgrp, METH_VARARGS, posix_tcsetpgrp__doc__},
|
|
#endif /* HAVE_TCSETPGRP */
|
|
{"open", posix_open, METH_VARARGS, posix_open__doc__},
|
|
{"close", posix_close, METH_VARARGS, posix_close__doc__},
|
|
{"dup", posix_dup, METH_VARARGS, posix_dup__doc__},
|
|
{"dup2", posix_dup2, METH_VARARGS, posix_dup2__doc__},
|
|
{"lseek", posix_lseek, METH_VARARGS, posix_lseek__doc__},
|
|
{"read", posix_read, METH_VARARGS, posix_read__doc__},
|
|
{"write", posix_write, METH_VARARGS, posix_write__doc__},
|
|
{"fstat", posix_fstat, METH_VARARGS, posix_fstat__doc__},
|
|
{"fdopen", posix_fdopen, METH_VARARGS, posix_fdopen__doc__},
|
|
{"isatty", posix_isatty, METH_VARARGS, posix_isatty__doc__},
|
|
#ifdef HAVE_PIPE
|
|
{"pipe", posix_pipe, METH_NOARGS, posix_pipe__doc__},
|
|
#endif
|
|
#ifdef HAVE_MKFIFO
|
|
{"mkfifo", posix_mkfifo, METH_VARARGS, posix_mkfifo__doc__},
|
|
#endif
|
|
#if defined(HAVE_MKNOD) && defined(HAVE_MAKEDEV)
|
|
{"mknod", posix_mknod, METH_VARARGS, posix_mknod__doc__},
|
|
#endif
|
|
#ifdef HAVE_DEVICE_MACROS
|
|
{"major", posix_major, METH_VARARGS, posix_major__doc__},
|
|
{"minor", posix_minor, METH_VARARGS, posix_minor__doc__},
|
|
{"makedev", posix_makedev, METH_VARARGS, posix_makedev__doc__},
|
|
#endif
|
|
#ifdef HAVE_FTRUNCATE
|
|
{"ftruncate", posix_ftruncate, METH_VARARGS, posix_ftruncate__doc__},
|
|
#endif
|
|
#ifdef HAVE_PUTENV
|
|
{"putenv", posix_putenv, METH_VARARGS, posix_putenv__doc__},
|
|
#endif
|
|
#ifdef HAVE_UNSETENV
|
|
{"unsetenv", posix_unsetenv, METH_VARARGS, posix_unsetenv__doc__},
|
|
#endif
|
|
#ifdef HAVE_STRERROR
|
|
{"strerror", posix_strerror, METH_VARARGS, posix_strerror__doc__},
|
|
#endif
|
|
#ifdef HAVE_FCHDIR
|
|
{"fchdir", posix_fchdir, METH_O, posix_fchdir__doc__},
|
|
#endif
|
|
#ifdef HAVE_FSYNC
|
|
{"fsync", posix_fsync, METH_O, posix_fsync__doc__},
|
|
#endif
|
|
#ifdef HAVE_FDATASYNC
|
|
{"fdatasync", posix_fdatasync, METH_O, posix_fdatasync__doc__},
|
|
#endif
|
|
#ifdef HAVE_SYS_WAIT_H
|
|
#ifdef WCOREDUMP
|
|
{"WCOREDUMP", posix_WCOREDUMP, METH_VARARGS, posix_WCOREDUMP__doc__},
|
|
#endif /* WCOREDUMP */
|
|
#ifdef WIFCONTINUED
|
|
{"WIFCONTINUED",posix_WIFCONTINUED, METH_VARARGS, posix_WIFCONTINUED__doc__},
|
|
#endif /* WIFCONTINUED */
|
|
#ifdef WIFSTOPPED
|
|
{"WIFSTOPPED", posix_WIFSTOPPED, METH_VARARGS, posix_WIFSTOPPED__doc__},
|
|
#endif /* WIFSTOPPED */
|
|
#ifdef WIFSIGNALED
|
|
{"WIFSIGNALED", posix_WIFSIGNALED, METH_VARARGS, posix_WIFSIGNALED__doc__},
|
|
#endif /* WIFSIGNALED */
|
|
#ifdef WIFEXITED
|
|
{"WIFEXITED", posix_WIFEXITED, METH_VARARGS, posix_WIFEXITED__doc__},
|
|
#endif /* WIFEXITED */
|
|
#ifdef WEXITSTATUS
|
|
{"WEXITSTATUS", posix_WEXITSTATUS, METH_VARARGS, posix_WEXITSTATUS__doc__},
|
|
#endif /* WEXITSTATUS */
|
|
#ifdef WTERMSIG
|
|
{"WTERMSIG", posix_WTERMSIG, METH_VARARGS, posix_WTERMSIG__doc__},
|
|
#endif /* WTERMSIG */
|
|
#ifdef WSTOPSIG
|
|
{"WSTOPSIG", posix_WSTOPSIG, METH_VARARGS, posix_WSTOPSIG__doc__},
|
|
#endif /* WSTOPSIG */
|
|
#endif /* HAVE_SYS_WAIT_H */
|
|
#if defined(HAVE_FSTATVFS) && defined(HAVE_SYS_STATVFS_H)
|
|
{"fstatvfs", posix_fstatvfs, METH_VARARGS, posix_fstatvfs__doc__},
|
|
#endif
|
|
#if defined(HAVE_STATVFS) && defined(HAVE_SYS_STATVFS_H)
|
|
{"statvfs", posix_statvfs, METH_VARARGS, posix_statvfs__doc__},
|
|
#endif
|
|
#ifdef HAVE_TMPFILE
|
|
{"tmpfile", posix_tmpfile, METH_NOARGS, posix_tmpfile__doc__},
|
|
#endif
|
|
#ifdef HAVE_TEMPNAM
|
|
{"tempnam", posix_tempnam, METH_VARARGS, posix_tempnam__doc__},
|
|
#endif
|
|
#ifdef HAVE_TMPNAM
|
|
{"tmpnam", posix_tmpnam, METH_NOARGS, posix_tmpnam__doc__},
|
|
#endif
|
|
#ifdef HAVE_CONFSTR
|
|
{"confstr", posix_confstr, METH_VARARGS, posix_confstr__doc__},
|
|
#endif
|
|
#ifdef HAVE_SYSCONF
|
|
{"sysconf", posix_sysconf, METH_VARARGS, posix_sysconf__doc__},
|
|
#endif
|
|
#ifdef HAVE_FPATHCONF
|
|
{"fpathconf", posix_fpathconf, METH_VARARGS, posix_fpathconf__doc__},
|
|
#endif
|
|
#ifdef HAVE_PATHCONF
|
|
{"pathconf", posix_pathconf, METH_VARARGS, posix_pathconf__doc__},
|
|
#endif
|
|
{"abort", posix_abort, METH_NOARGS, posix_abort__doc__},
|
|
#ifdef MS_WINDOWS
|
|
{"_getfullpathname", posix__getfullpathname, METH_VARARGS, NULL},
|
|
#endif
|
|
#ifdef HAVE_GETLOADAVG
|
|
{"getloadavg", posix_getloadavg, METH_NOARGS, posix_getloadavg__doc__},
|
|
#endif
|
|
#ifdef MS_WINDOWS
|
|
{"urandom", win32_urandom, METH_VARARGS, win32_urandom__doc__},
|
|
#endif
|
|
#ifdef __VMS
|
|
{"urandom", vms_urandom, METH_VARARGS, vms_urandom__doc__},
|
|
#endif
|
|
{NULL, NULL} /* Sentinel */
|
|
};
|
|
|
|
|
|
static int
|
|
ins(PyObject *module, char *symbol, long value)
|
|
{
|
|
return PyModule_AddIntConstant(module, symbol, value);
|
|
}
|
|
|
|
#if defined(PYOS_OS2)
|
|
/* Insert Platform-Specific Constant Values (Strings & Numbers) of Common Use */
|
|
static int insertvalues(PyObject *module)
|
|
{
|
|
APIRET rc;
|
|
ULONG values[QSV_MAX+1];
|
|
PyObject *v;
|
|
char *ver, tmp[50];
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
rc = DosQuerySysInfo(1L, QSV_MAX, &values[1], sizeof(ULONG) * QSV_MAX);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (rc != NO_ERROR) {
|
|
os2_error(rc);
|
|
return -1;
|
|
}
|
|
|
|
if (ins(module, "meminstalled", values[QSV_TOTPHYSMEM])) return -1;
|
|
if (ins(module, "memkernel", values[QSV_TOTRESMEM])) return -1;
|
|
if (ins(module, "memvirtual", values[QSV_TOTAVAILMEM])) return -1;
|
|
if (ins(module, "maxpathlen", values[QSV_MAX_PATH_LENGTH])) return -1;
|
|
if (ins(module, "maxnamelen", values[QSV_MAX_COMP_LENGTH])) return -1;
|
|
if (ins(module, "revision", values[QSV_VERSION_REVISION])) return -1;
|
|
if (ins(module, "timeslice", values[QSV_MIN_SLICE])) return -1;
|
|
|
|
switch (values[QSV_VERSION_MINOR]) {
|
|
case 0: ver = "2.00"; break;
|
|
case 10: ver = "2.10"; break;
|
|
case 11: ver = "2.11"; break;
|
|
case 30: ver = "3.00"; break;
|
|
case 40: ver = "4.00"; break;
|
|
case 50: ver = "5.00"; break;
|
|
default:
|
|
PyOS_snprintf(tmp, sizeof(tmp),
|
|
"%d-%d", values[QSV_VERSION_MAJOR],
|
|
values[QSV_VERSION_MINOR]);
|
|
ver = &tmp[0];
|
|
}
|
|
|
|
/* Add Indicator of the Version of the Operating System */
|
|
if (PyModule_AddStringConstant(module, "version", tmp) < 0)
|
|
return -1;
|
|
|
|
/* Add Indicator of Which Drive was Used to Boot the System */
|
|
tmp[0] = 'A' + values[QSV_BOOT_DRIVE] - 1;
|
|
tmp[1] = ':';
|
|
tmp[2] = '\0';
|
|
|
|
return PyModule_AddStringConstant(module, "bootdrive", tmp);
|
|
}
|
|
#endif
|
|
|
|
static int
|
|
all_ins(PyObject *d)
|
|
{
|
|
#ifdef F_OK
|
|
if (ins(d, "F_OK", (long)F_OK)) return -1;
|
|
#endif
|
|
#ifdef R_OK
|
|
if (ins(d, "R_OK", (long)R_OK)) return -1;
|
|
#endif
|
|
#ifdef W_OK
|
|
if (ins(d, "W_OK", (long)W_OK)) return -1;
|
|
#endif
|
|
#ifdef X_OK
|
|
if (ins(d, "X_OK", (long)X_OK)) return -1;
|
|
#endif
|
|
#ifdef NGROUPS_MAX
|
|
if (ins(d, "NGROUPS_MAX", (long)NGROUPS_MAX)) return -1;
|
|
#endif
|
|
#ifdef TMP_MAX
|
|
if (ins(d, "TMP_MAX", (long)TMP_MAX)) return -1;
|
|
#endif
|
|
#ifdef WCONTINUED
|
|
if (ins(d, "WCONTINUED", (long)WCONTINUED)) return -1;
|
|
#endif
|
|
#ifdef WNOHANG
|
|
if (ins(d, "WNOHANG", (long)WNOHANG)) return -1;
|
|
#endif
|
|
#ifdef WUNTRACED
|
|
if (ins(d, "WUNTRACED", (long)WUNTRACED)) return -1;
|
|
#endif
|
|
#ifdef O_RDONLY
|
|
if (ins(d, "O_RDONLY", (long)O_RDONLY)) return -1;
|
|
#endif
|
|
#ifdef O_WRONLY
|
|
if (ins(d, "O_WRONLY", (long)O_WRONLY)) return -1;
|
|
#endif
|
|
#ifdef O_RDWR
|
|
if (ins(d, "O_RDWR", (long)O_RDWR)) return -1;
|
|
#endif
|
|
#ifdef O_NDELAY
|
|
if (ins(d, "O_NDELAY", (long)O_NDELAY)) return -1;
|
|
#endif
|
|
#ifdef O_NONBLOCK
|
|
if (ins(d, "O_NONBLOCK", (long)O_NONBLOCK)) return -1;
|
|
#endif
|
|
#ifdef O_APPEND
|
|
if (ins(d, "O_APPEND", (long)O_APPEND)) return -1;
|
|
#endif
|
|
#ifdef O_DSYNC
|
|
if (ins(d, "O_DSYNC", (long)O_DSYNC)) return -1;
|
|
#endif
|
|
#ifdef O_RSYNC
|
|
if (ins(d, "O_RSYNC", (long)O_RSYNC)) return -1;
|
|
#endif
|
|
#ifdef O_SYNC
|
|
if (ins(d, "O_SYNC", (long)O_SYNC)) return -1;
|
|
#endif
|
|
#ifdef O_NOCTTY
|
|
if (ins(d, "O_NOCTTY", (long)O_NOCTTY)) return -1;
|
|
#endif
|
|
#ifdef O_CREAT
|
|
if (ins(d, "O_CREAT", (long)O_CREAT)) return -1;
|
|
#endif
|
|
#ifdef O_EXCL
|
|
if (ins(d, "O_EXCL", (long)O_EXCL)) return -1;
|
|
#endif
|
|
#ifdef O_TRUNC
|
|
if (ins(d, "O_TRUNC", (long)O_TRUNC)) return -1;
|
|
#endif
|
|
#ifdef O_BINARY
|
|
if (ins(d, "O_BINARY", (long)O_BINARY)) return -1;
|
|
#endif
|
|
#ifdef O_TEXT
|
|
if (ins(d, "O_TEXT", (long)O_TEXT)) return -1;
|
|
#endif
|
|
#ifdef O_LARGEFILE
|
|
if (ins(d, "O_LARGEFILE", (long)O_LARGEFILE)) return -1;
|
|
#endif
|
|
#ifdef O_SHLOCK
|
|
if (ins(d, "O_SHLOCK", (long)O_SHLOCK)) return -1;
|
|
#endif
|
|
#ifdef O_EXLOCK
|
|
if (ins(d, "O_EXLOCK", (long)O_EXLOCK)) return -1;
|
|
#endif
|
|
|
|
/* MS Windows */
|
|
#ifdef O_NOINHERIT
|
|
/* Don't inherit in child processes. */
|
|
if (ins(d, "O_NOINHERIT", (long)O_NOINHERIT)) return -1;
|
|
#endif
|
|
#ifdef _O_SHORT_LIVED
|
|
/* Optimize for short life (keep in memory). */
|
|
/* MS forgot to define this one with a non-underscore form too. */
|
|
if (ins(d, "O_SHORT_LIVED", (long)_O_SHORT_LIVED)) return -1;
|
|
#endif
|
|
#ifdef O_TEMPORARY
|
|
/* Automatically delete when last handle is closed. */
|
|
if (ins(d, "O_TEMPORARY", (long)O_TEMPORARY)) return -1;
|
|
#endif
|
|
#ifdef O_RANDOM
|
|
/* Optimize for random access. */
|
|
if (ins(d, "O_RANDOM", (long)O_RANDOM)) return -1;
|
|
#endif
|
|
#ifdef O_SEQUENTIAL
|
|
/* Optimize for sequential access. */
|
|
if (ins(d, "O_SEQUENTIAL", (long)O_SEQUENTIAL)) return -1;
|
|
#endif
|
|
|
|
/* GNU extensions. */
|
|
#ifdef O_DIRECT
|
|
/* Direct disk access. */
|
|
if (ins(d, "O_DIRECT", (long)O_DIRECT)) return -1;
|
|
#endif
|
|
#ifdef O_DIRECTORY
|
|
/* Must be a directory. */
|
|
if (ins(d, "O_DIRECTORY", (long)O_DIRECTORY)) return -1;
|
|
#endif
|
|
#ifdef O_NOFOLLOW
|
|
/* Do not follow links. */
|
|
if (ins(d, "O_NOFOLLOW", (long)O_NOFOLLOW)) return -1;
|
|
#endif
|
|
|
|
/* These come from sysexits.h */
|
|
#ifdef EX_OK
|
|
if (ins(d, "EX_OK", (long)EX_OK)) return -1;
|
|
#endif /* EX_OK */
|
|
#ifdef EX_USAGE
|
|
if (ins(d, "EX_USAGE", (long)EX_USAGE)) return -1;
|
|
#endif /* EX_USAGE */
|
|
#ifdef EX_DATAERR
|
|
if (ins(d, "EX_DATAERR", (long)EX_DATAERR)) return -1;
|
|
#endif /* EX_DATAERR */
|
|
#ifdef EX_NOINPUT
|
|
if (ins(d, "EX_NOINPUT", (long)EX_NOINPUT)) return -1;
|
|
#endif /* EX_NOINPUT */
|
|
#ifdef EX_NOUSER
|
|
if (ins(d, "EX_NOUSER", (long)EX_NOUSER)) return -1;
|
|
#endif /* EX_NOUSER */
|
|
#ifdef EX_NOHOST
|
|
if (ins(d, "EX_NOHOST", (long)EX_NOHOST)) return -1;
|
|
#endif /* EX_NOHOST */
|
|
#ifdef EX_UNAVAILABLE
|
|
if (ins(d, "EX_UNAVAILABLE", (long)EX_UNAVAILABLE)) return -1;
|
|
#endif /* EX_UNAVAILABLE */
|
|
#ifdef EX_SOFTWARE
|
|
if (ins(d, "EX_SOFTWARE", (long)EX_SOFTWARE)) return -1;
|
|
#endif /* EX_SOFTWARE */
|
|
#ifdef EX_OSERR
|
|
if (ins(d, "EX_OSERR", (long)EX_OSERR)) return -1;
|
|
#endif /* EX_OSERR */
|
|
#ifdef EX_OSFILE
|
|
if (ins(d, "EX_OSFILE", (long)EX_OSFILE)) return -1;
|
|
#endif /* EX_OSFILE */
|
|
#ifdef EX_CANTCREAT
|
|
if (ins(d, "EX_CANTCREAT", (long)EX_CANTCREAT)) return -1;
|
|
#endif /* EX_CANTCREAT */
|
|
#ifdef EX_IOERR
|
|
if (ins(d, "EX_IOERR", (long)EX_IOERR)) return -1;
|
|
#endif /* EX_IOERR */
|
|
#ifdef EX_TEMPFAIL
|
|
if (ins(d, "EX_TEMPFAIL", (long)EX_TEMPFAIL)) return -1;
|
|
#endif /* EX_TEMPFAIL */
|
|
#ifdef EX_PROTOCOL
|
|
if (ins(d, "EX_PROTOCOL", (long)EX_PROTOCOL)) return -1;
|
|
#endif /* EX_PROTOCOL */
|
|
#ifdef EX_NOPERM
|
|
if (ins(d, "EX_NOPERM", (long)EX_NOPERM)) return -1;
|
|
#endif /* EX_NOPERM */
|
|
#ifdef EX_CONFIG
|
|
if (ins(d, "EX_CONFIG", (long)EX_CONFIG)) return -1;
|
|
#endif /* EX_CONFIG */
|
|
#ifdef EX_NOTFOUND
|
|
if (ins(d, "EX_NOTFOUND", (long)EX_NOTFOUND)) return -1;
|
|
#endif /* EX_NOTFOUND */
|
|
|
|
#ifdef HAVE_SPAWNV
|
|
#if defined(PYOS_OS2) && defined(PYCC_GCC)
|
|
if (ins(d, "P_WAIT", (long)P_WAIT)) return -1;
|
|
if (ins(d, "P_NOWAIT", (long)P_NOWAIT)) return -1;
|
|
if (ins(d, "P_OVERLAY", (long)P_OVERLAY)) return -1;
|
|
if (ins(d, "P_DEBUG", (long)P_DEBUG)) return -1;
|
|
if (ins(d, "P_SESSION", (long)P_SESSION)) return -1;
|
|
if (ins(d, "P_DETACH", (long)P_DETACH)) return -1;
|
|
if (ins(d, "P_PM", (long)P_PM)) return -1;
|
|
if (ins(d, "P_DEFAULT", (long)P_DEFAULT)) return -1;
|
|
if (ins(d, "P_MINIMIZE", (long)P_MINIMIZE)) return -1;
|
|
if (ins(d, "P_MAXIMIZE", (long)P_MAXIMIZE)) return -1;
|
|
if (ins(d, "P_FULLSCREEN", (long)P_FULLSCREEN)) return -1;
|
|
if (ins(d, "P_WINDOWED", (long)P_WINDOWED)) return -1;
|
|
if (ins(d, "P_FOREGROUND", (long)P_FOREGROUND)) return -1;
|
|
if (ins(d, "P_BACKGROUND", (long)P_BACKGROUND)) return -1;
|
|
if (ins(d, "P_NOCLOSE", (long)P_NOCLOSE)) return -1;
|
|
if (ins(d, "P_NOSESSION", (long)P_NOSESSION)) return -1;
|
|
if (ins(d, "P_QUOTE", (long)P_QUOTE)) return -1;
|
|
if (ins(d, "P_TILDE", (long)P_TILDE)) return -1;
|
|
if (ins(d, "P_UNRELATED", (long)P_UNRELATED)) return -1;
|
|
if (ins(d, "P_DEBUGDESC", (long)P_DEBUGDESC)) return -1;
|
|
#else
|
|
if (ins(d, "P_WAIT", (long)_P_WAIT)) return -1;
|
|
if (ins(d, "P_NOWAIT", (long)_P_NOWAIT)) return -1;
|
|
if (ins(d, "P_OVERLAY", (long)_OLD_P_OVERLAY)) return -1;
|
|
if (ins(d, "P_NOWAITO", (long)_P_NOWAITO)) return -1;
|
|
if (ins(d, "P_DETACH", (long)_P_DETACH)) return -1;
|
|
#endif
|
|
#endif
|
|
|
|
#if defined(PYOS_OS2)
|
|
if (insertvalues(d)) return -1;
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
|
|
#if (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__)) && !defined(__QNX__)
|
|
#define INITFUNC initnt
|
|
#define MODNAME "nt"
|
|
|
|
#elif defined(PYOS_OS2)
|
|
#define INITFUNC initos2
|
|
#define MODNAME "os2"
|
|
|
|
#else
|
|
#define INITFUNC initposix
|
|
#define MODNAME "posix"
|
|
#endif
|
|
|
|
PyMODINIT_FUNC
|
|
INITFUNC(void)
|
|
{
|
|
PyObject *m, *v;
|
|
|
|
m = Py_InitModule3(MODNAME,
|
|
posix_methods,
|
|
posix__doc__);
|
|
if (m == NULL)
|
|
return;
|
|
|
|
/* Initialize environ dictionary */
|
|
v = convertenviron();
|
|
Py_XINCREF(v);
|
|
if (v == NULL || PyModule_AddObject(m, "environ", v) != 0)
|
|
return;
|
|
Py_DECREF(v);
|
|
|
|
if (all_ins(m))
|
|
return;
|
|
|
|
if (setup_confname_tables(m))
|
|
return;
|
|
|
|
Py_INCREF(PyExc_OSError);
|
|
PyModule_AddObject(m, "error", PyExc_OSError);
|
|
|
|
#ifdef HAVE_PUTENV
|
|
if (posix_putenv_garbage == NULL)
|
|
posix_putenv_garbage = PyDict_New();
|
|
#endif
|
|
|
|
if (!initialized) {
|
|
stat_result_desc.name = MODNAME ".stat_result";
|
|
stat_result_desc.fields[7].name = PyStructSequence_UnnamedField;
|
|
stat_result_desc.fields[8].name = PyStructSequence_UnnamedField;
|
|
stat_result_desc.fields[9].name = PyStructSequence_UnnamedField;
|
|
PyStructSequence_InitType(&StatResultType, &stat_result_desc);
|
|
structseq_new = StatResultType.tp_new;
|
|
StatResultType.tp_new = statresult_new;
|
|
|
|
statvfs_result_desc.name = MODNAME ".statvfs_result";
|
|
PyStructSequence_InitType(&StatVFSResultType, &statvfs_result_desc);
|
|
}
|
|
Py_INCREF((PyObject*) &StatResultType);
|
|
PyModule_AddObject(m, "stat_result", (PyObject*) &StatResultType);
|
|
Py_INCREF((PyObject*) &StatVFSResultType);
|
|
PyModule_AddObject(m, "statvfs_result",
|
|
(PyObject*) &StatVFSResultType);
|
|
initialized = 1;
|
|
|
|
#ifdef __APPLE__
|
|
/*
|
|
* Step 2 of weak-linking support on Mac OS X.
|
|
*
|
|
* The code below removes functions that are not available on the
|
|
* currently active platform.
|
|
*
|
|
* This block allow one to use a python binary that was build on
|
|
* OSX 10.4 on OSX 10.3, without loosing access to new APIs on
|
|
* OSX 10.4.
|
|
*/
|
|
#ifdef HAVE_FSTATVFS
|
|
if (fstatvfs == NULL) {
|
|
if (PyObject_DelAttrString(m, "fstatvfs") == -1) {
|
|
return;
|
|
}
|
|
}
|
|
#endif /* HAVE_FSTATVFS */
|
|
|
|
#ifdef HAVE_STATVFS
|
|
if (statvfs == NULL) {
|
|
if (PyObject_DelAttrString(m, "statvfs") == -1) {
|
|
return;
|
|
}
|
|
}
|
|
#endif /* HAVE_STATVFS */
|
|
|
|
# ifdef HAVE_LCHOWN
|
|
if (lchown == NULL) {
|
|
if (PyObject_DelAttrString(m, "lchown") == -1) {
|
|
return;
|
|
}
|
|
}
|
|
#endif /* HAVE_LCHOWN */
|
|
|
|
|
|
#endif /* __APPLE__ */
|
|
|
|
}
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|