mirror of
https://github.com/python/cpython.git
synced 2025-07-24 19:54:21 +00:00

Inherits test_gzip/test_tarfile failures on 64-bit platforms from the trunk, but I don't want the merge to hang around too long (even though the regular p3yk-contributors are/have been busy with other things.) Merged revisions 45621-46490 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r45621 | george.yoshida | 2006-04-21 18:34:17 +0200 (Fri, 21 Apr 2006) | 2 lines Correct the grammar ........ r45622 | tim.peters | 2006-04-21 18:34:54 +0200 (Fri, 21 Apr 2006) | 2 lines Whitespace normalization. ........ r45624 | thomas.heller | 2006-04-21 18:48:56 +0200 (Fri, 21 Apr 2006) | 1 line Merge in changes from ctypes 0.9.9.6 upstream version. ........ r45625 | thomas.heller | 2006-04-21 18:51:04 +0200 (Fri, 21 Apr 2006) | 1 line Merge in changes from ctypes 0.9.9.6 upstream version. ........ r45630 | thomas.heller | 2006-04-21 20:29:17 +0200 (Fri, 21 Apr 2006) | 8 lines Documentation for ctypes. I think that 'generic operating system services' is the best category. Note that the Doc/lib/libctypes.latex file is generated from reST sources. You are welcome to make typo fixes, and I'll try to keep the reST sources in sync, but markup changes would be lost - they should be fixed in the tool that creates the latex file. The conversion script is external/ctypes/docs/manual/mkpydoc.py. ........ r45631 | tim.peters | 2006-04-21 23:18:10 +0200 (Fri, 21 Apr 2006) | 24 lines SF bug #1473760 TempFile can hang on Windows. Python 2.4 changed ntpath.abspath to do an import inside the function. As a result, due to Python's import lock, anything calling abspath on Windows (directly, or indirectly like tempfile.TemporaryFile) hung when it was called from a thread spawned as a side effect of importing a module. This is a depressingly frequent problem, and deserves a more general fix. I'm settling for a micro-fix here because this specific one accounts for a report of Zope Corp's ZEO hanging on Windows, and it was an odd way to change abspath to begin with (ntpath needs a different implementation depending on whether we're actually running on Windows, and the _obvious_ way to arrange for that is not to bury a possibly-failing import _inside_ the function). Note that if/when other micro-fixes of this kind get made, the new Lib/test/threaded_import_hangers.py is a convenient place to add tests for them. ........ r45634 | phillip.eby | 2006-04-21 23:53:37 +0200 (Fri, 21 Apr 2006) | 2 lines Guido wrote contextlib, not me, but thanks anyway. ;) ........ r45636 | andrew.kuchling | 2006-04-22 03:51:41 +0200 (Sat, 22 Apr 2006) | 1 line Typo fixes ........ r45638 | andrew.kuchling | 2006-04-22 03:58:40 +0200 (Sat, 22 Apr 2006) | 1 line Fix comment typo ........ r45639 | andrew.kuchling | 2006-04-22 04:06:03 +0200 (Sat, 22 Apr 2006) | 8 lines Make copy of test_mailbox.py. We'll still want to check the backward compatibility classes in the new mailbox.py that I'll be committing in a few minutes. One change has been made: the tests use len(mbox) instead of len(mbox.boxes). The 'boxes' attribute was never documented and contains some internal state that seems unlikely to have been useful. ........ r45640 | andrew.kuchling | 2006-04-22 04:32:43 +0200 (Sat, 22 Apr 2006) | 16 lines Add Gregory K. Johnson's revised version of mailbox.py (funded by the 2005 Summer of Code). The revision adds a number of new mailbox classes that support adding and removing messages; these classes also support mailbox locking and default to using email.Message instead of rfc822.Message. The old mailbox classes are largely left alone for backward compatibility. The exception is the Maildir class, which was present in the old module and now inherits from the new classes. The Maildir class's interface is pretty simple, though, so I think it'll be compatible with existing code. (The change to the NEWS file also adds a missing word to a different news item, which unfortunately required rewrapping the line.) ........ r45641 | tim.peters | 2006-04-22 07:52:59 +0200 (Sat, 22 Apr 2006) | 2 lines Whitespace normalization. ........ r45642 | neal.norwitz | 2006-04-22 08:07:46 +0200 (Sat, 22 Apr 2006) | 1 line Add libctypes as a dep ........ r45643 | martin.v.loewis | 2006-04-22 13:15:41 +0200 (Sat, 22 Apr 2006) | 1 line Fix more ssize_t problems. ........ r45644 | martin.v.loewis | 2006-04-22 13:40:03 +0200 (Sat, 22 Apr 2006) | 1 line Fix more ssize_t issues. ........ r45645 | george.yoshida | 2006-04-22 17:10:49 +0200 (Sat, 22 Apr 2006) | 2 lines Typo fixes ........ r45647 | martin.v.loewis | 2006-04-22 17:19:54 +0200 (Sat, 22 Apr 2006) | 1 line Port to Python 2.5. Drop .DEF file. Change output file names to .pyd. ........ r45648 | george.yoshida | 2006-04-22 17:27:14 +0200 (Sat, 22 Apr 2006) | 3 lines - add versionadded tag - make arbitrary arguments come last ........ r45649 | hyeshik.chang | 2006-04-22 17:48:15 +0200 (Sat, 22 Apr 2006) | 3 lines Remove $CJKCodecs$ RCS tags. The CJKCodecs isn't maintained outside anymore. ........ r45654 | greg.ward | 2006-04-23 05:47:58 +0200 (Sun, 23 Apr 2006) | 2 lines Update optparse to Optik 1.5.1. ........ r45658 | george.yoshida | 2006-04-23 11:27:10 +0200 (Sun, 23 Apr 2006) | 2 lines wrap SyntaxError with \exception{} ........ r45660 | ronald.oussoren | 2006-04-23 13:59:25 +0200 (Sun, 23 Apr 2006) | 6 lines Patch 1471925 - Weak linking support for OSX This patch causes several symbols in the socket and posix module to be weakly linked on OSX and disables usage of ftime on OSX. These changes make it possible to use a binary build on OSX 10.4 on a 10.3 system. ........ r45661 | ronald.oussoren | 2006-04-23 14:36:23 +0200 (Sun, 23 Apr 2006) | 5 lines Patch 1471761 - test for broken poll at runtime This patch checks if poll is broken when the select module is loaded instead of doing so at configure-time. This functionality is only active on Mac OS X. ........ r45662 | nick.coghlan | 2006-04-23 17:13:32 +0200 (Sun, 23 Apr 2006) | 1 line Add a Context Types section to parallel the Iterator Types section (uses the same terminology as the 2.5a1 implementation) ........ r45663 | nick.coghlan | 2006-04-23 17:14:37 +0200 (Sun, 23 Apr 2006) | 1 line Update contextlib documentation to use the same terminology as the module implementation ........ r45664 | gerhard.haering | 2006-04-23 17:24:26 +0200 (Sun, 23 Apr 2006) | 2 lines Updated the sqlite3 module to the external pysqlite 2.2.2 version. ........ r45666 | nick.coghlan | 2006-04-23 17:39:16 +0200 (Sun, 23 Apr 2006) | 1 line Update with statement documentation to use same terminology as 2.5a1 implementation ........ r45667 | nick.coghlan | 2006-04-23 18:05:04 +0200 (Sun, 23 Apr 2006) | 1 line Add a (very) brief mention of the with statement to the end of chapter 8 ........ r45668 | nick.coghlan | 2006-04-23 18:35:19 +0200 (Sun, 23 Apr 2006) | 1 line Take 2 on mentioning the with statement, this time without inadvertently killing the Unicode examples ........ r45669 | nick.coghlan | 2006-04-23 19:04:07 +0200 (Sun, 23 Apr 2006) | 1 line Backdated NEWS entry to record the implementation of PEP 338 for alpha 1 ........ r45670 | tim.peters | 2006-04-23 20:13:45 +0200 (Sun, 23 Apr 2006) | 2 lines Whitespace normalization. ........ r45671 | skip.montanaro | 2006-04-23 21:14:27 +0200 (Sun, 23 Apr 2006) | 1 line first cut at trace module doc ........ r45672 | skip.montanaro | 2006-04-23 21:26:33 +0200 (Sun, 23 Apr 2006) | 1 line minor tweak ........ r45673 | skip.montanaro | 2006-04-23 21:30:50 +0200 (Sun, 23 Apr 2006) | 1 line it's always helpful if the example works... ........ r45674 | skip.montanaro | 2006-04-23 21:32:14 +0200 (Sun, 23 Apr 2006) | 1 line correct example ........ r45675 | andrew.kuchling | 2006-04-23 23:01:04 +0200 (Sun, 23 Apr 2006) | 1 line Edits to the PEP 343 section ........ r45676 | andrew.kuchling | 2006-04-23 23:51:10 +0200 (Sun, 23 Apr 2006) | 1 line Add two items ........ r45677 | tim.peters | 2006-04-24 04:03:16 +0200 (Mon, 24 Apr 2006) | 5 lines Bug #1337990: clarified that `doctest` does not support examples requiring both expected output and an exception. I'll backport to 2.4 next. ........ r45679 | nick.coghlan | 2006-04-24 05:04:43 +0200 (Mon, 24 Apr 2006) | 1 line Note changes made to PEP 343 related documentation ........ r45681 | nick.coghlan | 2006-04-24 06:17:02 +0200 (Mon, 24 Apr 2006) | 1 line Change PEP 343 related documentation to use the term context specifier instead of context object ........ r45682 | nick.coghlan | 2006-04-24 06:32:47 +0200 (Mon, 24 Apr 2006) | 1 line Add unit tests for the -m and -c command line switches ........ r45683 | nick.coghlan | 2006-04-24 06:37:15 +0200 (Mon, 24 Apr 2006) | 1 line Fix contextlib.nested to cope with exit methods raising and handling exceptions ........ r45685 | nick.coghlan | 2006-04-24 06:59:28 +0200 (Mon, 24 Apr 2006) | 1 line Fix broken contextlib test from last checkin (I'd've sworn I tested that before checking it in. . .) ........ r45686 | nick.coghlan | 2006-04-24 07:24:26 +0200 (Mon, 24 Apr 2006) | 1 line Back out new command line tests (broke buildbot) ........ r45687 | nick.coghlan | 2006-04-24 07:52:15 +0200 (Mon, 24 Apr 2006) | 1 line More reliable version of new command line tests that just checks the exit codes ........ r45688 | thomas.wouters | 2006-04-24 13:37:13 +0200 (Mon, 24 Apr 2006) | 4 lines Stop test_tcl's testLoadTk from leaking the Tk commands 'loadtk' registers. ........ r45690 | andrew.kuchling | 2006-04-24 16:30:47 +0200 (Mon, 24 Apr 2006) | 2 lines Edits, using the new term 'context specifier' in a few places ........ r45697 | phillip.eby | 2006-04-24 22:53:13 +0200 (Mon, 24 Apr 2006) | 2 lines Revert addition of setuptools ........ r45698 | tim.peters | 2006-04-25 00:45:13 +0200 (Tue, 25 Apr 2006) | 2 lines Whitespace normalization. ........ r45700 | trent.mick | 2006-04-25 02:34:50 +0200 (Tue, 25 Apr 2006) | 4 lines Put break at correct level so *all* root HKEYs acutally get checked for an installed VC6. Otherwise only the first such tree gets checked and this warning doesn't get displayed. ........ r45701 | tim.peters | 2006-04-25 05:31:36 +0200 (Tue, 25 Apr 2006) | 3 lines Patch #1475231: add a new SKIP doctest option, thanks to Edward Loper. ........ r45702 | neal.norwitz | 2006-04-25 07:04:35 +0200 (Tue, 25 Apr 2006) | 1 line versionadded for SKIP ........ r45703 | neal.norwitz | 2006-04-25 07:05:03 +0200 (Tue, 25 Apr 2006) | 1 line Restore Walters name ........ r45704 | neal.norwitz | 2006-04-25 07:49:42 +0200 (Tue, 25 Apr 2006) | 1 line Revert previous change, SKIP had a versionadded elsewhere ........ r45706 | nick.coghlan | 2006-04-25 12:56:51 +0200 (Tue, 25 Apr 2006) | 31 lines Move the PEP 343 documentation and implementation closer to the terminology in the alpha 1 documentation. - "context manager" reverts to its alpha 1 definition - the term "context specifier" goes away entirely - contextlib.GeneratorContextManager is renamed GeneratorContext There are still a number of changes relative to alpha 1: - the expression in the with statement is explicitly called the "context expression" in the language reference - the terms 'with statement context', 'context object' or 'with statement context' are used in several places instead of a bare 'context'. The aim of this is to avoid ambiguity in relation to the runtime context set up when the block is executed, and the context objects that already exist in various application domains (such as decimal.Context) - contextlib.contextmanager is renamed to contextfactory This best reflects the nature of the function resulting from the use of that decorator - decimal.ContextManager is renamed to WithStatementContext Simple dropping the 'Manager' part wasn't possible due to the fact that decimal.Context already exists and means something different. WithStatementContext is ugly but workable. A technically unrelated change snuck into this commit: contextlib.closing now avoids the overhead of creating a generator, since it's trivial to implement that particular context manager directly. ........ r45707 | nick.coghlan | 2006-04-25 13:05:56 +0200 (Tue, 25 Apr 2006) | 1 line Fix latex typo ........ r45708 | thomas.wouters | 2006-04-25 14:28:56 +0200 (Tue, 25 Apr 2006) | 4 lines Fix markup glitch in unittest docs. Will backport. ........ r45710 | andrew.kuchling | 2006-04-25 14:31:38 +0200 (Tue, 25 Apr 2006) | 1 line Add two items; easy_install is now off the table, though pkgutil still is ........ r45711 | andrew.kuchling | 2006-04-25 14:47:25 +0200 (Tue, 25 Apr 2006) | 1 line Rework context terminology ........ r45712 | thomas.wouters | 2006-04-25 15:53:23 +0200 (Tue, 25 Apr 2006) | 9 lines SF bug/patch #1433877: string parameter to ioctl not null terminated The new char-array used in ioctl calls wasn't explicitly NUL-terminated; quite probably the cause for the test_pty failures on Solaris that we circumvented earlier. (I wasn't able to reproduce it with this patch, but it has been somewhat elusive to start with.) ........ r45713 | george.yoshida | 2006-04-25 16:09:58 +0200 (Tue, 25 Apr 2006) | 2 lines minor tweak ........ r45714 | thomas.wouters | 2006-04-25 17:08:10 +0200 (Tue, 25 Apr 2006) | 7 lines Fix SF bug #1476111: SystemError in socket sendto. The AF_INET6 and AF_PACKET cases in getsockaddrarg were missing their own checks for tuple-ness of the address argument, which means a confusing SystemError was raised by PyArg_ParseTuple instead. ........ r45715 | thomas.wouters | 2006-04-25 17:29:46 +0200 (Tue, 25 Apr 2006) | 10 lines Define MAXPATHLEN to be at least PATH_MAX, if that's defined. Python uses MAXPATHLEN-sized buffers for various output-buffers (like to realpath()), and that's correct on BSD platforms, but not Linux (which uses PATH_MAX, and does not define MAXPATHLEN.) Cursory googling suggests Linux is following a newer standard than BSD, but in cases like this, who knows. Using the greater of PATH_MAX and 1024 as a fallback for MAXPATHLEN seems to be the most portable solution. ........ r45717 | thomas.heller | 2006-04-25 20:26:08 +0200 (Tue, 25 Apr 2006) | 3 lines Fix compiler warnings on Darwin. Patch by Brett Canon, see https://sourceforge.net/tracker/?func=detail&atid=532156&aid=1475959&group_id=71702 ........ r45718 | guido.van.rossum | 2006-04-25 22:12:45 +0200 (Tue, 25 Apr 2006) | 4 lines Implement MvL's improvement on __context__ in Condition; this can just call __context__ on the underlying lock. (The same change for Semaphore does *not* work!) ........ r45721 | tim.peters | 2006-04-26 03:15:53 +0200 (Wed, 26 Apr 2006) | 13 lines Rev 45706 renamed stuff in contextlib.py, but didn't rename uses of it in test_with.py. As a result, test_with has been skipped (due to failing imports) on all buildbot boxes since. Alas, that's not a test failure -- you have to pay attention to the 1 skip unexpected on PLATFORM: test_with kinds of output at the ends of test runs to notice that this got broken. It's likely that more renaming in test_with.py would be desirable. ........ r45722 | fred.drake | 2006-04-26 07:15:41 +0200 (Wed, 26 Apr 2006) | 1 line markup fixes, cleanup ........ r45723 | fred.drake | 2006-04-26 07:19:39 +0200 (Wed, 26 Apr 2006) | 1 line minor adjustment suggested by Peter Gephardt ........ r45724 | neal.norwitz | 2006-04-26 07:34:03 +0200 (Wed, 26 Apr 2006) | 10 lines Patch from Aldo Cortesi (OpenBSD buildbot owner). After the patch (45590) to add extra debug stats to the gc module, Python was crashing on OpenBSD due to: Fatal Python error: Interpreter not initialized (version mismatch?) This seems to occur due to calling collect() when initialized (in pythonrun.c) is set to 0. Now, the import will occur in the init function which shouldn't suffer this problem. ........ r45725 | neal.norwitz | 2006-04-26 08:26:12 +0200 (Wed, 26 Apr 2006) | 3 lines Fix this test on Solaris. There can be embedded \r, so don't just replace the one at the end. ........ r45727 | nick.coghlan | 2006-04-26 13:50:04 +0200 (Wed, 26 Apr 2006) | 1 line Fix an error in the last contextlib.closing example ........ r45728 | andrew.kuchling | 2006-04-26 14:21:06 +0200 (Wed, 26 Apr 2006) | 1 line [Bug #1475080] Fix example ........ r45729 | andrew.kuchling | 2006-04-26 14:23:39 +0200 (Wed, 26 Apr 2006) | 1 line Add labels to all sections ........ r45730 | thomas.wouters | 2006-04-26 17:53:30 +0200 (Wed, 26 Apr 2006) | 7 lines The result of SF patch #1471578: big-memory tests for strings, lists and tuples. Lots to be added, still, but this will give big-memory people something to play with in 2.5 alpha 2, and hopefully get more people to write these tests. ........ r45731 | tim.peters | 2006-04-26 19:11:16 +0200 (Wed, 26 Apr 2006) | 2 lines Whitespace normalization. ........ r45732 | martin.v.loewis | 2006-04-26 19:19:44 +0200 (Wed, 26 Apr 2006) | 1 line Use GS- and bufferoverlowU.lib where appropriate, for AMD64. ........ r45733 | thomas.wouters | 2006-04-26 20:46:01 +0200 (Wed, 26 Apr 2006) | 5 lines Add tests for += and *= on strings, and fix the memory-use estimate for the list.extend tests (they were estimating half the actual use.) ........ r45734 | thomas.wouters | 2006-04-26 21:14:46 +0200 (Wed, 26 Apr 2006) | 5 lines Some more test-size-estimate fixes: test_append and test_insert trigger a list resize, which overallocates. ........ r45735 | hyeshik.chang | 2006-04-26 21:20:26 +0200 (Wed, 26 Apr 2006) | 3 lines Fix build on MIPS for libffi. I haven't tested this yet because I don't have an access on MIPS machines. Will be tested by buildbot. :) ........ r45737 | fred.drake | 2006-04-27 01:40:32 +0200 (Thu, 27 Apr 2006) | 1 line one more place to use the current Python version ........ r45738 | fred.drake | 2006-04-27 02:02:24 +0200 (Thu, 27 Apr 2006) | 3 lines - update version numbers in file names again, until we have a better way - elaborate instructions for Cygwin support (closes SF #839709) ........ r45739 | fred.drake | 2006-04-27 02:20:14 +0200 (Thu, 27 Apr 2006) | 1 line add missing word ........ r45740 | anthony.baxter | 2006-04-27 04:11:24 +0200 (Thu, 27 Apr 2006) | 2 lines 2.5a2 ........ r45741 | anthony.baxter | 2006-04-27 04:13:13 +0200 (Thu, 27 Apr 2006) | 1 line 2.5a2 ........ r45749 | andrew.kuchling | 2006-04-27 14:22:37 +0200 (Thu, 27 Apr 2006) | 1 line Now that 2.5a2 is out, revert to the current date ........ r45750 | andrew.kuchling | 2006-04-27 14:23:07 +0200 (Thu, 27 Apr 2006) | 1 line Bump document version ........ r45751 | andrew.kuchling | 2006-04-27 14:34:39 +0200 (Thu, 27 Apr 2006) | 6 lines [Bug #1477102] Add necessary import to example This may be a useful style question for the docs -- should examples show the necessary imports, or should it be assumed that the reader will figure it out? In the What's New, I'm not consistent but usually opt for omitting the imports. ........ r45753 | andrew.kuchling | 2006-04-27 14:38:35 +0200 (Thu, 27 Apr 2006) | 1 line [Bug #1477140] Import Error base class ........ r45754 | andrew.kuchling | 2006-04-27 14:42:54 +0200 (Thu, 27 Apr 2006) | 1 line Mention the xmlrpclib.Error base class, which is used in one of the examples ........ r45756 | george.yoshida | 2006-04-27 15:41:07 +0200 (Thu, 27 Apr 2006) | 2 lines markup fix ........ r45757 | thomas.wouters | 2006-04-27 15:46:59 +0200 (Thu, 27 Apr 2006) | 4 lines Some more size-estimate fixes, for large-list-tests. ........ r45758 | thomas.heller | 2006-04-27 17:50:42 +0200 (Thu, 27 Apr 2006) | 3 lines Rerun the libffi configuration if any of the files used for that are newer then fficonfig.py. ........ r45766 | thomas.wouters | 2006-04-28 00:37:50 +0200 (Fri, 28 Apr 2006) | 6 lines Some style fixes and size-calculation fixes. Also do the small-memory run using a prime number, rather than a convenient power-of-2-and-multiple-of-5, so incorrect testing algorithms fail more easily. ........ r45767 | thomas.wouters | 2006-04-28 00:38:32 +0200 (Fri, 28 Apr 2006) | 6 lines Do the small-memory run of big-meormy tests using a prime number, rather than a convenient power-of-2-and-multiple-of-5, so incorrect testing algorithms fail more easily. ........ r45768 | david.goodger | 2006-04-28 00:53:05 +0200 (Fri, 28 Apr 2006) | 1 line Added SVN access for Steven Bethard and Talin, for PEP updating. ........ r45770 | thomas.wouters | 2006-04-28 01:13:20 +0200 (Fri, 28 Apr 2006) | 16 lines - Add new Warning class, ImportWarning - Warn-raise ImportWarning when importing would have picked up a directory as package, if only it'd had an __init__.py. This swaps two tests (for case-ness and __init__-ness), but case-test is not really more expensive, and it's not in a speed-critical section. - Test for the new warning by importing a common non-package directory on sys.path: site-packages - In regrtest.py, silence warnings generated by the build-environment because Modules/ (which is added to sys.path for Setup-created modules) has 'zlib' and '_ctypes' directories without __init__.py's. ........ r45771 | thomas.wouters | 2006-04-28 01:41:27 +0200 (Fri, 28 Apr 2006) | 6 lines Add more ignores of ImportWarnings; these are all just potential triggers (since they won't trigger if zlib is already sucessfully imported); they were found by grepping .py files, instead of looking at warning output :) ........ r45773 | neal.norwitz | 2006-04-28 06:32:20 +0200 (Fri, 28 Apr 2006) | 1 line Add some whitespace to be more consistent. ........ r45774 | neal.norwitz | 2006-04-28 06:34:43 +0200 (Fri, 28 Apr 2006) | 5 lines Try to really fix the slow buildbots this time. Printing to stdout, doesn't mean the data was actually written. It depends on the buffering, so we need to flush. This will hopefully really fix the buildbots getting killed due to no output on the slow bots. ........ r45775 | neal.norwitz | 2006-04-28 07:28:05 +0200 (Fri, 28 Apr 2006) | 1 line Fix some warnings on Mac OS X 10.4 ........ r45776 | neal.norwitz | 2006-04-28 07:28:30 +0200 (Fri, 28 Apr 2006) | 1 line Fix a warning on alpha ........ r45777 | neal.norwitz | 2006-04-28 07:28:54 +0200 (Fri, 28 Apr 2006) | 1 line Fix a warning on ppc (debian) ........ r45778 | george.yoshida | 2006-04-28 18:09:45 +0200 (Fri, 28 Apr 2006) | 2 lines fix markup glitch ........ r45780 | georg.brandl | 2006-04-28 18:31:17 +0200 (Fri, 28 Apr 2006) | 3 lines Add SeaMonkey to the list of Mozilla browsers. ........ r45781 | georg.brandl | 2006-04-28 18:36:55 +0200 (Fri, 28 Apr 2006) | 2 lines Bug #1475009: clarify ntpath.join behavior with absolute components ........ r45783 | george.yoshida | 2006-04-28 18:40:14 +0200 (Fri, 28 Apr 2006) | 2 lines correct a dead link ........ r45785 | georg.brandl | 2006-04-28 18:54:25 +0200 (Fri, 28 Apr 2006) | 4 lines Bug #1472949: stringify IOErrors in shutil.copytree when appending them to the Error errors list. ........ r45786 | georg.brandl | 2006-04-28 18:58:52 +0200 (Fri, 28 Apr 2006) | 3 lines Bug #1478326: don't allow '/' in distutils.util.get_platform machine names since this value is used to name the build directory. ........ r45788 | thomas.heller | 2006-04-28 19:02:18 +0200 (Fri, 28 Apr 2006) | 1 line Remove a duplicated test (the same test is in test_incomplete.py). ........ r45792 | georg.brandl | 2006-04-28 21:09:24 +0200 (Fri, 28 Apr 2006) | 3 lines Bug #1478429: make datetime.datetime.fromtimestamp accept every float, possibly "rounding up" to the next whole second. ........ r45796 | george.yoshida | 2006-04-29 04:43:30 +0200 (Sat, 29 Apr 2006) | 2 lines grammar fix ........ r45800 | ronald.oussoren | 2006-04-29 13:31:35 +0200 (Sat, 29 Apr 2006) | 2 lines Patch 1471883: --enable-universalsdk on Mac OS X ........ r45801 | andrew.kuchling | 2006-04-29 13:53:15 +0200 (Sat, 29 Apr 2006) | 1 line Add item ........ r45802 | andrew.kuchling | 2006-04-29 14:10:28 +0200 (Sat, 29 Apr 2006) | 1 line Make case of 'ZIP' consistent ........ r45803 | andrew.kuchling | 2006-04-29 14:10:43 +0200 (Sat, 29 Apr 2006) | 1 line Add item ........ r45808 | martin.v.loewis | 2006-04-29 14:37:25 +0200 (Sat, 29 Apr 2006) | 3 lines Further changes for #1471883: Edit Misc/NEWS, and add expat_config.h. ........ r45809 | brett.cannon | 2006-04-29 23:29:50 +0200 (Sat, 29 Apr 2006) | 2 lines Fix docstring for contextfactory; mentioned old contextmanager name. ........ r45810 | gerhard.haering | 2006-04-30 01:12:41 +0200 (Sun, 30 Apr 2006) | 3 lines This is the start of documentation for the sqlite3 module. Please feel free to find a better place for the link to it than alongside bsddb & friends. ........ r45811 | andrew.kuchling | 2006-04-30 03:07:09 +0200 (Sun, 30 Apr 2006) | 1 line Add two items ........ r45814 | george.yoshida | 2006-04-30 05:49:56 +0200 (Sun, 30 Apr 2006) | 2 lines Use \versionchanged instead of \versionadded for new parameter support. ........ r45815 | georg.brandl | 2006-04-30 09:06:11 +0200 (Sun, 30 Apr 2006) | 2 lines Patch #1470846: fix urllib2 ProxyBasicAuthHandler. ........ r45817 | georg.brandl | 2006-04-30 10:57:35 +0200 (Sun, 30 Apr 2006) | 3 lines In stdlib, use hashlib instead of deprecated md5 and sha modules. ........ r45819 | georg.brandl | 2006-04-30 11:23:59 +0200 (Sun, 30 Apr 2006) | 3 lines Patch #1470976: don't NLST files when retrieving over FTP. ........ r45821 | georg.brandl | 2006-04-30 13:13:56 +0200 (Sun, 30 Apr 2006) | 6 lines Bug #1473625: stop cPickle making float dumps locale dependent in protocol 0. On the way, add a decorator to test_support to facilitate running single test functions in different locales with automatic cleanup. ........ r45822 | phillip.eby | 2006-04-30 17:59:26 +0200 (Sun, 30 Apr 2006) | 2 lines Fix infinite regress when inspecting <string> or <stdin> frames. ........ r45824 | georg.brandl | 2006-04-30 19:42:26 +0200 (Sun, 30 Apr 2006) | 3 lines Fix another problem in inspect: if the module for an object cannot be found, don't try to give its __dict__ to linecache. ........ r45825 | georg.brandl | 2006-04-30 20:14:54 +0200 (Sun, 30 Apr 2006) | 3 lines Patch #1472854: make the rlcompleter.Completer class usable on non- UNIX platforms. ........ r45826 | georg.brandl | 2006-04-30 21:34:19 +0200 (Sun, 30 Apr 2006) | 3 lines Patch #1479438: add \keyword markup for "with". ........ r45827 | andrew.kuchling | 2006-04-30 23:19:31 +0200 (Sun, 30 Apr 2006) | 1 line Add urllib2 HOWTO from Michael Foord ........ r45828 | andrew.kuchling | 2006-04-30 23:19:49 +0200 (Sun, 30 Apr 2006) | 1 line Add item ........ r45830 | barry.warsaw | 2006-05-01 05:03:02 +0200 (Mon, 01 May 2006) | 11 lines Port forward from 2.4 branch: Patch #1464708 from William McVey: fixed handling of nested comments in mail addresses. E.g. "Foo ((Foo Bar)) <foo@example.com>" Fixes for both rfc822.py and email package. This patch needs to be back ported to Python 2.3 for email 2.5. ........ r45832 | fred.drake | 2006-05-01 08:25:58 +0200 (Mon, 01 May 2006) | 4 lines - minor clarification in section title - markup adjustments (there is clearly much to be done in this section) ........ r45833 | martin.v.loewis | 2006-05-01 08:28:01 +0200 (Mon, 01 May 2006) | 2 lines Work around deadlock risk. Will backport. ........ r45836 | andrew.kuchling | 2006-05-01 14:45:02 +0200 (Mon, 01 May 2006) | 1 line Some ElementTree fixes: import from xml, not xmlcore; fix case of module name; mention list() instead of getchildren() ........ r45837 | gerhard.haering | 2006-05-01 17:14:48 +0200 (Mon, 01 May 2006) | 3 lines Further integration of the documentation for the sqlite3 module. There's still quite some content to move over from the pysqlite manual, but it's a start now. ........ r45838 | martin.v.loewis | 2006-05-01 17:56:03 +0200 (Mon, 01 May 2006) | 2 lines Rename uisample to text, drop all non-text tables. ........ r45839 | martin.v.loewis | 2006-05-01 18:12:44 +0200 (Mon, 01 May 2006) | 2 lines Add msilib documentation. ........ r45840 | martin.v.loewis | 2006-05-01 18:14:16 +0200 (Mon, 01 May 2006) | 4 lines Rename parameters to match the documentation (which in turn matches Microsoft's documentation). Drop unused parameter in CAB.append. ........ r45841 | fred.drake | 2006-05-01 18:28:54 +0200 (Mon, 01 May 2006) | 1 line add dependency ........ r45842 | andrew.kuchling | 2006-05-01 18:30:25 +0200 (Mon, 01 May 2006) | 1 line Markup fixes; add some XXX comments noting problems ........ r45843 | andrew.kuchling | 2006-05-01 18:32:49 +0200 (Mon, 01 May 2006) | 1 line Add item ........ r45844 | andrew.kuchling | 2006-05-01 19:06:54 +0200 (Mon, 01 May 2006) | 1 line Markup fixes ........ r45850 | neal.norwitz | 2006-05-02 06:43:14 +0200 (Tue, 02 May 2006) | 3 lines SF #1479181: split open() and file() from being aliases for each other. ........ r45852 | neal.norwitz | 2006-05-02 08:23:22 +0200 (Tue, 02 May 2006) | 1 line Try to fix breakage caused by patch #1479181, r45850 ........ r45853 | fred.drake | 2006-05-02 08:53:59 +0200 (Tue, 02 May 2006) | 3 lines SF #1479988: add methods to allow access to weakrefs for the weakref.WeakKeyDictionary and weakref.WeakValueDictionary ........ r45854 | neal.norwitz | 2006-05-02 09:27:47 +0200 (Tue, 02 May 2006) | 5 lines Fix breakage from patch 1471883 (r45800 & r45808) on OSF/1. The problem was that pyconfig.h was being included before some system headers which caused redefinitions and other breakage. This moves system headers after expat_config.h which includes pyconfig.h. ........ r45855 | vinay.sajip | 2006-05-02 10:35:36 +0200 (Tue, 02 May 2006) | 1 line Replaced my dumb way of calculating seconds to midnight with Tim Peters' much more sensible suggestion. What was I thinking ?!? ........ r45856 | andrew.kuchling | 2006-05-02 13:30:03 +0200 (Tue, 02 May 2006) | 1 line Provide encoding as keyword argument; soften warning paragraph about encodings ........ r45858 | guido.van.rossum | 2006-05-02 19:36:09 +0200 (Tue, 02 May 2006) | 2 lines Fix the formatting of KeyboardInterrupt -- a bad issubclass() call. ........ r45862 | guido.van.rossum | 2006-05-02 21:47:52 +0200 (Tue, 02 May 2006) | 7 lines Get rid of __context__, per the latest changes to PEP 343 and python-dev discussion. There are two places of documentation that still mention __context__: Doc/lib/libstdtypes.tex -- I wasn't quite sure how to rewrite that without spending a whole lot of time thinking about it; and whatsnew, which Andrew usually likes to change himself. ........ r45863 | armin.rigo | 2006-05-02 21:52:32 +0200 (Tue, 02 May 2006) | 4 lines Documentation bug: PySet_Pop() returns a new reference (because the caller becomes the owner of that reference). ........ r45864 | guido.van.rossum | 2006-05-02 22:47:36 +0200 (Tue, 02 May 2006) | 4 lines Hopefully this will fix the spurious failures of test_mailbox.py that I'm experiencing. (This code and mailbox.py itself are full of calls to file() that should be calls to open() -- but I'm not fixing those.) ........ r45865 | andrew.kuchling | 2006-05-02 23:44:33 +0200 (Tue, 02 May 2006) | 1 line Use open() instead of file() ........ r45866 | andrew.kuchling | 2006-05-03 00:47:49 +0200 (Wed, 03 May 2006) | 1 line Update context manager section for removal of __context__ ........ r45867 | fred.drake | 2006-05-03 03:46:52 +0200 (Wed, 03 May 2006) | 1 line remove unnecessary assignment ........ r45868 | fred.drake | 2006-05-03 03:48:24 +0200 (Wed, 03 May 2006) | 4 lines tell LaTeX2HTML to: - use UTF-8 output - not mess with the >>> prompt! ........ r45869 | fred.drake | 2006-05-03 04:04:40 +0200 (Wed, 03 May 2006) | 3 lines avoid ugly markup based on the unfortunate conversions of ">>" and "<<" to guillemets; no need for magic here ........ r45870 | fred.drake | 2006-05-03 04:12:47 +0200 (Wed, 03 May 2006) | 1 line at least comment on why curly-quotes are not enabled ........ r45871 | fred.drake | 2006-05-03 04:27:40 +0200 (Wed, 03 May 2006) | 1 line one more place to avoid extra markup ........ r45872 | fred.drake | 2006-05-03 04:29:09 +0200 (Wed, 03 May 2006) | 1 line one more place to avoid extra markup (how many will there be?) ........ r45873 | fred.drake | 2006-05-03 04:29:39 +0200 (Wed, 03 May 2006) | 1 line fix up whitespace in prompt strings ........ r45876 | tim.peters | 2006-05-03 06:46:14 +0200 (Wed, 03 May 2006) | 2 lines Whitespace normalization. ........ r45877 | martin.v.loewis | 2006-05-03 06:52:04 +0200 (Wed, 03 May 2006) | 2 lines Correct some formulations, fix XXX comments. ........ r45879 | georg.brandl | 2006-05-03 07:05:02 +0200 (Wed, 03 May 2006) | 2 lines Patch #1480067: don't redirect HTTP digest auth in urllib2 ........ r45881 | georg.brandl | 2006-05-03 07:15:10 +0200 (Wed, 03 May 2006) | 3 lines Move network tests from test_urllib2 to test_urllib2net. ........ r45887 | nick.coghlan | 2006-05-03 15:02:47 +0200 (Wed, 03 May 2006) | 1 line Finish bringing SVN into line with latest version of PEP 343 by getting rid of all remaining references to context objects that I could find. Without a __context__() method context objects no longer exist. Also get test_with working again, and adopt a suggestion from Neal for decimal.Context.get_manager() ........ r45888 | nick.coghlan | 2006-05-03 15:17:49 +0200 (Wed, 03 May 2006) | 1 line Get rid of a couple more context object references, fix some markup and clarify what happens when a generator context function swallows an exception. ........ r45889 | georg.brandl | 2006-05-03 19:46:13 +0200 (Wed, 03 May 2006) | 3 lines Add seamonkey to list of Windows browsers too. ........ r45890 | georg.brandl | 2006-05-03 20:03:22 +0200 (Wed, 03 May 2006) | 3 lines RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary. ........ r45891 | georg.brandl | 2006-05-03 20:12:33 +0200 (Wed, 03 May 2006) | 2 lines Bug #1472191: convert breakpoint indices to ints before comparing them to ints ........ r45893 | georg.brandl | 2006-05-03 20:18:32 +0200 (Wed, 03 May 2006) | 3 lines Bug #1385040: don't allow "def foo(a=1, b): pass" in the compiler package. ........ r45894 | thomas.heller | 2006-05-03 20:35:39 +0200 (Wed, 03 May 2006) | 1 line Don't fail the tests when libglut.so or libgle.so cannot be loaded. ........ r45895 | georg.brandl | 2006-05-04 07:08:10 +0200 (Thu, 04 May 2006) | 2 lines Bug #1481530: allow "from os.path import ..." with imputil ........ r45897 | martin.v.loewis | 2006-05-04 07:51:03 +0200 (Thu, 04 May 2006) | 2 lines Patch #1475845: Raise IndentationError for unexpected indent. ........ r45898 | martin.v.loewis | 2006-05-04 12:08:42 +0200 (Thu, 04 May 2006) | 1 line Implement os.{chdir,rename,rmdir,remove} using Win32 directly. ........ r45899 | martin.v.loewis | 2006-05-04 14:04:27 +0200 (Thu, 04 May 2006) | 2 lines Drop now-unnecessary arguments to posix_2str. ........ r45900 | martin.v.loewis | 2006-05-04 16:27:52 +0200 (Thu, 04 May 2006) | 1 line Update checks to consider Windows error numbers. ........ r45913 | thomas.heller | 2006-05-05 20:42:14 +0200 (Fri, 05 May 2006) | 2 lines Export the 'free' standard C function for use in the test suite. ........ r45914 | thomas.heller | 2006-05-05 20:43:24 +0200 (Fri, 05 May 2006) | 3 lines Fix memory leaks in the ctypes test suite, reported by valgrind, by free()ing the memory we allocate. ........ r45915 | thomas.heller | 2006-05-05 20:46:27 +0200 (Fri, 05 May 2006) | 1 line oops - the function is exported as 'my_free', not 'free'. ........ r45916 | thomas.heller | 2006-05-05 21:14:24 +0200 (Fri, 05 May 2006) | 2 lines Clean up. ........ r45920 | george.yoshida | 2006-05-06 15:09:45 +0200 (Sat, 06 May 2006) | 2 lines describe optional arguments for DocFileSuite ........ r45924 | george.yoshida | 2006-05-06 16:16:51 +0200 (Sat, 06 May 2006) | 2 lines Use \versionchanged for the feature change ........ r45925 | martin.v.loewis | 2006-05-06 18:32:54 +0200 (Sat, 06 May 2006) | 1 line Port access, chmod, parts of getcwdu, mkdir, and utime to direct Win32 API. ........ r45926 | martin.v.loewis | 2006-05-06 22:04:08 +0200 (Sat, 06 May 2006) | 2 lines Handle ERROR_ALREADY_EXISTS. ........ r45931 | andrew.kuchling | 2006-05-07 19:12:12 +0200 (Sun, 07 May 2006) | 1 line [Patch #1479977] Revised version of urllib2 HOWTO, edited by John J. Lee ........ r45932 | andrew.kuchling | 2006-05-07 19:14:53 +0200 (Sun, 07 May 2006) | 1 line Minor language edit ........ r45934 | georg.brandl | 2006-05-07 22:44:34 +0200 (Sun, 07 May 2006) | 3 lines Patch #1483395: add new TLDs to cookielib ........ r45936 | martin.v.loewis | 2006-05-08 07:25:56 +0200 (Mon, 08 May 2006) | 2 lines Add missing PyMem_Free. ........ r45938 | georg.brandl | 2006-05-08 19:28:47 +0200 (Mon, 08 May 2006) | 3 lines Add test for rev. 45934. ........ r45939 | georg.brandl | 2006-05-08 19:36:08 +0200 (Mon, 08 May 2006) | 3 lines Patch #1479302: Make urllib2 digest auth and basic auth play together. ........ r45940 | georg.brandl | 2006-05-08 19:48:01 +0200 (Mon, 08 May 2006) | 3 lines Patch #1478993: take advantage of BaseException/Exception split in cookielib ........ r45941 | neal.norwitz | 2006-05-09 07:38:56 +0200 (Tue, 09 May 2006) | 5 lines Micro optimization. In the first case, we know that frame->f_exc_type is NULL, so there's no reason to do anything with it. In the second case, we know frame->f_exc_type is not NULL, so we can just do an INCREF. ........ r45943 | thomas.heller | 2006-05-09 22:20:15 +0200 (Tue, 09 May 2006) | 2 lines Disable a test that is unreliable. ........ r45944 | tim.peters | 2006-05-10 04:43:01 +0200 (Wed, 10 May 2006) | 4 lines Variant of patch #1478292. doctest.register_optionflag(name) shouldn't create a new flag when `name` is already the name of an option flag. ........ r45947 | neal.norwitz | 2006-05-10 08:57:58 +0200 (Wed, 10 May 2006) | 14 lines Fix problems found by Coverity. longobject.c: also fix an ssize_t problem <a> could have been NULL, so hoist the size calc to not use <a>. _ssl.c: under fail: self is DECREF'd, but it would have been NULL. _elementtree.c: delete self if there was an error. _csv.c: I'm not sure if lineterminator could have been anything other than a string. However, other string method calls are checked, so check this one too. ........ r45948 | thomas.wouters | 2006-05-10 17:04:11 +0200 (Wed, 10 May 2006) | 4 lines Ignore reflog.txt, too. ........ r45949 | georg.brandl | 2006-05-10 17:59:06 +0200 (Wed, 10 May 2006) | 3 lines Bug #1482988: indicate more prominently that the Stats class is in the pstats module. ........ r45950 | georg.brandl | 2006-05-10 18:09:03 +0200 (Wed, 10 May 2006) | 2 lines Bug #1485447: subprocess: document that the "cwd" parameter isn't used to find the executable. Misc. other markup fixes. ........ r45952 | georg.brandl | 2006-05-10 18:11:44 +0200 (Wed, 10 May 2006) | 2 lines Bug #1484978: curses.panel: clarify that Panel objects are destroyed on garbage collection. ........ r45954 | georg.brandl | 2006-05-10 18:26:03 +0200 (Wed, 10 May 2006) | 4 lines Patch #1484695: Update the tarfile module to version 0.8. This fixes a couple of issues, notably handling of long file names using the GNU LONGNAME extension. ........ r45955 | georg.brandl | 2006-05-10 19:13:20 +0200 (Wed, 10 May 2006) | 4 lines Patch #721464: pdb.Pdb instances can now be given explicit stdin and stdout arguments, making it possible to redirect input and output for remote debugging. ........ r45956 | andrew.kuchling | 2006-05-10 19:19:04 +0200 (Wed, 10 May 2006) | 1 line Clarify description of exception handling ........ r45957 | georg.brandl | 2006-05-10 22:09:23 +0200 (Wed, 10 May 2006) | 2 lines Fix two small errors in argument lists. ........ r45960 | brett.cannon | 2006-05-11 07:11:33 +0200 (Thu, 11 May 2006) | 5 lines Detect if %zd is supported by printf() during configure and sets PY_FORMAT_SIZE_T appropriately. Removes warnings on OS X under gcc 4.0.1 when PY_FORMAT_SIZE_T is set to "" instead of "z" as is needed. ........ r45963 | neal.norwitz | 2006-05-11 09:51:59 +0200 (Thu, 11 May 2006) | 1 line Don't mask a no memory error with a less meaningful one as discussed on python-checkins ........ r45964 | martin.v.loewis | 2006-05-11 15:28:43 +0200 (Thu, 11 May 2006) | 3 lines Change WindowsError to carry the Win32 error code in winerror, and the DOS error code in errno. Revert changes where WindowsError catch blocks unnecessarily special-case OSError. ........ r45965 | george.yoshida | 2006-05-11 17:53:27 +0200 (Thu, 11 May 2006) | 2 lines Grammar fix ........ r45967 | andrew.kuchling | 2006-05-11 18:32:24 +0200 (Thu, 11 May 2006) | 1 line typo fix ........ r45968 | tim.peters | 2006-05-11 18:37:42 +0200 (Thu, 11 May 2006) | 5 lines BaseThreadedTestCase.setup(): stop special-casing WindowsError. Rev 45964 fiddled with WindowsError, and broke test_bsddb3 on all the Windows buildbot slaves as a result. This should repair it. ........ r45969 | georg.brandl | 2006-05-11 21:57:09 +0200 (Thu, 11 May 2006) | 2 lines Typo fix. ........ r45970 | tim.peters | 2006-05-12 03:57:59 +0200 (Fri, 12 May 2006) | 5 lines SF patch #1473132: Improve docs for tp_clear and tp_traverse, by Collin Winter. Bugfix candidate (but I'm not going to bother). ........ r45974 | martin.v.loewis | 2006-05-12 14:27:28 +0200 (Fri, 12 May 2006) | 4 lines Dynamically allocate path name buffer for Unicode path name in listdir. Fixes #1431582. Stop overallocating MAX_PATH characters for ANSI path names. Stop assigning to errno. ........ r45975 | martin.v.loewis | 2006-05-12 15:57:36 +0200 (Fri, 12 May 2006) | 1 line Move icon files into DLLs dir. Fixes #1477968. ........ r45976 | george.yoshida | 2006-05-12 18:40:11 +0200 (Fri, 12 May 2006) | 2 lines At first there were 6 steps, but one was removed after that. ........ r45977 | martin.v.loewis | 2006-05-12 19:22:04 +0200 (Fri, 12 May 2006) | 1 line Fix alignment error on Itanium. ........ r45978 | george.yoshida | 2006-05-12 19:25:26 +0200 (Fri, 12 May 2006) | 3 lines Duplicated description about the illegal continue usage can be found in nearly the same place. They are same, so keep the original one and remove the later-added one. ........ r45980 | thomas.heller | 2006-05-12 20:16:03 +0200 (Fri, 12 May 2006) | 2 lines Add missing svn properties. ........ r45981 | thomas.heller | 2006-05-12 20:47:35 +0200 (Fri, 12 May 2006) | 1 line set svn properties ........ r45982 | thomas.heller | 2006-05-12 21:31:46 +0200 (Fri, 12 May 2006) | 1 line add svn:eol-style native svn:keywords Id ........ r45987 | gerhard.haering | 2006-05-13 01:49:49 +0200 (Sat, 13 May 2006) | 3 lines Integrated the rest of the pysqlite reference manual into the Python documentation. Ready to be reviewed and improved upon. ........ r45988 | george.yoshida | 2006-05-13 08:53:31 +0200 (Sat, 13 May 2006) | 2 lines Add \exception markup ........ r45990 | martin.v.loewis | 2006-05-13 15:34:04 +0200 (Sat, 13 May 2006) | 2 lines Revert 43315: Printing of %zd must be signed. ........ r45992 | tim.peters | 2006-05-14 01:28:20 +0200 (Sun, 14 May 2006) | 11 lines Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV about "%u", "%lu" and "%zu" formats. Since PyString_FromFormat and PyErr_Format have exactly the same rules (both inherited from PyString_FromFormatV), it would be good if someone with more LaTeX Fu changed one of them to just point to the other. Their docs were way out of synch before this patch, and I just did a mass copy+paste to repair that. Not a backport candidate (this is a new feature). ........ r45993 | tim.peters | 2006-05-14 01:31:05 +0200 (Sun, 14 May 2006) | 2 lines Typo repair. ........ r45994 | tim.peters | 2006-05-14 01:33:19 +0200 (Sun, 14 May 2006) | 2 lines Remove lie in new comment. ........ r45995 | ronald.oussoren | 2006-05-14 21:56:34 +0200 (Sun, 14 May 2006) | 11 lines Rework the build system for osx applications: * Don't use xcodebuild for building PythonLauncher, but use a normal unix makefile. This makes it a lot easier to use the same build flags as for the rest of python (e.g. make a universal version of python launcher) * Convert the mac makefile-s to makefile.in-s and use configure to set makefile variables instead of forwarding them as command-line arguments * Add a C version of pythonw, that we you can use '#!/usr/local/bin/pythonw' * Build IDLE.app using bundlebuilder instead of BuildApplet, that will allow easier modification of the bundle contents later on. ........ r45996 | ronald.oussoren | 2006-05-14 22:35:41 +0200 (Sun, 14 May 2006) | 6 lines A first cut at replacing the icons on MacOS X. This replaces all icons by icons based on the new python.org logo. These are also the first icons that are "proper" OSX icons. These icons were created by Jacob Rus. ........ r45997 | ronald.oussoren | 2006-05-14 23:07:41 +0200 (Sun, 14 May 2006) | 3 lines I missed one small detail in my rewrite of the osx build files: the path to the Python.app template. ........ r45998 | martin.v.loewis | 2006-05-15 07:51:36 +0200 (Mon, 15 May 2006) | 2 lines Fix memory leak. ........ r45999 | neal.norwitz | 2006-05-15 08:48:14 +0200 (Mon, 15 May 2006) | 1 line Move items implemented after a2 into the new a3 section ........ r46000 | neal.norwitz | 2006-05-15 09:04:36 +0200 (Mon, 15 May 2006) | 5 lines - Bug #1487966: Fix SystemError with conditional expression in assignment Most of the test_syntax changes are just updating the numbers. ........ r46001 | neal.norwitz | 2006-05-15 09:17:23 +0200 (Mon, 15 May 2006) | 1 line Patch #1488312, Fix memory alignment problem on SPARC in unicode. Will backport ........ r46003 | martin.v.loewis | 2006-05-15 11:22:27 +0200 (Mon, 15 May 2006) | 3 lines Remove bogus DECREF of self. Change __str__() functions to METH_O. Change WindowsError__str__ to use PyTuple_Pack. ........ r46005 | georg.brandl | 2006-05-15 21:30:35 +0200 (Mon, 15 May 2006) | 3 lines [ 1488881 ] tarfile.py: support for file-objects and bz2 (cp. #1488634) ........ r46007 | tim.peters | 2006-05-15 22:44:10 +0200 (Mon, 15 May 2006) | 9 lines ReadDetectFileobjTest: repair Windows disasters by opening the file object in binary mode. The Windows buildbot slaves shouldn't swap themselves to death anymore. However, test_tarfile may still fail because of a temp directory left behind from a previous failing run. Windows buildbot owners may need to remove that directory by hand. ........ r46009 | tim.peters | 2006-05-15 23:32:25 +0200 (Mon, 15 May 2006) | 3 lines test_directory(): Remove the leftover temp directory that's making the Windows buildbots fail test_tarfile. ........ r46010 | martin.v.loewis | 2006-05-16 09:05:37 +0200 (Tue, 16 May 2006) | 4 lines - Test for sys/statvfs.h before including it, as statvfs is present on some OSX installation, but its header file is not. Will backport to 2.4 ........ r46012 | georg.brandl | 2006-05-16 09:38:27 +0200 (Tue, 16 May 2006) | 3 lines Patch #1435422: zlib's compress and decompress objects now have a copy() method. ........ r46015 | andrew.kuchling | 2006-05-16 18:11:54 +0200 (Tue, 16 May 2006) | 1 line Add item ........ r46016 | andrew.kuchling | 2006-05-16 18:27:31 +0200 (Tue, 16 May 2006) | 3 lines PEP 243 has been withdrawn, so don't refer to it any more. The PyPI upload material has been moved into the section on PEP314. ........ r46017 | george.yoshida | 2006-05-16 19:42:16 +0200 (Tue, 16 May 2006) | 2 lines Update for 'ImportWarning' ........ r46018 | george.yoshida | 2006-05-16 20:07:00 +0200 (Tue, 16 May 2006) | 4 lines Mention that Exception is now a subclass of BaseException. Remove a sentence that says that BaseException inherits from BaseException. (I guess this is just a copy & paste mistake.) ........ r46019 | george.yoshida | 2006-05-16 20:26:10 +0200 (Tue, 16 May 2006) | 2 lines Document ImportWarning ........ r46020 | tim.peters | 2006-05-17 01:22:20 +0200 (Wed, 17 May 2006) | 2 lines Whitespace normalization. ........ r46021 | tim.peters | 2006-05-17 01:24:08 +0200 (Wed, 17 May 2006) | 2 lines Text files missing the SVN eol-style property. ........ r46022 | tim.peters | 2006-05-17 03:30:11 +0200 (Wed, 17 May 2006) | 2 lines PyZlib_copy(), PyZlib_uncopy(): Repair leaks on the normal-case path. ........ r46023 | georg.brandl | 2006-05-17 16:06:07 +0200 (Wed, 17 May 2006) | 3 lines Remove misleading comment about type-class unification. ........ r46024 | georg.brandl | 2006-05-17 16:11:36 +0200 (Wed, 17 May 2006) | 3 lines Apply patch #1489784 from Michael Foord. ........ r46025 | georg.brandl | 2006-05-17 16:18:20 +0200 (Wed, 17 May 2006) | 3 lines Fix typo in os.utime docstring (patch #1490189) ........ r46026 | georg.brandl | 2006-05-17 16:26:50 +0200 (Wed, 17 May 2006) | 3 lines Patch #1490224: set time.altzone correctly on Cygwin. ........ r46027 | georg.brandl | 2006-05-17 16:45:06 +0200 (Wed, 17 May 2006) | 4 lines Add global debug flag to cookielib to avoid heavy dependency on the logging module. Resolves #1484758. ........ r46028 | georg.brandl | 2006-05-17 16:56:04 +0200 (Wed, 17 May 2006) | 3 lines Patch #1486962: Several bugs in the turtle Tk demo module were fixed and several features added, such as speed and geometry control. ........ r46029 | georg.brandl | 2006-05-17 17:17:00 +0200 (Wed, 17 May 2006) | 4 lines Delay-import some large modules to speed up urllib2 import. (fixes #1484793). ........ r46030 | georg.brandl | 2006-05-17 17:51:16 +0200 (Wed, 17 May 2006) | 3 lines Patch #1180296: improve locale string formatting functions ........ r46032 | tim.peters | 2006-05-18 04:06:40 +0200 (Thu, 18 May 2006) | 2 lines Whitespace normalization. ........ r46033 | georg.brandl | 2006-05-18 08:11:19 +0200 (Thu, 18 May 2006) | 3 lines Amendments to patch #1484695. ........ r46034 | georg.brandl | 2006-05-18 08:18:06 +0200 (Thu, 18 May 2006) | 3 lines Remove unused import. ........ r46035 | georg.brandl | 2006-05-18 08:33:27 +0200 (Thu, 18 May 2006) | 3 lines Fix test_locale for platforms without a default thousands separator. ........ r46036 | neal.norwitz | 2006-05-18 08:51:46 +0200 (Thu, 18 May 2006) | 1 line Little cleanup ........ r46037 | georg.brandl | 2006-05-18 09:01:27 +0200 (Thu, 18 May 2006) | 4 lines Bug #1462152: file() now checks more thoroughly for invalid mode strings and removes a possible "U" before passing the mode to the C library function. ........ r46038 | georg.brandl | 2006-05-18 09:20:05 +0200 (Thu, 18 May 2006) | 3 lines Bug #1490688: properly document %e, %f, %g format subtleties. ........ r46039 | vinay.sajip | 2006-05-18 09:28:58 +0200 (Thu, 18 May 2006) | 1 line Changed status from "beta" to "production"; since logging has been part of the stdlib since 2.3, it should be safe to make this assertion ;-) ........ r46040 | ronald.oussoren | 2006-05-18 11:04:15 +0200 (Thu, 18 May 2006) | 2 lines Fix some minor issues with the generated application bundles on MacOSX ........ r46041 | andrew.kuchling | 2006-05-19 02:03:55 +0200 (Fri, 19 May 2006) | 1 line Typo fix; add clarifying word ........ r46044 | neal.norwitz | 2006-05-19 08:31:23 +0200 (Fri, 19 May 2006) | 3 lines Fix #132 from Coverity, retval could have been derefed if a continue inside a try failed. ........ r46045 | neal.norwitz | 2006-05-19 08:43:50 +0200 (Fri, 19 May 2006) | 2 lines Fix #1474677, non-keyword argument following keyword. ........ r46046 | neal.norwitz | 2006-05-19 09:00:58 +0200 (Fri, 19 May 2006) | 4 lines Bug/Patch #1481770: Use .so extension for shared libraries on HP-UX for ia64. I suppose this could be backported if anyone cares. ........ r46047 | neal.norwitz | 2006-05-19 09:05:01 +0200 (Fri, 19 May 2006) | 7 lines Oops, I forgot to include this file in the last commit (46046): Bug/Patch #1481770: Use .so extension for shared libraries on HP-UX for ia64. I suppose this could be backported if anyone cares. ........ r46050 | ronald.oussoren | 2006-05-19 20:17:31 +0200 (Fri, 19 May 2006) | 6 lines * Change working directory to the users home directory, that makes the file open/save dialogs more useable. * Don't use argv emulator, its not needed for idle. ........ r46052 | tim.peters | 2006-05-19 21:16:34 +0200 (Fri, 19 May 2006) | 2 lines Whitespace normalization. ........ r46054 | ronald.oussoren | 2006-05-20 08:17:01 +0200 (Sat, 20 May 2006) | 9 lines Fix bug #1000914 (again). This patches a file that is generated by bgen, however the code is now the same as a current copy of bgen would generate. Without this patch most types in the Carbon.CF module are unusable. I haven't managed to coax bgen into generating a complete copy of _CFmodule.c yet :-(, hence the manual patching. ........ r46055 | george.yoshida | 2006-05-20 17:36:19 +0200 (Sat, 20 May 2006) | 3 lines - markup fix - add clarifying words ........ r46057 | george.yoshida | 2006-05-20 18:29:14 +0200 (Sat, 20 May 2006) | 3 lines - Add 'as' and 'with' as new keywords in 2.5. - Regenerate keyword lists with reswords.py. ........ r46058 | george.yoshida | 2006-05-20 20:07:26 +0200 (Sat, 20 May 2006) | 2 lines Apply patch #1492147 from Mike Foord. ........ r46059 | andrew.kuchling | 2006-05-20 21:25:16 +0200 (Sat, 20 May 2006) | 1 line Minor edits ........ r46061 | george.yoshida | 2006-05-21 06:22:59 +0200 (Sun, 21 May 2006) | 2 lines Fix the TeX compile error. ........ r46062 | george.yoshida | 2006-05-21 06:40:32 +0200 (Sun, 21 May 2006) | 2 lines Apply patch #1492255 from Mike Foord. ........ r46063 | martin.v.loewis | 2006-05-22 10:48:14 +0200 (Mon, 22 May 2006) | 1 line Patch 1490384: New Icons for the PC build. ........ r46064 | martin.v.loewis | 2006-05-22 11:15:18 +0200 (Mon, 22 May 2006) | 1 line Patch #1492356: Port to Windows CE (patch set 1). ........ r46065 | tim.peters | 2006-05-22 13:29:41 +0200 (Mon, 22 May 2006) | 4 lines Define SIZEOF_{DOUBLE,FLOAT} on Windows. Else Michael Hudson's nice gimmicks for IEEE special values (infinities, NaNs) don't work. ........ r46070 | bob.ippolito | 2006-05-22 16:31:24 +0200 (Mon, 22 May 2006) | 2 lines GzipFile.readline performance improvement (~30-40%), patch #1281707 ........ r46071 | bob.ippolito | 2006-05-22 17:22:46 +0200 (Mon, 22 May 2006) | 1 line Revert gzip readline performance patch #1281707 until a more generic performance improvement can be found ........ r46073 | fredrik.lundh | 2006-05-22 17:35:12 +0200 (Mon, 22 May 2006) | 4 lines docstring tweaks: count counts non-overlapping substrings, not total number of occurences ........ r46075 | bob.ippolito | 2006-05-22 17:59:12 +0200 (Mon, 22 May 2006) | 1 line Apply revised patch for GzipFile.readline performance #1281707 ........ r46076 | fredrik.lundh | 2006-05-22 18:29:30 +0200 (Mon, 22 May 2006) | 3 lines needforspeed: speed up unicode repeat, unicode string copy ........ r46079 | fredrik.lundh | 2006-05-22 19:12:58 +0200 (Mon, 22 May 2006) | 4 lines needforspeed: use memcpy for "long" strings; use a better algorithm for long repeats. ........ r46084 | tim.peters | 2006-05-22 21:17:04 +0200 (Mon, 22 May 2006) | 7 lines PyUnicode_Join(): Recent code changes introduced new compiler warnings on Windows (signed vs unsigned mismatch in comparisons). Cleaned that up by switching more locals to Py_ssize_t. Simplified overflow checking (it can _be_ simpler because while these things are declared as Py_ssize_t, then should in fact never be negative). ........ r46085 | tim.peters | 2006-05-23 07:47:16 +0200 (Tue, 23 May 2006) | 3 lines unicode_repeat(): Change type of local to Py_ssize_t, since that's what it should be. ........ r46094 | fredrik.lundh | 2006-05-23 12:10:57 +0200 (Tue, 23 May 2006) | 3 lines needforspeed: check first *and* last character before doing a full memcmp ........ r46095 | fredrik.lundh | 2006-05-23 12:12:21 +0200 (Tue, 23 May 2006) | 4 lines needforspeed: fixed unicode "in" operator to use same implementation approach as find/index ........ r46096 | richard.jones | 2006-05-23 12:37:38 +0200 (Tue, 23 May 2006) | 7 lines Merge from rjones-funccall branch. Applied patch zombie-frames-2.diff from sf patch 876206 with updates for Python 2.5 and also modified to retain the free_list to avoid the 67% slow-down in pybench recursion test. 5% speed up in function call pybench. ........ r46098 | ronald.oussoren | 2006-05-23 13:04:24 +0200 (Tue, 23 May 2006) | 2 lines Avoid creating a mess when installing a framework for the second time. ........ r46101 | georg.brandl | 2006-05-23 13:17:21 +0200 (Tue, 23 May 2006) | 3 lines PyErr_NewException now accepts a tuple of base classes as its "base" parameter. ........ r46103 | ronald.oussoren | 2006-05-23 13:47:16 +0200 (Tue, 23 May 2006) | 3 lines Disable linking extensions with -lpython2.5 for darwin. This should fix bug #1487105. ........ r46104 | ronald.oussoren | 2006-05-23 14:01:11 +0200 (Tue, 23 May 2006) | 6 lines Patch #1488098. This patchs makes it possible to create a universal build on OSX 10.4 and use the result to build extensions on 10.3. It also makes it possible to override the '-arch' and '-isysroot' compiler arguments for specific extensions. ........ r46108 | andrew.kuchling | 2006-05-23 14:44:36 +0200 (Tue, 23 May 2006) | 1 line Add some items; mention the sprint ........ r46109 | andrew.kuchling | 2006-05-23 14:47:01 +0200 (Tue, 23 May 2006) | 1 line Mention string improvements ........ r46110 | andrew.kuchling | 2006-05-23 14:49:35 +0200 (Tue, 23 May 2006) | 4 lines Use 'speed' instead of 'performance', because I agree with the argument at http://zestyping.livejournal.com/193260.html that 'erformance' really means something more general. ........ r46113 | ronald.oussoren | 2006-05-23 17:09:57 +0200 (Tue, 23 May 2006) | 2 lines An improved script for building the binary distribution on MacOSX. ........ r46128 | richard.jones | 2006-05-23 20:28:17 +0200 (Tue, 23 May 2006) | 3 lines Applied patch 1337051 by Neal Norwitz, saving 4 ints on frame objects. ........ r46129 | richard.jones | 2006-05-23 20:32:11 +0200 (Tue, 23 May 2006) | 1 line fix broken merge ........ r46130 | bob.ippolito | 2006-05-23 20:41:17 +0200 (Tue, 23 May 2006) | 1 line Update Misc/NEWS for gzip patch #1281707 ........ r46131 | bob.ippolito | 2006-05-23 20:43:47 +0200 (Tue, 23 May 2006) | 1 line Update Misc/NEWS for gzip patch #1281707 ........ r46132 | fredrik.lundh | 2006-05-23 20:44:25 +0200 (Tue, 23 May 2006) | 7 lines needforspeed: use append+reverse for rsplit, use "bloom filters" to speed up splitlines and strip with charsets; etc. rsplit is now as fast as split in all our tests (reverse takes no time at all), and splitlines() is nearly as fast as a plain split("\n") in our tests. and we're not done yet... ;-) ........ r46133 | tim.peters | 2006-05-23 20:45:30 +0200 (Tue, 23 May 2006) | 38 lines Bug #1334662 / patch #1335972: int(string, base) wrong answers. In rare cases of strings specifying true values near sys.maxint, and oddball bases (not decimal or a power of 2), int(string, base) could deliver insane answers. This repairs all such problems, and also speeds string->int significantly. On my box, here are % speedups for decimal strings of various lengths: length speedup ------ ------- 1 12.4% 2 15.7% 3 20.6% 4 28.1% 5 33.2% 6 37.5% 7 41.9% 8 46.3% 9 51.2% 10 19.5% 11 19.9% 12 23.9% 13 23.7% 14 23.3% 15 24.9% 16 25.3% 17 28.3% 18 27.9% 19 35.7% Note that the difference between 9 and 10 is the difference between short and long Python ints on a 32-bit box. The patch doesn't actually do anything to speed conversion to long: the speedup is due to detecting "unsigned long" overflow more quickly. This is a bugfix candidate, but it's a non-trivial patch and it would be painful to separate the "bug fix" from the "speed up" parts. ........ r46134 | bob.ippolito | 2006-05-23 20:46:41 +0200 (Tue, 23 May 2006) | 1 line Patch #1493701: performance enhancements for struct module. ........ r46136 | andrew.kuchling | 2006-05-23 21:00:45 +0200 (Tue, 23 May 2006) | 1 line Remove duplicate item ........ r46141 | bob.ippolito | 2006-05-23 21:09:51 +0200 (Tue, 23 May 2006) | 1 line revert #1493701 ........ r46142 | bob.ippolito | 2006-05-23 21:11:34 +0200 (Tue, 23 May 2006) | 1 line patch #1493701: performance enhancements for struct module ........ r46144 | bob.ippolito | 2006-05-23 21:12:41 +0200 (Tue, 23 May 2006) | 1 line patch #1493701: performance enhancements for struct module ........ r46148 | bob.ippolito | 2006-05-23 21:25:52 +0200 (Tue, 23 May 2006) | 1 line fix linking issue, warnings, in struct ........ r46149 | andrew.kuchling | 2006-05-23 21:29:38 +0200 (Tue, 23 May 2006) | 1 line Add two items ........ r46150 | bob.ippolito | 2006-05-23 21:31:23 +0200 (Tue, 23 May 2006) | 1 line forward declaration for PyStructType ........ r46151 | bob.ippolito | 2006-05-23 21:32:25 +0200 (Tue, 23 May 2006) | 1 line fix typo in _struct ........ r46152 | andrew.kuchling | 2006-05-23 21:32:35 +0200 (Tue, 23 May 2006) | 1 line Add item ........ r46153 | tim.peters | 2006-05-23 21:34:37 +0200 (Tue, 23 May 2006) | 3 lines Get the Windows build working again (recover from `struct` module changes). ........ r46155 | fredrik.lundh | 2006-05-23 21:47:35 +0200 (Tue, 23 May 2006) | 3 lines return 0 on misses, not -1. ........ r46156 | tim.peters | 2006-05-23 23:51:35 +0200 (Tue, 23 May 2006) | 4 lines test_struct grew weird behavior under regrtest.py -R, due to a module-level cache. Clearing the cache should make it stop showing up in refleak reports. ........ r46157 | tim.peters | 2006-05-23 23:54:23 +0200 (Tue, 23 May 2006) | 2 lines Whitespace normalization. ........ r46158 | tim.peters | 2006-05-23 23:55:53 +0200 (Tue, 23 May 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46161 | fredrik.lundh | 2006-05-24 12:20:36 +0200 (Wed, 24 May 2006) | 3 lines use Py_ssize_t for string indexes (thanks, neal!) ........ r46173 | fredrik.lundh | 2006-05-24 16:28:11 +0200 (Wed, 24 May 2006) | 14 lines needforspeed: use "fastsearch" for count and findstring helpers. this results in a 2.5x speedup on the stringbench count tests, and a 20x (!) speedup on the stringbench search/find/contains test, compared to 2.5a2. for more on the algorithm, see: http://effbot.org/zone/stringlib.htm if you get weird results, you can disable the new algoritm by undefining USE_FAST in Objects/unicodeobject.c. enjoy /F ........ r46182 | fredrik.lundh | 2006-05-24 17:11:01 +0200 (Wed, 24 May 2006) | 3 lines needforspeedindeed: use fastsearch also for __contains__ ........ r46184 | bob.ippolito | 2006-05-24 17:32:06 +0200 (Wed, 24 May 2006) | 1 line refactor unpack, add unpack_from ........ r46189 | fredrik.lundh | 2006-05-24 18:35:18 +0200 (Wed, 24 May 2006) | 4 lines needforspeed: refactored the replace code slightly; special-case constant-length changes; use fastsearch to locate the first match. ........ r46198 | andrew.dalke | 2006-05-24 20:55:37 +0200 (Wed, 24 May 2006) | 10 lines Added a slew of test for string replace, based various corner cases from the Need For Speed sprint coding. Includes commented out overflow tests which will be uncommented once the code is fixed. This test will break the 8-bit string tests because "".replace("", "A") == "" when it should == "A" We have a fix for it, which should be added tomorrow. ........ r46200 | tim.peters | 2006-05-24 22:27:18 +0200 (Wed, 24 May 2006) | 2 lines We can't leave the checked-in tests broken. ........ r46201 | tim.peters | 2006-05-24 22:29:44 +0200 (Wed, 24 May 2006) | 2 lines Whitespace normalization. ........ r46202 | tim.peters | 2006-05-24 23:00:45 +0200 (Wed, 24 May 2006) | 4 lines Disable the damn empty-string replace test -- it can't be make to pass now for unicode if it passes for str, or vice versa. ........ r46203 | tim.peters | 2006-05-24 23:10:40 +0200 (Wed, 24 May 2006) | 58 lines Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. ``long(str, base)`` is now up to 6x faster for non-power-of-2 bases. The largest speedup is for inputs with about 1000 decimal digits. Conversion from non-power-of-2 bases remains quadratic-time in the number of input digits (it was and remains linear-time for bases 2, 4, 8, 16 and 32). Speedups at various lengths for decimal inputs, comparing 2.4.3 with current trunk. Note that it's actually a bit slower for 1-digit strings: len speedup ---- ------- 1 -4.5% 2 4.6% 3 8.3% 4 12.7% 5 16.9% 6 28.6% 7 35.5% 8 44.3% 9 46.6% 10 55.3% 11 65.7% 12 77.7% 13 73.4% 14 75.3% 15 85.2% 16 103.0% 17 95.1% 18 112.8% 19 117.9% 20 128.3% 30 174.5% 40 209.3% 50 236.3% 60 254.3% 70 262.9% 80 295.8% 90 297.3% 100 324.5% 200 374.6% 300 403.1% 400 391.1% 500 388.7% 600 440.6% 700 468.7% 800 498.0% 900 507.2% 1000 501.2% 2000 450.2% 3000 463.2% 4000 452.5% 5000 440.6% 6000 439.6% 7000 424.8% 8000 418.1% 9000 417.7% ........ r46204 | andrew.kuchling | 2006-05-25 02:23:03 +0200 (Thu, 25 May 2006) | 1 line Minor edits; add an item ........ r46205 | fred.drake | 2006-05-25 04:42:25 +0200 (Thu, 25 May 2006) | 3 lines fix broken links in PDF (SF patch #1281291, contributed by Rory Yorke) ........ r46208 | walter.doerwald | 2006-05-25 10:53:28 +0200 (Thu, 25 May 2006) | 2 lines Replace tab inside comment with space. ........ r46209 | thomas.wouters | 2006-05-25 13:25:51 +0200 (Thu, 25 May 2006) | 4 lines Fix #1488915, Multiple dots in relative import statement raise SyntaxError. ........ r46210 | thomas.wouters | 2006-05-25 13:26:25 +0200 (Thu, 25 May 2006) | 5 lines Update graminit.c for the fix for #1488915, Multiple dots in relative import statement raise SyntaxError, and add testcase. ........ r46211 | andrew.kuchling | 2006-05-25 14:27:59 +0200 (Thu, 25 May 2006) | 1 line Add entry; and fix a typo ........ r46214 | fredrik.lundh | 2006-05-25 17:22:03 +0200 (Thu, 25 May 2006) | 7 lines needforspeed: speed up upper and lower for 8-bit string objects. (the unicode versions of these are still 2x faster on windows, though...) based on work by Andrew Dalke, with tweaks by yours truly. ........ r46216 | fredrik.lundh | 2006-05-25 17:49:45 +0200 (Thu, 25 May 2006) | 5 lines needforspeed: make new upper/lower work properly for single-character strings too... (thanks to georg brandl for spotting the exact problem faster than anyone else) ........ r46217 | kristjan.jonsson | 2006-05-25 17:53:30 +0200 (Thu, 25 May 2006) | 1 line Added a new macro, Py_IS_FINITE(X). On windows there is an intrinsic for this and it is more efficient than to use !Py_IS_INFINITE(X) && !Py_IS_NAN(X). No change on other platforms ........ r46219 | fredrik.lundh | 2006-05-25 18:10:12 +0200 (Thu, 25 May 2006) | 4 lines needforspeed: _toupper/_tolower is a SUSv2 thing; fall back on ISO C versions if they're not defined. ........ r46220 | andrew.kuchling | 2006-05-25 18:23:15 +0200 (Thu, 25 May 2006) | 1 line Fix comment typos ........ r46221 | andrew.dalke | 2006-05-25 18:30:52 +0200 (Thu, 25 May 2006) | 2 lines Added tests for implementation error we came up with in the need for speed sprint. ........ r46222 | andrew.kuchling | 2006-05-25 18:34:54 +0200 (Thu, 25 May 2006) | 1 line Fix another typo ........ r46223 | kristjan.jonsson | 2006-05-25 18:39:27 +0200 (Thu, 25 May 2006) | 1 line Fix incorrect documentation for the Py_IS_FINITE(X) macro. ........ r46224 | fredrik.lundh | 2006-05-25 18:46:54 +0200 (Thu, 25 May 2006) | 3 lines needforspeed: check for overflow in replace (from Andrew Dalke) ........ r46226 | fredrik.lundh | 2006-05-25 19:08:14 +0200 (Thu, 25 May 2006) | 5 lines needforspeed: new replace implementation by Andrew Dalke. replace is now about 3x faster on my machine, for the replace tests from string- bench. ........ r46227 | tim.peters | 2006-05-25 19:34:03 +0200 (Thu, 25 May 2006) | 5 lines A new table to help string->integer conversion was added yesterday to both mystrtoul.c and longobject.c. Share the table instead. Also cut its size by 64 entries (they had been used for an inscrutable trick originally, but the code no longer tries to use that trick). ........ r46229 | andrew.dalke | 2006-05-25 19:53:00 +0200 (Thu, 25 May 2006) | 11 lines Fixed problem identified by Georg. The special-case in-place code for replace made a copy of the string using PyString_FromStringAndSize(s, n) and modify the copied string in-place. However, 1 (and 0) character strings are shared from a cache. This cause "A".replace("A", "a") to change the cached version of "A" -- used by everyone. Now may the copy with NULL as the string and do the memcpy manually. I've added regression tests to check if this happens in the future. Perhaps there should be a PyString_Copy for this case? ........ r46230 | fredrik.lundh | 2006-05-25 19:55:31 +0200 (Thu, 25 May 2006) | 4 lines needforspeed: use "fastsearch" for count. this results in a 3x speedup for the related stringbench tests. ........ r46231 | andrew.dalke | 2006-05-25 20:03:25 +0200 (Thu, 25 May 2006) | 4 lines Code had returned an ssize_t, upcast to long, then converted with PyInt_FromLong. Now using PyInt_FromSsize_t. ........ r46233 | andrew.kuchling | 2006-05-25 20:11:16 +0200 (Thu, 25 May 2006) | 1 line Comment typo ........ r46234 | andrew.dalke | 2006-05-25 20:18:39 +0200 (Thu, 25 May 2006) | 4 lines Added overflow test for adding two (very) large strings where the new string is over max Py_ssize_t. I have no way to test it on my box or any box I have access to. At least it doesn't break anything. ........ r46235 | bob.ippolito | 2006-05-25 20:20:23 +0200 (Thu, 25 May 2006) | 1 line Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm ........ r46238 | georg.brandl | 2006-05-25 20:44:09 +0200 (Thu, 25 May 2006) | 3 lines Guard the _active.remove() call to avoid errors when there is no _active list. ........ r46239 | fredrik.lundh | 2006-05-25 20:44:29 +0200 (Thu, 25 May 2006) | 4 lines needforspeed: use fastsearch also for find/index and contains. the related tests are now about 10x faster. ........ r46240 | bob.ippolito | 2006-05-25 20:44:50 +0200 (Thu, 25 May 2006) | 1 line Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) ........ r46241 | jack.diederich | 2006-05-25 20:47:15 +0200 (Thu, 25 May 2006) | 1 line * eliminate warning by reverting tmp_s type to 'const char*' ........ r46242 | bob.ippolito | 2006-05-25 21:03:19 +0200 (Thu, 25 May 2006) | 1 line Fix Cygwin compiler issue ........ r46243 | bob.ippolito | 2006-05-25 21:15:27 +0200 (Thu, 25 May 2006) | 1 line fix a struct regression where long would be returned for short unsigned integers ........ r46244 | georg.brandl | 2006-05-25 21:15:31 +0200 (Thu, 25 May 2006) | 4 lines Replace PyObject_CallFunction calls with only object args with PyObject_CallFunctionObjArgs, which is 30% faster. ........ r46245 | fredrik.lundh | 2006-05-25 21:19:05 +0200 (Thu, 25 May 2006) | 3 lines needforspeed: use insert+reverse instead of append ........ r46246 | bob.ippolito | 2006-05-25 21:33:38 +0200 (Thu, 25 May 2006) | 1 line Use LONG_MIN and LONG_MAX to check Python integer bounds instead of the incorrect INT_MIN and INT_MAX ........ r46248 | bob.ippolito | 2006-05-25 21:56:56 +0200 (Thu, 25 May 2006) | 1 line Use faster struct pack/unpack functions for the endian table that matches the host's ........ r46249 | bob.ippolito | 2006-05-25 21:59:56 +0200 (Thu, 25 May 2006) | 1 line enable darwin/x86 support for libffi and hence ctypes (doesn't yet support --enable-universalsdk) ........ r46252 | georg.brandl | 2006-05-25 22:28:10 +0200 (Thu, 25 May 2006) | 4 lines Someone seems to just have copy-pasted the docs of tp_compare to tp_richcompare ;) ........ r46253 | brett.cannon | 2006-05-25 22:44:08 +0200 (Thu, 25 May 2006) | 2 lines Swap out bare malloc()/free() use for PyMem_MALLOC()/PyMem_FREE() . ........ r46254 | bob.ippolito | 2006-05-25 22:52:38 +0200 (Thu, 25 May 2006) | 1 line squelch gcc4 darwin/x86 compiler warnings ........ r46255 | bob.ippolito | 2006-05-25 23:09:45 +0200 (Thu, 25 May 2006) | 1 line fix test_float regression and 64-bit size mismatch issue ........ r46256 | georg.brandl | 2006-05-25 23:11:56 +0200 (Thu, 25 May 2006) | 3 lines Add a x-ref to newer calling APIs. ........ r46257 | ronald.oussoren | 2006-05-25 23:30:54 +0200 (Thu, 25 May 2006) | 2 lines Fix minor typo in prep_cif.c ........ r46259 | brett.cannon | 2006-05-25 23:33:11 +0200 (Thu, 25 May 2006) | 4 lines Change test_values so that it compares the lowercasing of group names since getgrall() can return all lowercase names while getgrgid() returns proper casing. Discovered on Ubuntu 5.04 (custom). ........ r46261 | tim.peters | 2006-05-25 23:50:17 +0200 (Thu, 25 May 2006) | 7 lines Some Win64 pre-release in 2000 didn't support QueryPerformanceCounter(), but we believe Win64 does support it now. So use in time.clock(). It would be peachy if someone with a Win64 box tried this ;-) ........ r46262 | tim.peters | 2006-05-25 23:52:19 +0200 (Thu, 25 May 2006) | 2 lines Whitespace normalization. ........ r46263 | bob.ippolito | 2006-05-25 23:58:05 +0200 (Thu, 25 May 2006) | 1 line Add missing files from x86 darwin ctypes patch ........ r46264 | brett.cannon | 2006-05-26 00:00:14 +0200 (Fri, 26 May 2006) | 2 lines Move over to use of METH_O and METH_NOARGS. ........ r46265 | tim.peters | 2006-05-26 00:25:25 +0200 (Fri, 26 May 2006) | 3 lines Repair idiot typo, and complete the job of trying to use the Windows time.clock() implementation on Win64. ........ r46266 | tim.peters | 2006-05-26 00:28:46 +0200 (Fri, 26 May 2006) | 9 lines Patch #1494387: SVN longobject.c compiler warnings The SIGCHECK macro defined here has always been bizarre, but it apparently causes compiler warnings on "Sun Studio 11". I believe the warnings are bogus, but it doesn't hurt to make the macro definition saner. Bugfix candidate (but I'm not going to bother). ........ r46268 | fredrik.lundh | 2006-05-26 01:27:53 +0200 (Fri, 26 May 2006) | 8 lines needforspeed: partition for 8-bit strings. for some simple tests, this is on par with a corresponding find, and nearly twice as fast as split(sep, 1) full tests, a unicode version, and documentation will follow to- morrow. ........ r46271 | andrew.kuchling | 2006-05-26 03:46:22 +0200 (Fri, 26 May 2006) | 1 line Add Soc student ........ r46272 | ronald.oussoren | 2006-05-26 10:41:25 +0200 (Fri, 26 May 2006) | 3 lines Without this patch OSX users couldn't add new help sources because the code tried to update one item in a tuple. ........ r46273 | fredrik.lundh | 2006-05-26 10:54:28 +0200 (Fri, 26 May 2006) | 5 lines needforspeed: partition implementation, part two. feel free to improve the documentation and the docstrings. ........ r46274 | georg.brandl | 2006-05-26 11:05:54 +0200 (Fri, 26 May 2006) | 3 lines Clarify docs for str.partition(). ........ r46278 | fredrik.lundh | 2006-05-26 11:46:59 +0200 (Fri, 26 May 2006) | 5 lines needforspeed: use METH_O for argument handling, which made partition some ~15% faster for the current tests (which is noticable faster than a corre- sponding find call). thanks to neal-who-never-sleeps for the tip. ........ r46280 | fredrik.lundh | 2006-05-26 12:27:17 +0200 (Fri, 26 May 2006) | 5 lines needforspeed: use Py_ssize_t for the fastsearch counter and skip length (thanks, neal!). and yes, I've verified that this doesn't slow things down ;-) ........ r46285 | andrew.dalke | 2006-05-26 13:11:38 +0200 (Fri, 26 May 2006) | 2 lines Added a few more test cases for whitespace split. These strings have leading whitespace. ........ r46286 | jack.diederich | 2006-05-26 13:15:17 +0200 (Fri, 26 May 2006) | 1 line use Py_ssize_t in places that may need it ........ r46287 | andrew.dalke | 2006-05-26 13:15:22 +0200 (Fri, 26 May 2006) | 2 lines Added split whitespace checks for characters other than space. ........ r46288 | ronald.oussoren | 2006-05-26 13:17:55 +0200 (Fri, 26 May 2006) | 2 lines Fix buglet in postinstall script, it would generate an invalid .cshrc file. ........ r46290 | georg.brandl | 2006-05-26 13:26:11 +0200 (Fri, 26 May 2006) | 3 lines Add "partition" to UserString. ........ r46291 | fredrik.lundh | 2006-05-26 13:29:39 +0200 (Fri, 26 May 2006) | 5 lines needforspeed: added Py_LOCAL macro, based on the LOCAL macro used for SRE and others. applied Py_LOCAL to relevant portion of ceval, which gives a 1-2% speedup on my machine. ymmv. ........ r46292 | jack.diederich | 2006-05-26 13:37:20 +0200 (Fri, 26 May 2006) | 1 line when generating python code prefer to generate valid python code ........ r46293 | fredrik.lundh | 2006-05-26 13:38:15 +0200 (Fri, 26 May 2006) | 3 lines use Py_LOCAL also for string and unicode objects ........ r46294 | ronald.oussoren | 2006-05-26 13:38:39 +0200 (Fri, 26 May 2006) | 12 lines - Search the sqlite specific search directories after the normal include directories when looking for the version of sqlite to use. - On OSX: * Extract additional include and link directories from the CFLAGS and LDFLAGS, if the user has bothered to specify them we might as wel use them. * Add '-Wl,-search_paths_first' to the extra_link_args for readline and sqlite. This makes it possible to use a static library to override the system provided dynamic library. ........ r46295 | ronald.oussoren | 2006-05-26 13:43:26 +0200 (Fri, 26 May 2006) | 6 lines Integrate installing a framework in the 'make install' target. Until now users had to use 'make frameworkinstall' to install python when it is configured with '--enable-framework'. This tends to confuse users that don't hunt for readme files hidden in platform specific directories :-) ........ r46297 | fredrik.lundh | 2006-05-26 13:54:04 +0200 (Fri, 26 May 2006) | 4 lines needforspeed: added PY_LOCAL_AGGRESSIVE macro to enable "aggressive" LOCAL inlining; also added some missing whitespace ........ r46298 | andrew.kuchling | 2006-05-26 14:01:44 +0200 (Fri, 26 May 2006) | 1 line Typo fixes ........ r46299 | fredrik.lundh | 2006-05-26 14:01:49 +0200 (Fri, 26 May 2006) | 4 lines Py_LOCAL shouldn't be used for data; it works for some .NET 2003 compilers, but Trent's copy thinks that it's an anachronism... ........ r46300 | martin.blais | 2006-05-26 14:03:27 +0200 (Fri, 26 May 2006) | 12 lines Support for buffer protocol for socket and struct. * Added socket.recv_buf() and socket.recvfrom_buf() methods, that use the buffer protocol (send and sendto already did). * Added struct.pack_to(), that is the corresponding buffer compatible method to unpack_from(). * Fixed minor typos in arraymodule. ........ r46302 | ronald.oussoren | 2006-05-26 14:23:20 +0200 (Fri, 26 May 2006) | 6 lines - Remove previous version of the binary distribution script for OSX - Some small bugfixes for the IDLE.app wrapper - Tweaks to build-installer to ensure that python gets build in the right way, including sqlite3. - Updated readme files ........ r46305 | tim.peters | 2006-05-26 14:26:21 +0200 (Fri, 26 May 2006) | 2 lines Whitespace normalization. ........ r46307 | andrew.dalke | 2006-05-26 14:28:15 +0200 (Fri, 26 May 2006) | 7 lines I like tests. The new split functions use a preallocated list. Added tests which exceed the preallocation size, to exercise list appends/resizes. Also added more edge case tests. ........ r46308 | andrew.dalke | 2006-05-26 14:31:00 +0200 (Fri, 26 May 2006) | 2 lines Test cases for off-by-one errors in string split with multicharacter pattern. ........ r46309 | tim.peters | 2006-05-26 14:31:20 +0200 (Fri, 26 May 2006) | 2 lines Whitespace normalization. ........ r46313 | andrew.kuchling | 2006-05-26 14:39:48 +0200 (Fri, 26 May 2006) | 1 line Add str.partition() ........ r46314 | bob.ippolito | 2006-05-26 14:52:53 +0200 (Fri, 26 May 2006) | 1 line quick hack to fix busted binhex test ........ r46316 | andrew.dalke | 2006-05-26 15:05:55 +0200 (Fri, 26 May 2006) | 2 lines Added more rstrip tests, including for prealloc'ed arrays ........ r46320 | bob.ippolito | 2006-05-26 15:15:44 +0200 (Fri, 26 May 2006) | 1 line fix #1229380 No struct.pack exception for some out of range integers ........ r46325 | tim.peters | 2006-05-26 15:39:17 +0200 (Fri, 26 May 2006) | 2 lines Use open() to open files (was using file()). ........ r46327 | andrew.dalke | 2006-05-26 16:00:45 +0200 (Fri, 26 May 2006) | 37 lines Changes to string.split/rsplit on whitespace to preallocate space in the results list. Originally it allocated 0 items and used the list growth during append. Now it preallocates 12 items so the first few appends don't need list reallocs. ("Here are some words ."*2).split(None, 1) is 7% faster ("Here are some words ."*2).split() is is 15% faster (Your milage may vary, see dealership for details.) File parsing like this for line in f: count += len(line.split()) is also about 15% faster. There is a slowdown of about 3% for large strings because of the additional overhead of checking if the append is to a preallocated region of the list or not. This will be the rare case. It could be improved with special case code but we decided it was not useful enough. There is a cost of 12*sizeof(PyObject *) bytes per list. For the normal case of file parsing this is not a problem because of the lists have a short lifetime. We have not come up with cases where this is a problem in real life. I chose 12 because human text averages about 11 words per line in books, one of my data sets averages 6.2 words with a final peak at 11 words per line, and I work with a tab delimited data set with 8 tabs per line (or 9 words per line). 12 encompasses all of these. Also changed the last rstrip code to append then reverse, rather than doing insert(0). The strip() and rstrip() times are now comparable. ........ r46328 | tim.peters | 2006-05-26 16:02:05 +0200 (Fri, 26 May 2006) | 5 lines Explicitly close files. I'm trying to stop the frequent spurious test_tarfile failures on Windows buildbots, but it's hard to know how since the regrtest failure output is useless here, and it never fails when a buildbot slave runs test_tarfile the second time in verbose mode. ........ r46329 | andrew.kuchling | 2006-05-26 16:03:41 +0200 (Fri, 26 May 2006) | 1 line Add buffer support for struct, socket ........ r46330 | andrew.kuchling | 2006-05-26 16:04:19 +0200 (Fri, 26 May 2006) | 1 line Typo fix ........ r46331 | bob.ippolito | 2006-05-26 16:07:23 +0200 (Fri, 26 May 2006) | 1 line Fix distutils so that libffi will cross-compile between darwin/x86 and darwin/ppc ........ r46333 | bob.ippolito | 2006-05-26 16:23:21 +0200 (Fri, 26 May 2006) | 1 line Fix _struct typo that broke some 64-bit platforms ........ r46335 | bob.ippolito | 2006-05-26 16:29:35 +0200 (Fri, 26 May 2006) | 1 line Enable PY_USE_INT_WHEN_POSSIBLE in struct ........ r46343 | andrew.dalke | 2006-05-26 17:21:01 +0200 (Fri, 26 May 2006) | 2 lines Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. ........ r46352 | andrew.dalke | 2006-05-26 18:22:52 +0200 (Fri, 26 May 2006) | 3 lines Test for more edge strip cases; leading and trailing separator gets removed even with strip(..., 0) ........ r46354 | bob.ippolito | 2006-05-26 18:23:28 +0200 (Fri, 26 May 2006) | 1 line fix signed/unsigned mismatch in struct ........ r46355 | steve.holden | 2006-05-26 18:27:59 +0200 (Fri, 26 May 2006) | 5 lines Add -t option to allow easy test selection. Action verbose option correctly. Tweak operation counts. Add empty and new instances tests. Enable comparisons across different warp factors. Change version. ........ r46356 | fredrik.lundh | 2006-05-26 18:32:42 +0200 (Fri, 26 May 2006) | 3 lines needforspeed: use Py_LOCAL on a few more locals in stringobject.c ........ r46357 | thomas.heller | 2006-05-26 18:42:44 +0200 (Fri, 26 May 2006) | 4 lines For now, I gave up with automatic conversion of reST to Python-latex, so I'm writing this in latex now. Skeleton for the ctypes reference. ........ r46358 | tim.peters | 2006-05-26 18:49:28 +0200 (Fri, 26 May 2006) | 3 lines Repair Windows compiler warnings about mixing signed and unsigned integral types in comparisons. ........ r46359 | tim.peters | 2006-05-26 18:52:04 +0200 (Fri, 26 May 2006) | 2 lines Whitespace normalization. ........ r46360 | tim.peters | 2006-05-26 18:53:04 +0200 (Fri, 26 May 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46362 | fredrik.lundh | 2006-05-26 19:04:58 +0200 (Fri, 26 May 2006) | 3 lines needforspeed: stringlib refactoring (in progress) ........ r46363 | thomas.heller | 2006-05-26 19:18:33 +0200 (Fri, 26 May 2006) | 1 line Write some docs. ........ r46364 | fredrik.lundh | 2006-05-26 19:22:38 +0200 (Fri, 26 May 2006) | 3 lines needforspeed: stringlib refactoring (in progress) ........ r46366 | fredrik.lundh | 2006-05-26 19:26:39 +0200 (Fri, 26 May 2006) | 3 lines needforspeed: cleanup ........ r46367 | fredrik.lundh | 2006-05-26 19:31:41 +0200 (Fri, 26 May 2006) | 4 lines needforspeed: remove remaining USE_FAST macros; if fastsearch was broken, someone would have noticed by now ;-) ........ r46368 | steve.holden | 2006-05-26 19:41:32 +0200 (Fri, 26 May 2006) | 5 lines Use minimum calibration time rather than avergae to avoid the illusion of negative run times. Halt with an error if run times go below 10 ms, indicating that results will be unreliable. ........ r46370 | thomas.heller | 2006-05-26 19:47:40 +0200 (Fri, 26 May 2006) | 2 lines Reordered, and wrote more docs. ........ r46372 | georg.brandl | 2006-05-26 20:03:31 +0200 (Fri, 26 May 2006) | 9 lines Need for speed: Patch #921466 : sys.path_importer_cache is now used to cache valid and invalid file paths for the built-in import machinery which leads to fewer open calls on startup. Also fix issue with PEP 302 style import hooks which lead to more open() calls than necessary. ........ r46373 | fredrik.lundh | 2006-05-26 20:05:34 +0200 (Fri, 26 May 2006) | 3 lines removed unnecessary include ........ r46377 | fredrik.lundh | 2006-05-26 20:15:38 +0200 (Fri, 26 May 2006) | 3 lines needforspeed: added rpartition implementation ........ r46380 | fredrik.lundh | 2006-05-26 20:24:15 +0200 (Fri, 26 May 2006) | 5 lines needspeed: rpartition documentation, tests, and a bug fixes. feel free to add more tests and improve the documentation. ........ r46381 | steve.holden | 2006-05-26 20:26:21 +0200 (Fri, 26 May 2006) | 4 lines Revert tests to MAL's original round sizes to retiain comparability from long ago and far away. Stop calling this pybench 1.4 because it isn't. Remove the empty test, which was a bad idea. ........ r46387 | andrew.kuchling | 2006-05-26 20:41:18 +0200 (Fri, 26 May 2006) | 1 line Add rpartition() and path caching ........ r46388 | andrew.dalke | 2006-05-26 21:02:09 +0200 (Fri, 26 May 2006) | 10 lines substring split now uses /F's fast string matching algorithm. (If compiled without FAST search support, changed the pre-memcmp test to check the last character as well as the first. This gave a 25% speedup for my test case.) Rewrote the split algorithms so they stop when maxsplit gets to 0. Previously they did a string match first then checked if the maxsplit was reached. The new way prevents a needless string search. ........ r46391 | brett.cannon | 2006-05-26 21:04:47 +0200 (Fri, 26 May 2006) | 2 lines Change C spacing to 4 spaces by default to match PEP 7 for new C files. ........ r46392 | georg.brandl | 2006-05-26 21:04:47 +0200 (Fri, 26 May 2006) | 3 lines Exception isn't the root of all exception classes anymore. ........ r46397 | fredrik.lundh | 2006-05-26 21:23:21 +0200 (Fri, 26 May 2006) | 3 lines added rpartition method to UserString class ........ r46398 | fredrik.lundh | 2006-05-26 21:24:53 +0200 (Fri, 26 May 2006) | 4 lines needforspeed: stringlib refactoring, continued. added count and find helpers; updated unicodeobject to use stringlib_count ........ r46400 | fredrik.lundh | 2006-05-26 21:29:05 +0200 (Fri, 26 May 2006) | 4 lines needforspeed: stringlib refactoring: use stringlib/find for unicode find ........ r46403 | fredrik.lundh | 2006-05-26 21:33:03 +0200 (Fri, 26 May 2006) | 3 lines needforspeed: use a macro to fix slice indexes ........ r46404 | thomas.heller | 2006-05-26 21:43:45 +0200 (Fri, 26 May 2006) | 1 line Write more docs. ........ r46406 | fredrik.lundh | 2006-05-26 21:48:07 +0200 (Fri, 26 May 2006) | 3 lines needforspeed: stringlib refactoring: use stringlib/find for string find ........ r46407 | andrew.kuchling | 2006-05-26 21:51:10 +0200 (Fri, 26 May 2006) | 1 line Comment typo ........ r46409 | georg.brandl | 2006-05-26 22:04:44 +0200 (Fri, 26 May 2006) | 3 lines Replace Py_BuildValue("OO") by PyTuple_Pack. ........ r46411 | georg.brandl | 2006-05-26 22:14:47 +0200 (Fri, 26 May 2006) | 2 lines Patch #1492218: document None being a constant. ........ r46415 | georg.brandl | 2006-05-26 22:22:50 +0200 (Fri, 26 May 2006) | 3 lines Simplify calling. ........ r46416 | andrew.dalke | 2006-05-26 22:25:22 +0200 (Fri, 26 May 2006) | 4 lines Added limits to the replace code so it does not count all of the matching patterns in a string, only the number needed by the max limit. ........ r46417 | bob.ippolito | 2006-05-26 22:25:23 +0200 (Fri, 26 May 2006) | 1 line enable all of the struct tests, use ssize_t, fix some whitespace ........ r46418 | tim.peters | 2006-05-26 22:56:56 +0200 (Fri, 26 May 2006) | 2 lines Record Iceland sprint attendees. ........ r46421 | tim.peters | 2006-05-26 23:51:13 +0200 (Fri, 26 May 2006) | 2 lines Whitespace normalization. ........ r46422 | steve.holden | 2006-05-27 00:17:54 +0200 (Sat, 27 May 2006) | 2 lines Add Richard Tew to developers ........ r46423 | steve.holden | 2006-05-27 00:33:20 +0200 (Sat, 27 May 2006) | 2 lines Update help text and documentaition. ........ r46424 | steve.holden | 2006-05-27 00:39:27 +0200 (Sat, 27 May 2006) | 2 lines Blasted typos ... ........ r46425 | andrew.dalke | 2006-05-27 00:49:03 +0200 (Sat, 27 May 2006) | 2 lines Added description of why splitlines doesn't use the prealloc strategy ........ r46426 | tim.peters | 2006-05-27 01:14:37 +0200 (Sat, 27 May 2006) | 19 lines Patch 1145039. set_exc_info(), reset_exc_info(): By exploiting the likely (who knows?) invariant that when an exception's `type` is NULL, its `value` and `traceback` are also NULL, save some cycles in heavily-executed code. This is a "a kronar saved is a kronar earned" patch: the speedup isn't reliably measurable, but it obviously does reduce the operation count in the normal (no exception raised) path through PyEval_EvalFrameEx(). The tim-exc_sanity branch tries to push this harder, but is still blowing up (at least in part due to pre-existing subtle bugs that appear to have no other visible consequences!). Not a bugfix candidate. ........ r46429 | steve.holden | 2006-05-27 02:51:52 +0200 (Sat, 27 May 2006) | 2 lines Reinstate new-style object tests. ........ r46430 | neal.norwitz | 2006-05-27 07:18:57 +0200 (Sat, 27 May 2006) | 1 line Fix compiler warning (and whitespace) on Mac OS 10.4. (A lot of this code looked duplicated, I wonder if a utility function could help reduce the duplication here.) ........ r46431 | neal.norwitz | 2006-05-27 07:21:30 +0200 (Sat, 27 May 2006) | 4 lines Fix Coverity warnings. - Check the correct variable (str_obj, not str) for NULL - sep_len was already verified it wasn't 0 ........ r46432 | martin.v.loewis | 2006-05-27 10:36:52 +0200 (Sat, 27 May 2006) | 2 lines Patch 1494554: Update numeric properties to Unicode 4.1. ........ r46433 | martin.v.loewis | 2006-05-27 10:54:29 +0200 (Sat, 27 May 2006) | 2 lines Explain why 'consumed' is initialized. ........ r46436 | fredrik.lundh | 2006-05-27 12:05:10 +0200 (Sat, 27 May 2006) | 3 lines needforspeed: more stringlib refactoring ........ r46438 | fredrik.lundh | 2006-05-27 12:39:48 +0200 (Sat, 27 May 2006) | 5 lines needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in- lining killed performance on certain Intel boxes, and the "aggressive" macro itself gives most of the benefits on others. ........ r46439 | andrew.dalke | 2006-05-27 13:04:36 +0200 (Sat, 27 May 2006) | 2 lines fixed typo ........ r46440 | martin.v.loewis | 2006-05-27 13:07:49 +0200 (Sat, 27 May 2006) | 2 lines Revert bogus change committed in 46432 to this file. ........ r46444 | andrew.kuchling | 2006-05-27 13:26:33 +0200 (Sat, 27 May 2006) | 1 line Add Py_LOCAL macros ........ r46450 | bob.ippolito | 2006-05-27 13:47:12 +0200 (Sat, 27 May 2006) | 1 line Remove the range checking and int usage #defines from _struct and strip out the now-dead code ........ r46454 | bob.ippolito | 2006-05-27 14:11:36 +0200 (Sat, 27 May 2006) | 1 line Fix up struct docstrings, add struct.pack_to function for symmetry ........ r46456 | richard.jones | 2006-05-27 14:29:24 +0200 (Sat, 27 May 2006) | 2 lines Conversion of exceptions over from faked-up classes to new-style C types. ........ r46457 | georg.brandl | 2006-05-27 14:30:25 +0200 (Sat, 27 May 2006) | 3 lines Add news item for new-style exception class branch merge. ........ r46458 | tim.peters | 2006-05-27 14:36:53 +0200 (Sat, 27 May 2006) | 3 lines More random thrashing trying to understand spurious Windows failures. Who's keeping a bz2 file open? ........ r46460 | andrew.kuchling | 2006-05-27 15:44:37 +0200 (Sat, 27 May 2006) | 1 line Mention new-style exceptions ........ r46461 | richard.jones | 2006-05-27 15:50:42 +0200 (Sat, 27 May 2006) | 1 line credit where credit is due ........ r46462 | georg.brandl | 2006-05-27 16:02:03 +0200 (Sat, 27 May 2006) | 3 lines Always close BZ2Proxy object. Remove unnecessary struct usage. ........ r46463 | tim.peters | 2006-05-27 16:13:13 +0200 (Sat, 27 May 2006) | 2 lines The cheery optimism of old age. ........ r46464 | andrew.dalke | 2006-05-27 16:16:40 +0200 (Sat, 27 May 2006) | 2 lines cleanup - removed trailing whitespace ........ r46465 | georg.brandl | 2006-05-27 16:41:55 +0200 (Sat, 27 May 2006) | 3 lines Remove spurious semicolons after macro invocations. ........ r46468 | fredrik.lundh | 2006-05-27 16:58:20 +0200 (Sat, 27 May 2006) | 4 lines needforspeed: replace improvements, changed to Py_LOCAL_INLINE where appropriate ........ r46469 | fredrik.lundh | 2006-05-27 17:20:22 +0200 (Sat, 27 May 2006) | 4 lines needforspeed: stringlib refactoring: changed find_obj to find_slice, to enable use from stringobject ........ r46470 | fredrik.lundh | 2006-05-27 17:26:19 +0200 (Sat, 27 May 2006) | 3 lines needforspeed: stringlib refactoring: use find_slice for stringobject ........ r46472 | kristjan.jonsson | 2006-05-27 17:41:31 +0200 (Sat, 27 May 2006) | 1 line Add a PCBuild8 build directory for building with Visual Studio .NET 2005. Contains a special project to perform profile guided optimizations on the pythoncore.dll, by instrumenting and running pybench.py ........ r46473 | jack.diederich | 2006-05-27 17:44:34 +0200 (Sat, 27 May 2006) | 3 lines needforspeed: use PyObject_MALLOC instead of system malloc for small allocations. Use PyMem_MALLOC for larger (1k+) chunks. 1%-2% speedup. ........ r46474 | bob.ippolito | 2006-05-27 17:53:49 +0200 (Sat, 27 May 2006) | 1 line fix struct regression on 64-bit platforms ........ r46475 | richard.jones | 2006-05-27 18:07:28 +0200 (Sat, 27 May 2006) | 1 line doc string additions and tweaks ........ r46477 | richard.jones | 2006-05-27 18:15:11 +0200 (Sat, 27 May 2006) | 1 line move semicolons ........ r46478 | george.yoshida | 2006-05-27 18:32:44 +0200 (Sat, 27 May 2006) | 2 lines minor markup nits ........ r46488 | george.yoshida | 2006-05-27 18:51:43 +0200 (Sat, 27 May 2006) | 3 lines End of Ch.3 is now about "with statement". Avoid obsolescence by directly referring to the section. ........ r46489 | george.yoshida | 2006-05-27 19:09:17 +0200 (Sat, 27 May 2006) | 2 lines fix typo ........
8549 lines
213 KiB
C
8549 lines
213 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
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
|
|
#ifdef HAVE_SYS_WAIT_H
|
|
#include <sys/wait.h> /* For WNOHANG */
|
|
#endif
|
|
|
|
#include <signal.h>
|
|
|
|
#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
|
|
#include <direct.h>
|
|
#include <io.h>
|
|
#include <process.h>
|
|
#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'/')
|
|
#define ARRAYSIZE(a) (sizeof(a) / sizeof(a[0]))
|
|
|
|
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
|
|
} 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
|
|
} 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 *args)
|
|
{
|
|
PyObject *groups;
|
|
int i, len;
|
|
gid_t grouplist[MAX_GROUPS];
|
|
|
|
if (!PyArg_ParseTuple(args, "O:setgid", &groups))
|
|
return NULL;
|
|
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
|
|
|
|
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_VARARGS, 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
|
|
{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
|
|
|