mirror of
https://github.com/python/cpython.git
synced 2025-10-24 02:13:49 +00:00
Merged revisions 46490-46494,46496,46498,46500,46506,46521,46538,46558,46563-46567,46570-46571,46583,46593,46595-46598,46604,46606,46609-46753 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r46610 | martin.v.loewis | 2006-06-03 09:42:26 +0200 (Sat, 03 Jun 2006) | 2 lines Updated version (win32-icons2.zip) from #1490384. ........ r46612 | andrew.kuchling | 2006-06-03 20:09:41 +0200 (Sat, 03 Jun 2006) | 1 line [Bug #1472084] Fix description of do_tag ........ r46614 | andrew.kuchling | 2006-06-03 20:33:35 +0200 (Sat, 03 Jun 2006) | 1 line [Bug #1475554] Strengthen text to say 'must' instead of 'should' ........ r46616 | andrew.kuchling | 2006-06-03 20:41:28 +0200 (Sat, 03 Jun 2006) | 1 line [Bug #1441864] Clarify description of 'data' argument ........ r46617 | andrew.kuchling | 2006-06-03 20:43:24 +0200 (Sat, 03 Jun 2006) | 1 line Minor rewording ........ r46619 | andrew.kuchling | 2006-06-03 21:02:35 +0200 (Sat, 03 Jun 2006) | 9 lines [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Fix by renaming the variable. In a different module, Neal fixed it by renaming _self to self. There's already a variable named 'self' here, so I used selfptr. (I'm committing this on a Mac without Tk, but it's a simple search-and-replace. <crosses fingers>, so I'll watch the buildbots and see what happens.) ........ r46621 | fredrik.lundh | 2006-06-03 23:56:05 +0200 (Sat, 03 Jun 2006) | 5 lines "_self" is a said to be a reserved word in Watcom C 10.6. I'm not sure that's really standard compliant behaviour, but I guess we have to fix that anyway... ........ r46622 | andrew.kuchling | 2006-06-04 00:44:42 +0200 (Sun, 04 Jun 2006) | 1 line Update readme ........ r46623 | andrew.kuchling | 2006-06-04 00:59:23 +0200 (Sun, 04 Jun 2006) | 1 line Drop 0 parameter ........ r46624 | andrew.kuchling | 2006-06-04 00:59:59 +0200 (Sun, 04 Jun 2006) | 1 line Some code tidying; use curses.wrapper ........ r46625 | andrew.kuchling | 2006-06-04 01:02:15 +0200 (Sun, 04 Jun 2006) | 1 line Use True; value returned from main is unused ........ r46626 | andrew.kuchling | 2006-06-04 01:07:21 +0200 (Sun, 04 Jun 2006) | 1 line Use true division, and the True value ........ r46627 | andrew.kuchling | 2006-06-04 01:09:58 +0200 (Sun, 04 Jun 2006) | 1 line Docstring fix; use True ........ r46628 | andrew.kuchling | 2006-06-04 01:15:56 +0200 (Sun, 04 Jun 2006) | 1 line Put code in a main() function; loosen up the spacing to match current code style ........ r46629 | andrew.kuchling | 2006-06-04 01:39:07 +0200 (Sun, 04 Jun 2006) | 1 line Use functions; modernize code ........ r46630 | andrew.kuchling | 2006-06-04 01:43:22 +0200 (Sun, 04 Jun 2006) | 1 line This demo requires Medusa (not just asyncore); remove it ........ r46631 | andrew.kuchling | 2006-06-04 01:46:36 +0200 (Sun, 04 Jun 2006) | 2 lines Remove xmlrpc demo -- it duplicates the SimpleXMLRPCServer module. ........ r46632 | andrew.kuchling | 2006-06-04 01:47:22 +0200 (Sun, 04 Jun 2006) | 1 line Remove xmlrpc/ directory ........ r46633 | andrew.kuchling | 2006-06-04 01:51:21 +0200 (Sun, 04 Jun 2006) | 1 line Remove dangling reference ........ r46634 | andrew.kuchling | 2006-06-04 01:59:36 +0200 (Sun, 04 Jun 2006) | 1 line Add more whitespace; use a better socket name ........ r46635 | tim.peters | 2006-06-04 03:22:53 +0200 (Sun, 04 Jun 2006) | 2 lines Whitespace normalization. ........ r46637 | tim.peters | 2006-06-04 05:26:02 +0200 (Sun, 04 Jun 2006) | 16 lines In a PYMALLOC_DEBUG build obmalloc adds extra debugging info to each allocated block. This was using 4 bytes for each such piece of info regardless of platform. This didn't really matter before (proof: no bug reports, and the debug-build obmalloc would have assert-failed if it was ever asked for a chunk of memory >= 2**32 bytes), since container indices were plain ints. But after the Py_ssize_t changes, it's at least theoretically possible to allocate a list or string whose guts exceed 2**32 bytes, and the PYMALLOC_DEBUG routines would fail then (having only 4 bytes to record the originally requested size). Now we use sizeof(size_t) bytes for each of a PYMALLOC_DEBUG build's extra debugging fields. This won't make any difference on 32-bit boxes, but will add 16 bytes to each allocation in a debug build on a 64-bit box. ........ r46638 | tim.peters | 2006-06-04 05:38:04 +0200 (Sun, 04 Jun 2006) | 4 lines _PyObject_DebugMalloc(): The return value should add 2*sizeof(size_t) now, not 8. This probably accounts for current disasters on the 64-bit buildbot slaves. ........ r46639 | neal.norwitz | 2006-06-04 08:19:31 +0200 (Sun, 04 Jun 2006) | 1 line SF #1499797, Fix for memory leak in WindowsError_str ........ r46640 | andrew.macintyre | 2006-06-04 14:31:09 +0200 (Sun, 04 Jun 2006) | 2 lines Patch #1454481: Make thread stack size runtime tunable. ........ r46641 | andrew.macintyre | 2006-06-04 14:59:59 +0200 (Sun, 04 Jun 2006) | 2 lines clean up function declarations to conform to PEP-7 style. ........ r46642 | martin.blais | 2006-06-04 15:49:49 +0200 (Sun, 04 Jun 2006) | 15 lines Fixes in struct and socket from merge reviews. - Following Guido's comments, renamed * pack_to -> pack_into * recv_buf -> recv_into * recvfrom_buf -> recvfrom_into - Made fixes to _struct.c according to Neal Norwitz comments on the checkins list. - Converted some ints into the appropriate -- I hope -- ssize_t and size_t. ........ r46643 | ronald.oussoren | 2006-06-04 16:05:28 +0200 (Sun, 04 Jun 2006) | 3 lines "Import" LDFLAGS in Mac/OSX/Makefile.in to ensure pythonw gets build with the right compiler flags. ........ r46644 | ronald.oussoren | 2006-06-04 16:24:59 +0200 (Sun, 04 Jun 2006) | 2 lines Drop Mac wrappers for the WASTE library. ........ r46645 | tim.peters | 2006-06-04 17:49:07 +0200 (Sun, 04 Jun 2006) | 3 lines s_methods[]: Stop compiler warnings by casting s_unpack_from to PyCFunction. ........ r46646 | george.yoshida | 2006-06-04 19:04:12 +0200 (Sun, 04 Jun 2006) | 2 lines Remove a redundant word ........ r46647 | george.yoshida | 2006-06-04 19:17:25 +0200 (Sun, 04 Jun 2006) | 2 lines Markup fix ........ r46648 | martin.v.loewis | 2006-06-04 21:36:28 +0200 (Sun, 04 Jun 2006) | 2 lines Patch #1359618: Speed-up charmap encoder. ........ r46649 | georg.brandl | 2006-06-04 23:46:16 +0200 (Sun, 04 Jun 2006) | 3 lines Repair refleaks in unicodeobject. ........ r46650 | georg.brandl | 2006-06-04 23:56:52 +0200 (Sun, 04 Jun 2006) | 4 lines Patch #1346214: correctly optimize away "if 0"-style stmts (thanks to Neal for review) ........ r46651 | georg.brandl | 2006-06-05 00:15:37 +0200 (Mon, 05 Jun 2006) | 2 lines Bug #1500293: fix memory leaks in _subprocess module. ........ r46654 | tim.peters | 2006-06-05 01:43:53 +0200 (Mon, 05 Jun 2006) | 2 lines Whitespace normalization. ........ r46655 | tim.peters | 2006-06-05 01:52:47 +0200 (Mon, 05 Jun 2006) | 16 lines Revert revisions: 46640 Patch #1454481: Make thread stack size runtime tunable. 46647 Markup fix The first is causing many buildbots to fail test runs, and there are multiple causes with seemingly no immediate prospects for repairing them. See python-dev discussion. Note that a branch can (and should) be created for resolving these problems, like svn copy svn+ssh://svn.python.org/python/trunk -r46640 svn+ssh://svn.python.org/python/branches/NEW_BRANCH followed by merging rev 46647 to the new branch. ........ r46656 | andrew.kuchling | 2006-06-05 02:08:09 +0200 (Mon, 05 Jun 2006) | 1 line Mention second encoding speedup ........ r46657 | gregory.p.smith | 2006-06-05 02:31:01 +0200 (Mon, 05 Jun 2006) | 7 lines bugfix: when log_archive was called with the DB_ARCH_REMOVE flag present in BerkeleyDB >= 4.2 it tried to construct a list out of an uninitialized char **log_list. feature: export the DB_ARCH_REMOVE flag by name in the module on BerkeleyDB >= 4.2. ........ r46658 | gregory.p.smith | 2006-06-05 02:33:35 +0200 (Mon, 05 Jun 2006) | 5 lines fix a bug in the previous commit. don't leak empty list on error return and fix the additional rare (out of memory only) bug that it was supposed to fix of not freeing log_list when the python allocator failed. ........ r46660 | tim.peters | 2006-06-05 02:55:26 +0200 (Mon, 05 Jun 2006) | 9 lines "Flat is better than nested." Move the long-winded, multiply-nested -R support out of runtest() and into some module-level helper functions. This makes runtest() and the -R code easier to follow. That in turn allowed seeing some opportunities for code simplification, and made it obvious that reglog.txt never got closed. ........ r46661 | hyeshik.chang | 2006-06-05 02:59:54 +0200 (Mon, 05 Jun 2006) | 3 lines Fix a potentially invalid memory access of CJKCodecs' shift-jis decoder. (found by Neal Norwitz) ........ r46663 | gregory.p.smith | 2006-06-05 03:39:52 +0200 (Mon, 05 Jun 2006) | 3 lines * support DBEnv.log_stat() method on BerkeleyDB >= 4.0 [patch #1494885] ........ r46664 | tim.peters | 2006-06-05 03:43:03 +0200 (Mon, 05 Jun 2006) | 3 lines Remove doctest.testmod's deprecated (in 2.4) `isprivate` argument. A lot of hair went into supporting that! ........ r46665 | tim.peters | 2006-06-05 03:47:24 +0200 (Mon, 05 Jun 2006) | 2 lines Whitespace normalization. ........ r46666 | tim.peters | 2006-06-05 03:48:21 +0200 (Mon, 05 Jun 2006) | 2 lines Make doctest news more accurate. ........ r46667 | gregory.p.smith | 2006-06-05 03:56:15 +0200 (Mon, 05 Jun 2006) | 3 lines * support DBEnv.lsn_reset() method on BerkeleyDB >= 4.4 [patch #1494902] ........ r46668 | gregory.p.smith | 2006-06-05 04:02:25 +0200 (Mon, 05 Jun 2006) | 3 lines mention the just committed bsddb changes ........ r46671 | gregory.p.smith | 2006-06-05 19:38:04 +0200 (Mon, 05 Jun 2006) | 3 lines * add support for DBSequence objects [patch #1466734] ........ r46672 | gregory.p.smith | 2006-06-05 20:20:07 +0200 (Mon, 05 Jun 2006) | 3 lines forgot to add this file in previous commit ........ r46673 | tim.peters | 2006-06-05 20:36:12 +0200 (Mon, 05 Jun 2006) | 2 lines Whitespace normalization. ........ r46674 | tim.peters | 2006-06-05 20:36:54 +0200 (Mon, 05 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46675 | gregory.p.smith | 2006-06-05 20:48:21 +0200 (Mon, 05 Jun 2006) | 4 lines * fix DBCursor.pget() bug with keyword argument names when no data= is supplied [SF pybsddb bug #1477863] ........ r46676 | andrew.kuchling | 2006-06-05 21:05:32 +0200 (Mon, 05 Jun 2006) | 1 line Remove use of Trove name, which isn't very helpful to users ........ r46677 | andrew.kuchling | 2006-06-05 21:08:25 +0200 (Mon, 05 Jun 2006) | 1 line [Bug #1470026] Include link to list of classifiers ........ r46679 | tim.peters | 2006-06-05 22:48:49 +0200 (Mon, 05 Jun 2006) | 10 lines Access _struct attributes directly instead of mucking with getattr. string_reverse(): Simplify. assertRaises(): Raise TestFailed on failure. test_unpack_from(), test_pack_into(), test_pack_into_fn(): never use `assert` to test for an expected result (it doesn't test anything when Python is run with -O). ........ r46680 | tim.peters | 2006-06-05 22:49:27 +0200 (Mon, 05 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46681 | gregory.p.smith | 2006-06-06 01:38:06 +0200 (Tue, 06 Jun 2006) | 3 lines add depends = ['md5.h'] to the _md5 module extension for correctness sake. ........ r46682 | brett.cannon | 2006-06-06 01:51:55 +0200 (Tue, 06 Jun 2006) | 4 lines Add 3 more bytes to a buffer to cover constants in string and null byte on top of 10 possible digits for an int. Closes bug #1501223. ........ r46684 | gregory.p.smith | 2006-06-06 01:59:37 +0200 (Tue, 06 Jun 2006) | 5 lines - bsddb: the __len__ method of a DB object has been fixed to return correct results. It could previously incorrectly return 0 in some cases. Fixes SF bug 1493322 (pybsddb bug 1184012). ........ r46686 | tim.peters | 2006-06-06 02:25:07 +0200 (Tue, 06 Jun 2006) | 7 lines _PySys_Init(): It's rarely a good idea to size a buffer to the exact maximum size someone guesses is needed. In this case, if we're really worried about extreme integers, then "cp%d" can actually need 14 bytes (2 for "cp" + 1 for \0 at the end + 11 for -(2**31-1)). So reserve 128 bytes instead -- nothing is actually saved by making a stack-local buffer tiny. ........ r46687 | neal.norwitz | 2006-06-06 09:22:08 +0200 (Tue, 06 Jun 2006) | 1 line Remove unused variable (and stop compiler warning) ........ r46688 | neal.norwitz | 2006-06-06 09:23:01 +0200 (Tue, 06 Jun 2006) | 1 line Fix a bunch of parameter strings ........ r46689 | thomas.heller | 2006-06-06 13:34:33 +0200 (Tue, 06 Jun 2006) | 6 lines Convert CFieldObject tp_members to tp_getset, since there is no structmember typecode for Py_ssize_t fields. This should fix some of the errors on the PPC64 debian machine (64-bit, big endian). Assigning to readonly fields now raises AttributeError instead of TypeError, so the testcase has to be changed as well. ........ r46690 | thomas.heller | 2006-06-06 13:54:32 +0200 (Tue, 06 Jun 2006) | 1 line Damn - the sentinel was missing. And fix another silly mistake. ........ r46691 | martin.blais | 2006-06-06 14:46:55 +0200 (Tue, 06 Jun 2006) | 13 lines Normalized a few cases of whitespace in function declarations. Found them using:: find . -name '*.py' | while read i ; do grep 'def[^(]*( ' $i /dev/null ; done find . -name '*.py' | while read i ; do grep ' ):' $i /dev/null ; done (I was doing this all over my own code anyway, because I'd been using spaces in all defs, so I thought I'd make a run on the Python code as well. If you need to do such fixes in your own code, you can use xx-rename or parenregu.el within emacs.) ........ r46693 | thomas.heller | 2006-06-06 17:34:18 +0200 (Tue, 06 Jun 2006) | 1 line Specify argtypes for all test functions. Maybe that helps on strange ;-) architectures ........ r46694 | tim.peters | 2006-06-06 17:50:17 +0200 (Tue, 06 Jun 2006) | 5 lines BSequence_set_range(): Rev 46688 ("Fix a bunch of parameter strings") changed this function's signature seemingly by mistake, which is causing buildbots to fail test_bsddb3. Restored the pre-46688 signature. ........ r46695 | tim.peters | 2006-06-06 17:52:35 +0200 (Tue, 06 Jun 2006) | 4 lines On python-dev Thomas Heller said these were committed by mistake in rev 46693, so reverting this part of rev 46693. ........ r46696 | andrew.kuchling | 2006-06-06 19:10:41 +0200 (Tue, 06 Jun 2006) | 1 line Fix comment typo ........ r46697 | brett.cannon | 2006-06-06 20:08:16 +0200 (Tue, 06 Jun 2006) | 2 lines Fix coding style guide bug. ........ r46698 | thomas.heller | 2006-06-06 20:50:46 +0200 (Tue, 06 Jun 2006) | 2 lines Add a hack so that foreign functions returning float now do work on 64-bit big endian platforms. ........ r46699 | thomas.heller | 2006-06-06 21:25:13 +0200 (Tue, 06 Jun 2006) | 3 lines Use the same big-endian hack as in _ctypes/callproc.c for callback functions. This fixes the callback function tests that return float. ........ r46700 | ronald.oussoren | 2006-06-06 21:50:24 +0200 (Tue, 06 Jun 2006) | 5 lines * Ensure that "make altinstall" works when the tree was configured with --enable-framework * Also for --enable-framework: allow users to use --prefix to specify the location of the compatibility symlinks (such as /usr/local/bin/python) ........ r46701 | ronald.oussoren | 2006-06-06 21:56:00 +0200 (Tue, 06 Jun 2006) | 3 lines A quick hack to ensure the right key-bindings for IDLE on osx: install patched configuration files during a framework install. ........ r46702 | tim.peters | 2006-06-07 03:04:59 +0200 (Wed, 07 Jun 2006) | 4 lines dash_R_cleanup(): Clear filecmp._cache. This accounts for different results across -R runs (at least on Windows) of test_filecmp. ........ r46705 | tim.peters | 2006-06-07 08:57:51 +0200 (Wed, 07 Jun 2006) | 17 lines SF patch 1501987: Remove randomness from test_exceptions, from ?iga Seilnacht (sorry about the name, but Firefox on my box can't display the first character of the name -- the SF "Unix name" is zseil). This appears to cure the oddball intermittent leaks across runs when running test_exceptions under -R. I'm not sure why, but I'm too sleepy to care ;-) The thrust of the SF patch was to remove randomness in the pickle protocol used. I changed the patch to use range(pickle.HIGHEST_PROTOCOL + 1), to try both pickle and cPickle, and randomly mucked with other test lines to put statements on their own lines. Not a bugfix candidate (this is fiddling new-in-2.5 code). ........ r46706 | andrew.kuchling | 2006-06-07 15:55:33 +0200 (Wed, 07 Jun 2006) | 1 line Add an SQLite introduction, taken from the 'What's New' text ........ r46708 | andrew.kuchling | 2006-06-07 19:02:52 +0200 (Wed, 07 Jun 2006) | 1 line Mention other placeholders ........ r46709 | andrew.kuchling | 2006-06-07 19:03:46 +0200 (Wed, 07 Jun 2006) | 1 line Add an item; also, escape % ........ r46710 | andrew.kuchling | 2006-06-07 19:04:01 +0200 (Wed, 07 Jun 2006) | 1 line Mention other placeholders ........ r46716 | ronald.oussoren | 2006-06-07 20:57:44 +0200 (Wed, 07 Jun 2006) | 2 lines Move Mac/OSX/Tools one level up ........ r46717 | ronald.oussoren | 2006-06-07 20:58:01 +0200 (Wed, 07 Jun 2006) | 2 lines Move Mac/OSX/PythonLauncher one level up ........ r46718 | ronald.oussoren | 2006-06-07 20:58:42 +0200 (Wed, 07 Jun 2006) | 2 lines mv Mac/OSX/BuildScript one level up ........ r46719 | ronald.oussoren | 2006-06-07 21:02:03 +0200 (Wed, 07 Jun 2006) | 2 lines Move Mac/OSX/* one level up ........ r46720 | ronald.oussoren | 2006-06-07 21:06:01 +0200 (Wed, 07 Jun 2006) | 2 lines And the last bit: move IDLE one level up and adjust makefiles ........ r46723 | ronald.oussoren | 2006-06-07 21:38:53 +0200 (Wed, 07 Jun 2006) | 4 lines - Patch the correct version of python in the Info.plists at build time, instead of relying on a maintainer to update them before releases. - Remove the now empty Mac/OSX directory ........ r46727 | ronald.oussoren | 2006-06-07 22:18:44 +0200 (Wed, 07 Jun 2006) | 7 lines * If BuildApplet.py is used as an applet it starts with a version of sys.exutable that isn't usuable on an #!-line. That results in generated applets that don't actually work. Work around this problem by resetting sys.executable. * argvemulator.py didn't work on intel macs. This patch fixes this (bug #1491468) ........ r46728 | tim.peters | 2006-06-07 22:40:06 +0200 (Wed, 07 Jun 2006) | 2 lines Whitespace normalization. ........ r46729 | tim.peters | 2006-06-07 22:40:54 +0200 (Wed, 07 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46730 | thomas.heller | 2006-06-07 22:43:06 +0200 (Wed, 07 Jun 2006) | 7 lines Fix for foreign functions returning small structures on 64-bit big endian machines. Should fix the remaininf failure in the PPC64 Debian buildbot. Thanks to Matthias Klose for providing access to a machine to debug and test this. ........ r46731 | brett.cannon | 2006-06-07 23:48:17 +0200 (Wed, 07 Jun 2006) | 2 lines Clarify documentation for bf_getcharbuffer. ........ r46735 | neal.norwitz | 2006-06-08 07:12:45 +0200 (Thu, 08 Jun 2006) | 1 line Fix a refleak in recvfrom_into ........ r46736 | gregory.p.smith | 2006-06-08 07:17:08 +0200 (Thu, 08 Jun 2006) | 9 lines - bsddb: the bsddb.dbtables Modify method now raises the proper error and aborts the db transaction safely when a modifier callback fails. Fixes SF python patch/bug #1408584. Also cleans up the bsddb.dbtables docstrings since thats the only documentation that exists for that unadvertised module. (people really should really just use sqlite3) ........ r46737 | gregory.p.smith | 2006-06-08 07:38:11 +0200 (Thu, 08 Jun 2006) | 4 lines * Turn the deadlock situation described in SF bug #775414 into a DBDeadLockError exception. * add the test case for my previous dbtables commit. ........ r46738 | gregory.p.smith | 2006-06-08 07:39:54 +0200 (Thu, 08 Jun 2006) | 2 lines pasted set_lk_detect line in wrong spot in previous commit. fixed. passes tests this time. ........ r46739 | armin.rigo | 2006-06-08 12:56:24 +0200 (Thu, 08 Jun 2006) | 6 lines (arre, arigo) SF bug #1350060 Give a consistent behavior for comparison and hashing of method objects (both user- and built-in methods). Now compares the 'self' recursively. The hash was already asking for the hash of 'self'. ........ r46740 | andrew.kuchling | 2006-06-08 13:56:44 +0200 (Thu, 08 Jun 2006) | 1 line Typo fix ........ r46741 | georg.brandl | 2006-06-08 14:45:01 +0200 (Thu, 08 Jun 2006) | 2 lines Bug #1502750: Fix getargs "i" format to use LONG_MIN and LONG_MAX for bounds checking. ........ r46743 | georg.brandl | 2006-06-08 14:54:13 +0200 (Thu, 08 Jun 2006) | 2 lines Bug #1502728: Correctly link against librt library on HP-UX. ........ r46745 | georg.brandl | 2006-06-08 14:55:47 +0200 (Thu, 08 Jun 2006) | 3 lines Add news for recent bugfix. ........ r46746 | georg.brandl | 2006-06-08 15:31:07 +0200 (Thu, 08 Jun 2006) | 4 lines Argh. "integer" is a very confusing word ;) Actually, checking for INT_MAX and INT_MIN is correct since the format code explicitly handles a C "int". ........ r46748 | nick.coghlan | 2006-06-08 15:54:49 +0200 (Thu, 08 Jun 2006) | 1 line Add functools.update_wrapper() and functools.wraps() as described in PEP 356 ........ r46751 | georg.brandl | 2006-06-08 16:50:21 +0200 (Thu, 08 Jun 2006) | 4 lines Bug #1502805: don't alias file.__exit__ to file.close since the latter can return something that's true. ........ r46752 | georg.brandl | 2006-06-08 16:50:53 +0200 (Thu, 08 Jun 2006) | 3 lines Convert test_file to unittest. ........
1821 lines
41 KiB
C
1821 lines
41 KiB
C
/* struct module -- pack values into and (out of) strings */
|
|
|
|
/* New version supporting byte order, alignment and size options,
|
|
character strings, and unsigned numbers */
|
|
|
|
#define PY_SSIZE_T_CLEAN
|
|
|
|
#include "Python.h"
|
|
#include "structseq.h"
|
|
#include "structmember.h"
|
|
#include <ctype.h>
|
|
|
|
static PyTypeObject PyStructType;
|
|
|
|
/* compatibility macros */
|
|
#if (PY_VERSION_HEX < 0x02050000)
|
|
typedef int Py_ssize_t;
|
|
#endif
|
|
|
|
/* If PY_STRUCT_OVERFLOW_MASKING is defined, the struct module will wrap all input
|
|
numbers for explicit endians such that they fit in the given type, much
|
|
like explicit casting in C. A warning will be raised if the number did
|
|
not originally fit within the range of the requested type. If it is
|
|
not defined, then all range errors and overflow will be struct.error
|
|
exceptions. */
|
|
|
|
#define PY_STRUCT_OVERFLOW_MASKING 1
|
|
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
static PyObject *pylong_ulong_mask = NULL;
|
|
static PyObject *pyint_zero = NULL;
|
|
#endif
|
|
|
|
/* The translation function for each format character is table driven */
|
|
typedef struct _formatdef {
|
|
char format;
|
|
Py_ssize_t size;
|
|
Py_ssize_t alignment;
|
|
PyObject* (*unpack)(const char *,
|
|
const struct _formatdef *);
|
|
int (*pack)(char *, PyObject *,
|
|
const struct _formatdef *);
|
|
} formatdef;
|
|
|
|
typedef struct _formatcode {
|
|
const struct _formatdef *fmtdef;
|
|
Py_ssize_t offset;
|
|
Py_ssize_t size;
|
|
} formatcode;
|
|
|
|
/* Struct object interface */
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
Py_ssize_t s_size;
|
|
Py_ssize_t s_len;
|
|
formatcode *s_codes;
|
|
PyObject *s_format;
|
|
PyObject *weakreflist; /* List of weak references */
|
|
} PyStructObject;
|
|
|
|
|
|
#define PyStruct_Check(op) PyObject_TypeCheck(op, &PyStructType)
|
|
#define PyStruct_CheckExact(op) ((op)->ob_type == &PyStructType)
|
|
|
|
|
|
/* Exception */
|
|
|
|
static PyObject *StructError;
|
|
|
|
|
|
/* Define various structs to figure out the alignments of types */
|
|
|
|
|
|
typedef struct { char c; short x; } st_short;
|
|
typedef struct { char c; int x; } st_int;
|
|
typedef struct { char c; long x; } st_long;
|
|
typedef struct { char c; float x; } st_float;
|
|
typedef struct { char c; double x; } st_double;
|
|
typedef struct { char c; void *x; } st_void_p;
|
|
|
|
#define SHORT_ALIGN (sizeof(st_short) - sizeof(short))
|
|
#define INT_ALIGN (sizeof(st_int) - sizeof(int))
|
|
#define LONG_ALIGN (sizeof(st_long) - sizeof(long))
|
|
#define FLOAT_ALIGN (sizeof(st_float) - sizeof(float))
|
|
#define DOUBLE_ALIGN (sizeof(st_double) - sizeof(double))
|
|
#define VOID_P_ALIGN (sizeof(st_void_p) - sizeof(void *))
|
|
|
|
/* We can't support q and Q in native mode unless the compiler does;
|
|
in std mode, they're 8 bytes on all platforms. */
|
|
#ifdef HAVE_LONG_LONG
|
|
typedef struct { char c; PY_LONG_LONG x; } s_long_long;
|
|
#define LONG_LONG_ALIGN (sizeof(s_long_long) - sizeof(PY_LONG_LONG))
|
|
#endif
|
|
|
|
#define STRINGIFY(x) #x
|
|
|
|
#ifdef __powerc
|
|
#pragma options align=reset
|
|
#endif
|
|
|
|
/* Helper to get a PyLongObject by hook or by crook. Caller should decref. */
|
|
|
|
static PyObject *
|
|
get_pylong(PyObject *v)
|
|
{
|
|
PyNumberMethods *m;
|
|
|
|
assert(v != NULL);
|
|
if (PyInt_Check(v))
|
|
return PyLong_FromLong(PyInt_AS_LONG(v));
|
|
if (PyLong_Check(v)) {
|
|
Py_INCREF(v);
|
|
return v;
|
|
}
|
|
m = v->ob_type->tp_as_number;
|
|
if (m != NULL && m->nb_long != NULL) {
|
|
v = m->nb_long(v);
|
|
if (v == NULL)
|
|
return NULL;
|
|
if (PyLong_Check(v))
|
|
return v;
|
|
Py_DECREF(v);
|
|
}
|
|
PyErr_SetString(StructError,
|
|
"cannot convert argument to long");
|
|
return NULL;
|
|
}
|
|
|
|
/* Helper routine to get a Python integer and raise the appropriate error
|
|
if it isn't one */
|
|
|
|
static int
|
|
get_long(PyObject *v, long *p)
|
|
{
|
|
long x = PyInt_AsLong(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
if (PyErr_ExceptionMatches(PyExc_TypeError))
|
|
PyErr_SetString(StructError,
|
|
"required argument is not an integer");
|
|
return -1;
|
|
}
|
|
*p = x;
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Same, but handling unsigned long */
|
|
|
|
static int
|
|
get_ulong(PyObject *v, unsigned long *p)
|
|
{
|
|
if (PyLong_Check(v)) {
|
|
unsigned long x = PyLong_AsUnsignedLong(v);
|
|
if (x == (unsigned long)(-1) && PyErr_Occurred())
|
|
return -1;
|
|
*p = x;
|
|
return 0;
|
|
}
|
|
if (get_long(v, (long *)p) < 0)
|
|
return -1;
|
|
if (((long)*p) < 0) {
|
|
PyErr_SetString(StructError,
|
|
"unsigned argument is < 0");
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#ifdef HAVE_LONG_LONG
|
|
|
|
/* Same, but handling native long long. */
|
|
|
|
static int
|
|
get_longlong(PyObject *v, PY_LONG_LONG *p)
|
|
{
|
|
PY_LONG_LONG x;
|
|
|
|
v = get_pylong(v);
|
|
if (v == NULL)
|
|
return -1;
|
|
assert(PyLong_Check(v));
|
|
x = PyLong_AsLongLong(v);
|
|
Py_DECREF(v);
|
|
if (x == (PY_LONG_LONG)-1 && PyErr_Occurred())
|
|
return -1;
|
|
*p = x;
|
|
return 0;
|
|
}
|
|
|
|
/* Same, but handling native unsigned long long. */
|
|
|
|
static int
|
|
get_ulonglong(PyObject *v, unsigned PY_LONG_LONG *p)
|
|
{
|
|
unsigned PY_LONG_LONG x;
|
|
|
|
v = get_pylong(v);
|
|
if (v == NULL)
|
|
return -1;
|
|
assert(PyLong_Check(v));
|
|
x = PyLong_AsUnsignedLongLong(v);
|
|
Py_DECREF(v);
|
|
if (x == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred())
|
|
return -1;
|
|
*p = x;
|
|
return 0;
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
|
|
/* Helper routine to get a Python integer and raise the appropriate error
|
|
if it isn't one */
|
|
|
|
static int
|
|
get_wrapped_long(PyObject *v, long *p)
|
|
{
|
|
if (get_long(v, p) < 0) {
|
|
if (PyLong_Check(v) && PyErr_ExceptionMatches(PyExc_OverflowError)) {
|
|
PyObject *wrapped;
|
|
long x;
|
|
PyErr_Clear();
|
|
if (PyErr_Warn(PyExc_DeprecationWarning, "struct integer overflow masking is deprecated") < 0)
|
|
return -1;
|
|
wrapped = PyNumber_And(v, pylong_ulong_mask);
|
|
if (wrapped == NULL)
|
|
return -1;
|
|
x = (long)PyLong_AsUnsignedLong(wrapped);
|
|
Py_DECREF(wrapped);
|
|
if (x == -1 && PyErr_Occurred())
|
|
return -1;
|
|
*p = x;
|
|
} else {
|
|
return -1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
get_wrapped_ulong(PyObject *v, unsigned long *p)
|
|
{
|
|
long x = (long)PyLong_AsUnsignedLong(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
PyObject *wrapped;
|
|
PyErr_Clear();
|
|
wrapped = PyNumber_And(v, pylong_ulong_mask);
|
|
if (wrapped == NULL)
|
|
return -1;
|
|
if (PyErr_Warn(PyExc_DeprecationWarning, "struct integer overflow masking is deprecated") < 0) {
|
|
Py_DECREF(wrapped);
|
|
return -1;
|
|
}
|
|
x = (long)PyLong_AsUnsignedLong(wrapped);
|
|
Py_DECREF(wrapped);
|
|
if (x == -1 && PyErr_Occurred())
|
|
return -1;
|
|
}
|
|
*p = (unsigned long)x;
|
|
return 0;
|
|
}
|
|
|
|
#define RANGE_ERROR(x, f, flag, mask) \
|
|
do { \
|
|
if (_range_error(f, flag) < 0) \
|
|
return -1; \
|
|
else \
|
|
(x) &= (mask); \
|
|
} while (0)
|
|
|
|
#else
|
|
|
|
#define get_wrapped_long get_long
|
|
#define get_wrapped_ulong get_ulong
|
|
#define RANGE_ERROR(x, f, flag, mask) return _range_error(f, flag)
|
|
|
|
#endif
|
|
|
|
/* Floating point helpers */
|
|
|
|
static PyObject *
|
|
unpack_float(const char *p, /* start of 4-byte string */
|
|
int le) /* true for little-endian, false for big-endian */
|
|
{
|
|
double x;
|
|
|
|
x = _PyFloat_Unpack4((unsigned char *)p, le);
|
|
if (x == -1.0 && PyErr_Occurred())
|
|
return NULL;
|
|
return PyFloat_FromDouble(x);
|
|
}
|
|
|
|
static PyObject *
|
|
unpack_double(const char *p, /* start of 8-byte string */
|
|
int le) /* true for little-endian, false for big-endian */
|
|
{
|
|
double x;
|
|
|
|
x = _PyFloat_Unpack8((unsigned char *)p, le);
|
|
if (x == -1.0 && PyErr_Occurred())
|
|
return NULL;
|
|
return PyFloat_FromDouble(x);
|
|
}
|
|
|
|
/* Helper to format the range error exceptions */
|
|
static int
|
|
_range_error(const formatdef *f, int is_unsigned)
|
|
{
|
|
/* ulargest is the largest unsigned value with f->size bytes.
|
|
* Note that the simpler:
|
|
* ((size_t)1 << (f->size * 8)) - 1
|
|
* doesn't work when f->size == sizeof(size_t) because C doesn't
|
|
* define what happens when a left shift count is >= the number of
|
|
* bits in the integer being shifted; e.g., on some boxes it doesn't
|
|
* shift at all when they're equal.
|
|
*/
|
|
const size_t ulargest = (size_t)-1 >> ((SIZEOF_SIZE_T - f->size)*8);
|
|
assert(f->size >= 1 && f->size <= SIZEOF_SIZE_T);
|
|
if (is_unsigned)
|
|
PyErr_Format(StructError,
|
|
"'%c' format requires 0 <= number <= %zu",
|
|
f->format,
|
|
ulargest);
|
|
else {
|
|
const Py_ssize_t largest = (Py_ssize_t)(ulargest >> 1);
|
|
PyErr_Format(StructError,
|
|
"'%c' format requires %zd <= number <= %zd",
|
|
f->format,
|
|
~ largest,
|
|
largest);
|
|
}
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
{
|
|
PyObject *ptype, *pvalue, *ptraceback;
|
|
PyObject *msg;
|
|
int rval;
|
|
PyErr_Fetch(&ptype, &pvalue, &ptraceback);
|
|
assert(pvalue != NULL);
|
|
msg = PyObject_Str(pvalue);
|
|
Py_XDECREF(ptype);
|
|
Py_XDECREF(pvalue);
|
|
Py_XDECREF(ptraceback);
|
|
if (msg == NULL)
|
|
return -1;
|
|
rval = PyErr_Warn(PyExc_DeprecationWarning,
|
|
PyString_AS_STRING(msg));
|
|
Py_DECREF(msg);
|
|
if (rval == 0)
|
|
return 0;
|
|
}
|
|
#endif
|
|
return -1;
|
|
}
|
|
|
|
|
|
|
|
/* A large number of small routines follow, with names of the form
|
|
|
|
[bln][up]_TYPE
|
|
|
|
[bln] distiguishes among big-endian, little-endian and native.
|
|
[pu] distiguishes between pack (to struct) and unpack (from struct).
|
|
TYPE is one of char, byte, ubyte, etc.
|
|
*/
|
|
|
|
/* Native mode routines. ****************************************************/
|
|
/* NOTE:
|
|
In all n[up]_<type> routines handling types larger than 1 byte, there is
|
|
*no* guarantee that the p pointer is properly aligned for each type,
|
|
therefore memcpy is called. An intermediate variable is used to
|
|
compensate for big-endian architectures.
|
|
Normally both the intermediate variable and the memcpy call will be
|
|
skipped by C optimisation in little-endian architectures (gcc >= 2.91
|
|
does this). */
|
|
|
|
static PyObject *
|
|
nu_char(const char *p, const formatdef *f)
|
|
{
|
|
return PyString_FromStringAndSize(p, 1);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_byte(const char *p, const formatdef *f)
|
|
{
|
|
return PyInt_FromLong((long) *(signed char *)p);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_ubyte(const char *p, const formatdef *f)
|
|
{
|
|
return PyInt_FromLong((long) *(unsigned char *)p);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_short(const char *p, const formatdef *f)
|
|
{
|
|
short x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
return PyInt_FromLong((long)x);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_ushort(const char *p, const formatdef *f)
|
|
{
|
|
unsigned short x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
return PyInt_FromLong((long)x);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_int(const char *p, const formatdef *f)
|
|
{
|
|
int x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
return PyInt_FromLong((long)x);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_uint(const char *p, const formatdef *f)
|
|
{
|
|
unsigned int x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
#if (SIZEOF_LONG > SIZEOF_INT)
|
|
return PyInt_FromLong((long)x);
|
|
#else
|
|
if (x <= ((unsigned int)LONG_MAX))
|
|
return PyInt_FromLong((long)x);
|
|
return PyLong_FromUnsignedLong((unsigned long)x);
|
|
#endif
|
|
}
|
|
|
|
static PyObject *
|
|
nu_long(const char *p, const formatdef *f)
|
|
{
|
|
long x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
return PyInt_FromLong(x);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_ulong(const char *p, const formatdef *f)
|
|
{
|
|
unsigned long x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
if (x <= LONG_MAX)
|
|
return PyInt_FromLong((long)x);
|
|
return PyLong_FromUnsignedLong(x);
|
|
}
|
|
|
|
/* Native mode doesn't support q or Q unless the platform C supports
|
|
long long (or, on Windows, __int64). */
|
|
|
|
#ifdef HAVE_LONG_LONG
|
|
|
|
static PyObject *
|
|
nu_longlong(const char *p, const formatdef *f)
|
|
{
|
|
PY_LONG_LONG x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
if (x >= LONG_MIN && x <= LONG_MAX)
|
|
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
|
|
return PyLong_FromLongLong(x);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_ulonglong(const char *p, const formatdef *f)
|
|
{
|
|
unsigned PY_LONG_LONG x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
if (x <= LONG_MAX)
|
|
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long));
|
|
return PyLong_FromUnsignedLongLong(x);
|
|
}
|
|
|
|
#endif
|
|
|
|
static PyObject *
|
|
nu_float(const char *p, const formatdef *f)
|
|
{
|
|
float x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
return PyFloat_FromDouble((double)x);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_double(const char *p, const formatdef *f)
|
|
{
|
|
double x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
return PyFloat_FromDouble(x);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_void_p(const char *p, const formatdef *f)
|
|
{
|
|
void *x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
return PyLong_FromVoidPtr(x);
|
|
}
|
|
|
|
static int
|
|
np_byte(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
if (get_long(v, &x) < 0)
|
|
return -1;
|
|
if (x < -128 || x > 127){
|
|
PyErr_SetString(StructError,
|
|
"byte format requires -128 <= number <= 127");
|
|
return -1;
|
|
}
|
|
*p = (char)x;
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_ubyte(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
if (get_long(v, &x) < 0)
|
|
return -1;
|
|
if (x < 0 || x > 255){
|
|
PyErr_SetString(StructError,
|
|
"ubyte format requires 0 <= number <= 255");
|
|
return -1;
|
|
}
|
|
*p = (char)x;
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_char(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
if (!PyString_Check(v) || PyString_Size(v) != 1) {
|
|
PyErr_SetString(StructError,
|
|
"char format require string of length 1");
|
|
return -1;
|
|
}
|
|
*p = *PyString_AsString(v);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_short(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
short y;
|
|
if (get_long(v, &x) < 0)
|
|
return -1;
|
|
if (x < SHRT_MIN || x > SHRT_MAX){
|
|
PyErr_SetString(StructError,
|
|
"short format requires " STRINGIFY(SHRT_MIN)
|
|
" <= number <= " STRINGIFY(SHRT_MAX));
|
|
return -1;
|
|
}
|
|
y = (short)x;
|
|
memcpy(p, (char *)&y, sizeof y);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_ushort(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
unsigned short y;
|
|
if (get_long(v, &x) < 0)
|
|
return -1;
|
|
if (x < 0 || x > USHRT_MAX){
|
|
PyErr_SetString(StructError,
|
|
"short format requires 0 <= number <= " STRINGIFY(USHRT_MAX));
|
|
return -1;
|
|
}
|
|
y = (unsigned short)x;
|
|
memcpy(p, (char *)&y, sizeof y);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_int(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
int y;
|
|
if (get_long(v, &x) < 0)
|
|
return -1;
|
|
#if (SIZEOF_LONG > SIZEOF_INT)
|
|
if ((x < ((long)INT_MIN)) || (x > ((long)INT_MAX)))
|
|
return _range_error(f, 0);
|
|
#endif
|
|
y = (int)x;
|
|
memcpy(p, (char *)&y, sizeof y);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_uint(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
unsigned long x;
|
|
unsigned int y;
|
|
if (get_ulong(v, &x) < 0)
|
|
return _range_error(f, 1);
|
|
y = (unsigned int)x;
|
|
#if (SIZEOF_LONG > SIZEOF_INT)
|
|
if (x > ((unsigned long)UINT_MAX))
|
|
return _range_error(f, 1);
|
|
#endif
|
|
memcpy(p, (char *)&y, sizeof y);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_long(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
if (get_long(v, &x) < 0)
|
|
return -1;
|
|
memcpy(p, (char *)&x, sizeof x);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_ulong(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
unsigned long x;
|
|
if (get_ulong(v, &x) < 0)
|
|
return _range_error(f, 1);
|
|
memcpy(p, (char *)&x, sizeof x);
|
|
return 0;
|
|
}
|
|
|
|
#ifdef HAVE_LONG_LONG
|
|
|
|
static int
|
|
np_longlong(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
PY_LONG_LONG x;
|
|
if (get_longlong(v, &x) < 0)
|
|
return -1;
|
|
memcpy(p, (char *)&x, sizeof x);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_ulonglong(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
unsigned PY_LONG_LONG x;
|
|
if (get_ulonglong(v, &x) < 0)
|
|
return -1;
|
|
memcpy(p, (char *)&x, sizeof x);
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
static int
|
|
np_float(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
float x = (float)PyFloat_AsDouble(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
PyErr_SetString(StructError,
|
|
"required argument is not a float");
|
|
return -1;
|
|
}
|
|
memcpy(p, (char *)&x, sizeof x);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_double(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
double x = PyFloat_AsDouble(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
PyErr_SetString(StructError,
|
|
"required argument is not a float");
|
|
return -1;
|
|
}
|
|
memcpy(p, (char *)&x, sizeof(double));
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_void_p(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
void *x;
|
|
|
|
v = get_pylong(v);
|
|
if (v == NULL)
|
|
return -1;
|
|
assert(PyLong_Check(v));
|
|
x = PyLong_AsVoidPtr(v);
|
|
Py_DECREF(v);
|
|
if (x == NULL && PyErr_Occurred())
|
|
return -1;
|
|
memcpy(p, (char *)&x, sizeof x);
|
|
return 0;
|
|
}
|
|
|
|
static formatdef native_table[] = {
|
|
{'x', sizeof(char), 0, NULL},
|
|
{'b', sizeof(char), 0, nu_byte, np_byte},
|
|
{'B', sizeof(char), 0, nu_ubyte, np_ubyte},
|
|
{'c', sizeof(char), 0, nu_char, np_char},
|
|
{'s', sizeof(char), 0, NULL},
|
|
{'p', sizeof(char), 0, NULL},
|
|
{'h', sizeof(short), SHORT_ALIGN, nu_short, np_short},
|
|
{'H', sizeof(short), SHORT_ALIGN, nu_ushort, np_ushort},
|
|
{'i', sizeof(int), INT_ALIGN, nu_int, np_int},
|
|
{'I', sizeof(int), INT_ALIGN, nu_uint, np_uint},
|
|
{'l', sizeof(long), LONG_ALIGN, nu_long, np_long},
|
|
{'L', sizeof(long), LONG_ALIGN, nu_ulong, np_ulong},
|
|
#ifdef HAVE_LONG_LONG
|
|
{'q', sizeof(PY_LONG_LONG), LONG_LONG_ALIGN, nu_longlong, np_longlong},
|
|
{'Q', sizeof(PY_LONG_LONG), LONG_LONG_ALIGN, nu_ulonglong,np_ulonglong},
|
|
#endif
|
|
{'f', sizeof(float), FLOAT_ALIGN, nu_float, np_float},
|
|
{'d', sizeof(double), DOUBLE_ALIGN, nu_double, np_double},
|
|
{'P', sizeof(void *), VOID_P_ALIGN, nu_void_p, np_void_p},
|
|
{0}
|
|
};
|
|
|
|
/* Big-endian routines. *****************************************************/
|
|
|
|
static PyObject *
|
|
bu_int(const char *p, const formatdef *f)
|
|
{
|
|
long x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | *bytes++;
|
|
} while (--i > 0);
|
|
/* Extend the sign bit. */
|
|
if (SIZEOF_LONG > f->size)
|
|
x |= -(x & (1L << ((8 * f->size) - 1)));
|
|
return PyInt_FromLong(x);
|
|
}
|
|
|
|
static PyObject *
|
|
bu_uint(const char *p, const formatdef *f)
|
|
{
|
|
unsigned long x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | *bytes++;
|
|
} while (--i > 0);
|
|
if (x <= LONG_MAX)
|
|
return PyInt_FromLong((long)x);
|
|
return PyLong_FromUnsignedLong(x);
|
|
}
|
|
|
|
static PyObject *
|
|
bu_longlong(const char *p, const formatdef *f)
|
|
{
|
|
#ifdef HAVE_LONG_LONG
|
|
PY_LONG_LONG x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | *bytes++;
|
|
} while (--i > 0);
|
|
/* Extend the sign bit. */
|
|
if (SIZEOF_LONG_LONG > f->size)
|
|
x |= -(x & (1L << ((8 * f->size) - 1)));
|
|
if (x >= LONG_MIN && x <= LONG_MAX)
|
|
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
|
|
return PyLong_FromLongLong(x);
|
|
#else
|
|
return _PyLong_FromByteArray((const unsigned char *)p,
|
|
8,
|
|
0, /* little-endian */
|
|
1 /* signed */);
|
|
#endif
|
|
}
|
|
|
|
static PyObject *
|
|
bu_ulonglong(const char *p, const formatdef *f)
|
|
{
|
|
#ifdef HAVE_LONG_LONG
|
|
unsigned PY_LONG_LONG x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | *bytes++;
|
|
} while (--i > 0);
|
|
if (x <= LONG_MAX)
|
|
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long));
|
|
return PyLong_FromUnsignedLongLong(x);
|
|
#else
|
|
return _PyLong_FromByteArray((const unsigned char *)p,
|
|
8,
|
|
0, /* little-endian */
|
|
0 /* signed */);
|
|
#endif
|
|
}
|
|
|
|
static PyObject *
|
|
bu_float(const char *p, const formatdef *f)
|
|
{
|
|
return unpack_float(p, 0);
|
|
}
|
|
|
|
static PyObject *
|
|
bu_double(const char *p, const formatdef *f)
|
|
{
|
|
return unpack_double(p, 0);
|
|
}
|
|
|
|
static int
|
|
bp_int(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
Py_ssize_t i;
|
|
if (get_wrapped_long(v, &x) < 0)
|
|
return -1;
|
|
i = f->size;
|
|
if (i != SIZEOF_LONG) {
|
|
if ((i == 2) && (x < -32768 || x > 32767))
|
|
RANGE_ERROR(x, f, 0, 0xffffL);
|
|
#if (SIZEOF_LONG != 4)
|
|
else if ((i == 4) && (x < -2147483648L || x > 2147483647L))
|
|
RANGE_ERROR(x, f, 0, 0xffffffffL);
|
|
#endif
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
else if ((i == 1) && (x < -128 || x > 127))
|
|
RANGE_ERROR(x, f, 0, 0xffL);
|
|
#endif
|
|
}
|
|
do {
|
|
p[--i] = (char)x;
|
|
x >>= 8;
|
|
} while (i > 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
bp_uint(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
unsigned long x;
|
|
Py_ssize_t i;
|
|
if (get_wrapped_ulong(v, &x) < 0)
|
|
return -1;
|
|
i = f->size;
|
|
if (i != SIZEOF_LONG) {
|
|
unsigned long maxint = 1;
|
|
maxint <<= (unsigned long)(i * 8);
|
|
if (x >= maxint)
|
|
RANGE_ERROR(x, f, 1, maxint - 1);
|
|
}
|
|
do {
|
|
p[--i] = (char)x;
|
|
x >>= 8;
|
|
} while (i > 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
bp_longlong(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
int res;
|
|
v = get_pylong(v);
|
|
if (v == NULL)
|
|
return -1;
|
|
res = _PyLong_AsByteArray((PyLongObject *)v,
|
|
(unsigned char *)p,
|
|
8,
|
|
0, /* little_endian */
|
|
1 /* signed */);
|
|
Py_DECREF(v);
|
|
return res;
|
|
}
|
|
|
|
static int
|
|
bp_ulonglong(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
int res;
|
|
v = get_pylong(v);
|
|
if (v == NULL)
|
|
return -1;
|
|
res = _PyLong_AsByteArray((PyLongObject *)v,
|
|
(unsigned char *)p,
|
|
8,
|
|
0, /* little_endian */
|
|
0 /* signed */);
|
|
Py_DECREF(v);
|
|
return res;
|
|
}
|
|
|
|
static int
|
|
bp_float(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
double x = PyFloat_AsDouble(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
PyErr_SetString(StructError,
|
|
"required argument is not a float");
|
|
return -1;
|
|
}
|
|
return _PyFloat_Pack4(x, (unsigned char *)p, 0);
|
|
}
|
|
|
|
static int
|
|
bp_double(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
double x = PyFloat_AsDouble(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
PyErr_SetString(StructError,
|
|
"required argument is not a float");
|
|
return -1;
|
|
}
|
|
return _PyFloat_Pack8(x, (unsigned char *)p, 0);
|
|
}
|
|
|
|
static formatdef bigendian_table[] = {
|
|
{'x', 1, 0, NULL},
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
/* Native packers do range checking without overflow masking. */
|
|
{'b', 1, 0, nu_byte, bp_int},
|
|
{'B', 1, 0, nu_ubyte, bp_uint},
|
|
#else
|
|
{'b', 1, 0, nu_byte, np_byte},
|
|
{'B', 1, 0, nu_ubyte, np_ubyte},
|
|
#endif
|
|
{'c', 1, 0, nu_char, np_char},
|
|
{'s', 1, 0, NULL},
|
|
{'p', 1, 0, NULL},
|
|
{'h', 2, 0, bu_int, bp_int},
|
|
{'H', 2, 0, bu_uint, bp_uint},
|
|
{'i', 4, 0, bu_int, bp_int},
|
|
{'I', 4, 0, bu_uint, bp_uint},
|
|
{'l', 4, 0, bu_int, bp_int},
|
|
{'L', 4, 0, bu_uint, bp_uint},
|
|
{'q', 8, 0, bu_longlong, bp_longlong},
|
|
{'Q', 8, 0, bu_ulonglong, bp_ulonglong},
|
|
{'f', 4, 0, bu_float, bp_float},
|
|
{'d', 8, 0, bu_double, bp_double},
|
|
{0}
|
|
};
|
|
|
|
/* Little-endian routines. *****************************************************/
|
|
|
|
static PyObject *
|
|
lu_int(const char *p, const formatdef *f)
|
|
{
|
|
long x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | bytes[--i];
|
|
} while (i > 0);
|
|
/* Extend the sign bit. */
|
|
if (SIZEOF_LONG > f->size)
|
|
x |= -(x & (1L << ((8 * f->size) - 1)));
|
|
return PyInt_FromLong(x);
|
|
}
|
|
|
|
static PyObject *
|
|
lu_uint(const char *p, const formatdef *f)
|
|
{
|
|
unsigned long x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | bytes[--i];
|
|
} while (i > 0);
|
|
if (x <= LONG_MAX)
|
|
return PyInt_FromLong((long)x);
|
|
return PyLong_FromUnsignedLong((long)x);
|
|
}
|
|
|
|
static PyObject *
|
|
lu_longlong(const char *p, const formatdef *f)
|
|
{
|
|
#ifdef HAVE_LONG_LONG
|
|
PY_LONG_LONG x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | bytes[--i];
|
|
} while (i > 0);
|
|
/* Extend the sign bit. */
|
|
if (SIZEOF_LONG_LONG > f->size)
|
|
x |= -(x & (1L << ((8 * f->size) - 1)));
|
|
if (x >= LONG_MIN && x <= LONG_MAX)
|
|
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
|
|
return PyLong_FromLongLong(x);
|
|
#else
|
|
return _PyLong_FromByteArray((const unsigned char *)p,
|
|
8,
|
|
1, /* little-endian */
|
|
1 /* signed */);
|
|
#endif
|
|
}
|
|
|
|
static PyObject *
|
|
lu_ulonglong(const char *p, const formatdef *f)
|
|
{
|
|
#ifdef HAVE_LONG_LONG
|
|
unsigned PY_LONG_LONG x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | bytes[--i];
|
|
} while (i > 0);
|
|
if (x <= LONG_MAX)
|
|
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long));
|
|
return PyLong_FromUnsignedLongLong(x);
|
|
#else
|
|
return _PyLong_FromByteArray((const unsigned char *)p,
|
|
8,
|
|
1, /* little-endian */
|
|
0 /* signed */);
|
|
#endif
|
|
}
|
|
|
|
static PyObject *
|
|
lu_float(const char *p, const formatdef *f)
|
|
{
|
|
return unpack_float(p, 1);
|
|
}
|
|
|
|
static PyObject *
|
|
lu_double(const char *p, const formatdef *f)
|
|
{
|
|
return unpack_double(p, 1);
|
|
}
|
|
|
|
static int
|
|
lp_int(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
Py_ssize_t i;
|
|
if (get_wrapped_long(v, &x) < 0)
|
|
return -1;
|
|
i = f->size;
|
|
if (i != SIZEOF_LONG) {
|
|
if ((i == 2) && (x < -32768 || x > 32767))
|
|
RANGE_ERROR(x, f, 0, 0xffffL);
|
|
#if (SIZEOF_LONG != 4)
|
|
else if ((i == 4) && (x < -2147483648L || x > 2147483647L))
|
|
RANGE_ERROR(x, f, 0, 0xffffffffL);
|
|
#endif
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
else if ((i == 1) && (x < -128 || x > 127))
|
|
RANGE_ERROR(x, f, 0, 0xffL);
|
|
#endif
|
|
}
|
|
do {
|
|
*p++ = (char)x;
|
|
x >>= 8;
|
|
} while (--i > 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
lp_uint(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
unsigned long x;
|
|
Py_ssize_t i;
|
|
if (get_wrapped_ulong(v, &x) < 0)
|
|
return -1;
|
|
i = f->size;
|
|
if (i != SIZEOF_LONG) {
|
|
unsigned long maxint = 1;
|
|
maxint <<= (unsigned long)(i * 8);
|
|
if (x >= maxint)
|
|
RANGE_ERROR(x, f, 1, maxint - 1);
|
|
}
|
|
do {
|
|
*p++ = (char)x;
|
|
x >>= 8;
|
|
} while (--i > 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
lp_longlong(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
int res;
|
|
v = get_pylong(v);
|
|
if (v == NULL)
|
|
return -1;
|
|
res = _PyLong_AsByteArray((PyLongObject*)v,
|
|
(unsigned char *)p,
|
|
8,
|
|
1, /* little_endian */
|
|
1 /* signed */);
|
|
Py_DECREF(v);
|
|
return res;
|
|
}
|
|
|
|
static int
|
|
lp_ulonglong(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
int res;
|
|
v = get_pylong(v);
|
|
if (v == NULL)
|
|
return -1;
|
|
res = _PyLong_AsByteArray((PyLongObject*)v,
|
|
(unsigned char *)p,
|
|
8,
|
|
1, /* little_endian */
|
|
0 /* signed */);
|
|
Py_DECREF(v);
|
|
return res;
|
|
}
|
|
|
|
static int
|
|
lp_float(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
double x = PyFloat_AsDouble(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
PyErr_SetString(StructError,
|
|
"required argument is not a float");
|
|
return -1;
|
|
}
|
|
return _PyFloat_Pack4(x, (unsigned char *)p, 1);
|
|
}
|
|
|
|
static int
|
|
lp_double(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
double x = PyFloat_AsDouble(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
PyErr_SetString(StructError,
|
|
"required argument is not a float");
|
|
return -1;
|
|
}
|
|
return _PyFloat_Pack8(x, (unsigned char *)p, 1);
|
|
}
|
|
|
|
static formatdef lilendian_table[] = {
|
|
{'x', 1, 0, NULL},
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
/* Native packers do range checking without overflow masking. */
|
|
{'b', 1, 0, nu_byte, lp_int},
|
|
{'B', 1, 0, nu_ubyte, lp_uint},
|
|
#else
|
|
{'b', 1, 0, nu_byte, np_byte},
|
|
{'B', 1, 0, nu_ubyte, np_ubyte},
|
|
#endif
|
|
{'c', 1, 0, nu_char, np_char},
|
|
{'s', 1, 0, NULL},
|
|
{'p', 1, 0, NULL},
|
|
{'h', 2, 0, lu_int, lp_int},
|
|
{'H', 2, 0, lu_uint, lp_uint},
|
|
{'i', 4, 0, lu_int, lp_int},
|
|
{'I', 4, 0, lu_uint, lp_uint},
|
|
{'l', 4, 0, lu_int, lp_int},
|
|
{'L', 4, 0, lu_uint, lp_uint},
|
|
{'q', 8, 0, lu_longlong, lp_longlong},
|
|
{'Q', 8, 0, lu_ulonglong, lp_ulonglong},
|
|
{'f', 4, 0, lu_float, lp_float},
|
|
{'d', 8, 0, lu_double, lp_double},
|
|
{0}
|
|
};
|
|
|
|
|
|
static const formatdef *
|
|
whichtable(char **pfmt)
|
|
{
|
|
const char *fmt = (*pfmt)++; /* May be backed out of later */
|
|
switch (*fmt) {
|
|
case '<':
|
|
return lilendian_table;
|
|
case '>':
|
|
case '!': /* Network byte order is big-endian */
|
|
return bigendian_table;
|
|
case '=': { /* Host byte order -- different from native in aligment! */
|
|
int n = 1;
|
|
char *p = (char *) &n;
|
|
if (*p == 1)
|
|
return lilendian_table;
|
|
else
|
|
return bigendian_table;
|
|
}
|
|
default:
|
|
--*pfmt; /* Back out of pointer increment */
|
|
/* Fall through */
|
|
case '@':
|
|
return native_table;
|
|
}
|
|
}
|
|
|
|
|
|
/* Get the table entry for a format code */
|
|
|
|
static const formatdef *
|
|
getentry(int c, const formatdef *f)
|
|
{
|
|
for (; f->format != '\0'; f++) {
|
|
if (f->format == c) {
|
|
return f;
|
|
}
|
|
}
|
|
PyErr_SetString(StructError, "bad char in struct format");
|
|
return NULL;
|
|
}
|
|
|
|
|
|
/* Align a size according to a format code */
|
|
|
|
static int
|
|
align(Py_ssize_t size, char c, const formatdef *e)
|
|
{
|
|
if (e->format == c) {
|
|
if (e->alignment) {
|
|
size = ((size + e->alignment - 1)
|
|
/ e->alignment)
|
|
* e->alignment;
|
|
}
|
|
}
|
|
return size;
|
|
}
|
|
|
|
|
|
/* calculate the size of a format string */
|
|
|
|
static int
|
|
prepare_s(PyStructObject *self)
|
|
{
|
|
const formatdef *f;
|
|
const formatdef *e;
|
|
formatcode *codes;
|
|
|
|
const char *s;
|
|
const char *fmt;
|
|
char c;
|
|
Py_ssize_t size, len, num, itemsize, x;
|
|
|
|
fmt = PyString_AS_STRING(self->s_format);
|
|
|
|
f = whichtable((char **)&fmt);
|
|
|
|
s = fmt;
|
|
size = 0;
|
|
len = 0;
|
|
while ((c = *s++) != '\0') {
|
|
if (isspace(Py_CHARMASK(c)))
|
|
continue;
|
|
if ('0' <= c && c <= '9') {
|
|
num = c - '0';
|
|
while ('0' <= (c = *s++) && c <= '9') {
|
|
x = num*10 + (c - '0');
|
|
if (x/10 != num) {
|
|
PyErr_SetString(
|
|
StructError,
|
|
"overflow in item count");
|
|
return -1;
|
|
}
|
|
num = x;
|
|
}
|
|
if (c == '\0')
|
|
break;
|
|
}
|
|
else
|
|
num = 1;
|
|
|
|
e = getentry(c, f);
|
|
if (e == NULL)
|
|
return -1;
|
|
|
|
switch (c) {
|
|
case 's': /* fall through */
|
|
case 'p': len++; break;
|
|
case 'x': break;
|
|
default: len += num; break;
|
|
}
|
|
|
|
itemsize = e->size;
|
|
size = align(size, c, e);
|
|
x = num * itemsize;
|
|
size += x;
|
|
if (x/itemsize != num || size < 0) {
|
|
PyErr_SetString(StructError,
|
|
"total struct size too long");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
self->s_size = size;
|
|
self->s_len = len;
|
|
codes = PyMem_MALLOC((len + 1) * sizeof(formatcode));
|
|
if (codes == NULL) {
|
|
PyErr_NoMemory();
|
|
return -1;
|
|
}
|
|
self->s_codes = codes;
|
|
|
|
s = fmt;
|
|
size = 0;
|
|
while ((c = *s++) != '\0') {
|
|
if (isspace(Py_CHARMASK(c)))
|
|
continue;
|
|
if ('0' <= c && c <= '9') {
|
|
num = c - '0';
|
|
while ('0' <= (c = *s++) && c <= '9')
|
|
num = num*10 + (c - '0');
|
|
if (c == '\0')
|
|
break;
|
|
}
|
|
else
|
|
num = 1;
|
|
|
|
e = getentry(c, f);
|
|
|
|
size = align(size, c, e);
|
|
if (c == 's' || c == 'p') {
|
|
codes->offset = size;
|
|
codes->size = num;
|
|
codes->fmtdef = e;
|
|
codes++;
|
|
size += num;
|
|
} else if (c == 'x') {
|
|
size += num;
|
|
} else {
|
|
while (--num >= 0) {
|
|
codes->offset = size;
|
|
codes->size = e->size;
|
|
codes->fmtdef = e;
|
|
codes++;
|
|
size += e->size;
|
|
}
|
|
}
|
|
}
|
|
codes->fmtdef = NULL;
|
|
codes->offset = size;
|
|
codes->size = 0;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
s_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyObject *self;
|
|
|
|
assert(type != NULL && type->tp_alloc != NULL);
|
|
|
|
self = type->tp_alloc(type, 0);
|
|
if (self != NULL) {
|
|
PyStructObject *s = (PyStructObject*)self;
|
|
Py_INCREF(Py_None);
|
|
s->s_format = Py_None;
|
|
s->s_codes = NULL;
|
|
s->s_size = -1;
|
|
s->s_len = -1;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
static int
|
|
s_init(PyObject *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyStructObject *soself = (PyStructObject *)self;
|
|
PyObject *o_format = NULL;
|
|
int ret = 0;
|
|
static char *kwlist[] = {"format", 0};
|
|
|
|
assert(PyStruct_Check(self));
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "S:Struct", kwlist,
|
|
&o_format))
|
|
return -1;
|
|
|
|
Py_INCREF(o_format);
|
|
Py_XDECREF(soself->s_format);
|
|
soself->s_format = o_format;
|
|
|
|
ret = prepare_s(soself);
|
|
return ret;
|
|
}
|
|
|
|
static void
|
|
s_dealloc(PyStructObject *s)
|
|
{
|
|
if (s->weakreflist != NULL)
|
|
PyObject_ClearWeakRefs((PyObject *)s);
|
|
if (s->s_codes != NULL) {
|
|
PyMem_FREE(s->s_codes);
|
|
}
|
|
Py_XDECREF(s->s_format);
|
|
s->ob_type->tp_free((PyObject *)s);
|
|
}
|
|
|
|
static PyObject *
|
|
s_unpack_internal(PyStructObject *soself, char *startfrom) {
|
|
formatcode *code;
|
|
Py_ssize_t i = 0;
|
|
PyObject *result = PyTuple_New(soself->s_len);
|
|
if (result == NULL)
|
|
return NULL;
|
|
|
|
for (code = soself->s_codes; code->fmtdef != NULL; code++) {
|
|
PyObject *v;
|
|
const formatdef *e = code->fmtdef;
|
|
const char *res = startfrom + code->offset;
|
|
if (e->format == 's') {
|
|
v = PyString_FromStringAndSize(res, code->size);
|
|
if (v == NULL)
|
|
goto fail;
|
|
PyTuple_SET_ITEM(result, i++, v);
|
|
} else if (e->format == 'p') {
|
|
Py_ssize_t n = *(unsigned char*)res;
|
|
if (n >= code->size)
|
|
n = code->size - 1;
|
|
v = PyString_FromStringAndSize(res + 1, n);
|
|
if (v == NULL)
|
|
goto fail;
|
|
PyTuple_SET_ITEM(result, i++, v);
|
|
} else {
|
|
v = e->unpack(res, e);
|
|
if (v == NULL)
|
|
goto fail;
|
|
PyTuple_SET_ITEM(result, i++, v);
|
|
}
|
|
}
|
|
|
|
return result;
|
|
fail:
|
|
Py_DECREF(result);
|
|
return NULL;
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(s_unpack__doc__,
|
|
"S.unpack(str) -> (v1, v2, ...)\n\
|
|
\n\
|
|
Return tuple containing values unpacked according to this Struct's format.\n\
|
|
Requires len(str) == self.size. See struct.__doc__ for more on format\n\
|
|
strings.");
|
|
|
|
static PyObject *
|
|
s_unpack(PyObject *self, PyObject *inputstr)
|
|
{
|
|
PyStructObject *soself = (PyStructObject *)self;
|
|
assert(PyStruct_Check(self));
|
|
assert(soself->s_codes != NULL);
|
|
if (inputstr == NULL || !PyString_Check(inputstr) ||
|
|
PyString_GET_SIZE(inputstr) != soself->s_size) {
|
|
PyErr_Format(StructError,
|
|
"unpack requires a string argument of length %zd", soself->s_size);
|
|
return NULL;
|
|
}
|
|
return s_unpack_internal(soself, PyString_AS_STRING(inputstr));
|
|
}
|
|
|
|
PyDoc_STRVAR(s_unpack_from__doc__,
|
|
"S.unpack_from(buffer[, offset]) -> (v1, v2, ...)\n\
|
|
\n\
|
|
Return tuple containing values unpacked according to this Struct's format.\n\
|
|
Unlike unpack, unpack_from can unpack values from any object supporting\n\
|
|
the buffer API, not just str. Requires len(buffer[offset:]) >= self.size.\n\
|
|
See struct.__doc__ for more on format strings.");
|
|
|
|
static PyObject *
|
|
s_unpack_from(PyObject *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
static char *kwlist[] = {"buffer", "offset", 0};
|
|
#if (PY_VERSION_HEX < 0x02050000)
|
|
static char *fmt = "z#|i:unpack_from";
|
|
#else
|
|
static char *fmt = "z#|n:unpack_from";
|
|
#endif
|
|
Py_ssize_t buffer_len = 0, offset = 0;
|
|
char *buffer = NULL;
|
|
PyStructObject *soself = (PyStructObject *)self;
|
|
assert(PyStruct_Check(self));
|
|
assert(soself->s_codes != NULL);
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, fmt, kwlist,
|
|
&buffer, &buffer_len, &offset))
|
|
return NULL;
|
|
|
|
if (buffer == NULL) {
|
|
PyErr_Format(StructError,
|
|
"unpack_from requires a buffer argument");
|
|
return NULL;
|
|
}
|
|
|
|
if (offset < 0)
|
|
offset += buffer_len;
|
|
|
|
if (offset < 0 || (buffer_len - offset) < soself->s_size) {
|
|
PyErr_Format(StructError,
|
|
"unpack_from requires a buffer of at least %zd bytes",
|
|
soself->s_size);
|
|
return NULL;
|
|
}
|
|
return s_unpack_internal(soself, buffer + offset);
|
|
}
|
|
|
|
|
|
/*
|
|
* Guts of the pack function.
|
|
*
|
|
* Takes a struct object, a tuple of arguments, and offset in that tuple of
|
|
* argument for where to start processing the arguments for packing, and a
|
|
* character buffer for writing the packed string. The caller must insure
|
|
* that the buffer may contain the required length for packing the arguments.
|
|
* 0 is returned on success, 1 is returned if there is an error.
|
|
*
|
|
*/
|
|
static int
|
|
s_pack_internal(PyStructObject *soself, PyObject *args, int offset, char* buf)
|
|
{
|
|
formatcode *code;
|
|
Py_ssize_t i;
|
|
|
|
memset(buf, '\0', soself->s_size);
|
|
i = offset;
|
|
for (code = soself->s_codes; code->fmtdef != NULL; code++) {
|
|
Py_ssize_t n;
|
|
PyObject *v;
|
|
const formatdef *e = code->fmtdef;
|
|
char *res = buf + code->offset;
|
|
if (e->format == 's') {
|
|
v = PyTuple_GET_ITEM(args, i++);
|
|
if (!PyString_Check(v)) {
|
|
PyErr_SetString(StructError,
|
|
"argument for 's' must be a string");
|
|
return -1;
|
|
}
|
|
n = PyString_GET_SIZE(v);
|
|
if (n > code->size)
|
|
n = code->size;
|
|
if (n > 0)
|
|
memcpy(res, PyString_AS_STRING(v), n);
|
|
} else if (e->format == 'p') {
|
|
v = PyTuple_GET_ITEM(args, i++);
|
|
if (!PyString_Check(v)) {
|
|
PyErr_SetString(StructError,
|
|
"argument for 'p' must be a string");
|
|
return -1;
|
|
}
|
|
n = PyString_GET_SIZE(v);
|
|
if (n > (code->size - 1))
|
|
n = code->size - 1;
|
|
if (n > 0)
|
|
memcpy(res + 1, PyString_AS_STRING(v), n);
|
|
if (n > 255)
|
|
n = 255;
|
|
*res = Py_SAFE_DOWNCAST(n, Py_ssize_t, unsigned char);
|
|
} else {
|
|
v = PyTuple_GET_ITEM(args, i++);
|
|
if (e->pack(res, v, e) < 0) {
|
|
if (PyLong_Check(v) && PyErr_ExceptionMatches(PyExc_OverflowError))
|
|
PyErr_SetString(StructError,
|
|
"long too large to convert to int");
|
|
return -1;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Success */
|
|
return 0;
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(s_pack__doc__,
|
|
"S.pack(v1, v2, ...) -> string\n\
|
|
\n\
|
|
Return a string containing values v1, v2, ... packed according to this\n\
|
|
Struct's format. See struct.__doc__ for more on format strings.");
|
|
|
|
static PyObject *
|
|
s_pack(PyObject *self, PyObject *args)
|
|
{
|
|
PyStructObject *soself;
|
|
PyObject *result;
|
|
|
|
/* Validate arguments. */
|
|
soself = (PyStructObject *)self;
|
|
assert(PyStruct_Check(self));
|
|
assert(soself->s_codes != NULL);
|
|
if (PyTuple_GET_SIZE(args) != soself->s_len)
|
|
{
|
|
PyErr_Format(StructError,
|
|
"pack requires exactly %zd arguments", soself->s_len);
|
|
return NULL;
|
|
}
|
|
|
|
/* Allocate a new string */
|
|
result = PyString_FromStringAndSize((char *)NULL, soself->s_size);
|
|
if (result == NULL)
|
|
return NULL;
|
|
|
|
/* Call the guts */
|
|
if ( s_pack_internal(soself, args, 0, PyString_AS_STRING(result)) != 0 ) {
|
|
Py_DECREF(result);
|
|
return NULL;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
PyDoc_STRVAR(s_pack_into__doc__,
|
|
"S.pack_into(buffer, offset, v1, v2, ...)\n\
|
|
\n\
|
|
Pack the values v1, v2, ... according to this Struct's format, write \n\
|
|
the packed bytes into the writable buffer buf starting at offset. Note\n\
|
|
that the offset is not an optional argument. See struct.__doc__ for \n\
|
|
more on format strings.");
|
|
|
|
static PyObject *
|
|
s_pack_into(PyObject *self, PyObject *args)
|
|
{
|
|
PyStructObject *soself;
|
|
char *buffer;
|
|
Py_ssize_t buffer_len, offset;
|
|
|
|
/* Validate arguments. +1 is for the first arg as buffer. */
|
|
soself = (PyStructObject *)self;
|
|
assert(PyStruct_Check(self));
|
|
assert(soself->s_codes != NULL);
|
|
if (PyTuple_GET_SIZE(args) != (soself->s_len + 2))
|
|
{
|
|
PyErr_Format(StructError,
|
|
"pack_into requires exactly %zd arguments",
|
|
(soself->s_len + 2));
|
|
return NULL;
|
|
}
|
|
|
|
/* Extract a writable memory buffer from the first argument */
|
|
if ( PyObject_AsWriteBuffer(PyTuple_GET_ITEM(args, 0),
|
|
(void**)&buffer, &buffer_len) == -1 ) {
|
|
return NULL;
|
|
}
|
|
assert( buffer_len >= 0 );
|
|
|
|
/* Extract the offset from the first argument */
|
|
offset = PyInt_AsSsize_t(PyTuple_GET_ITEM(args, 1));
|
|
|
|
/* Support negative offsets. */
|
|
if (offset < 0)
|
|
offset += buffer_len;
|
|
|
|
/* Check boundaries */
|
|
if (offset < 0 || (buffer_len - offset) < soself->s_size) {
|
|
PyErr_Format(StructError,
|
|
"pack_into requires a buffer of at least %zd bytes",
|
|
soself->s_size);
|
|
return NULL;
|
|
}
|
|
|
|
/* Call the guts */
|
|
if ( s_pack_internal(soself, args, 2, buffer + offset) != 0 ) {
|
|
return NULL;
|
|
}
|
|
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
static PyObject *
|
|
s_get_format(PyStructObject *self, void *unused)
|
|
{
|
|
Py_INCREF(self->s_format);
|
|
return self->s_format;
|
|
}
|
|
|
|
static PyObject *
|
|
s_get_size(PyStructObject *self, void *unused)
|
|
{
|
|
return PyInt_FromSsize_t(self->s_size);
|
|
}
|
|
|
|
/* List of functions */
|
|
|
|
static struct PyMethodDef s_methods[] = {
|
|
{"pack", s_pack, METH_VARARGS, s_pack__doc__},
|
|
{"pack_into", s_pack_into, METH_VARARGS, s_pack_into__doc__},
|
|
{"unpack", s_unpack, METH_O, s_unpack__doc__},
|
|
{"unpack_from", (PyCFunction)s_unpack_from, METH_KEYWORDS,
|
|
s_unpack_from__doc__},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
PyDoc_STRVAR(s__doc__, "Compiled struct object");
|
|
|
|
#define OFF(x) offsetof(PyStructObject, x)
|
|
|
|
static PyGetSetDef s_getsetlist[] = {
|
|
{"format", (getter)s_get_format, (setter)NULL, "struct format string", NULL},
|
|
{"size", (getter)s_get_size, (setter)NULL, "struct size in bytes", NULL},
|
|
{NULL} /* sentinel */
|
|
};
|
|
|
|
static
|
|
PyTypeObject PyStructType = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0,
|
|
"Struct",
|
|
sizeof(PyStructObject),
|
|
0,
|
|
(destructor)s_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
0, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
PyObject_GenericSetAttr, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_WEAKREFS,/* tp_flags */
|
|
s__doc__, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
offsetof(PyStructObject, weakreflist), /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
s_methods, /* tp_methods */
|
|
NULL, /* tp_members */
|
|
s_getsetlist, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
s_init, /* tp_init */
|
|
PyType_GenericAlloc,/* tp_alloc */
|
|
s_new, /* tp_new */
|
|
PyObject_Del, /* tp_free */
|
|
};
|
|
|
|
/* Module initialization */
|
|
|
|
PyMODINIT_FUNC
|
|
init_struct(void)
|
|
{
|
|
PyObject *m = Py_InitModule("_struct", NULL);
|
|
if (m == NULL)
|
|
return;
|
|
|
|
PyStructType.ob_type = &PyType_Type;
|
|
if (PyType_Ready(&PyStructType) < 0)
|
|
return;
|
|
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
if (pyint_zero == NULL) {
|
|
pyint_zero = PyInt_FromLong(0);
|
|
if (pyint_zero == NULL)
|
|
return;
|
|
}
|
|
if (pylong_ulong_mask == NULL) {
|
|
#if (SIZEOF_LONG == 4)
|
|
pylong_ulong_mask = PyLong_FromString("FFFFFFFF", NULL, 16);
|
|
#else
|
|
pylong_ulong_mask = PyLong_FromString("FFFFFFFFFFFFFFFF", NULL, 16);
|
|
#endif
|
|
if (pylong_ulong_mask == NULL)
|
|
return;
|
|
}
|
|
|
|
#else
|
|
/* This speed trick can't be used until overflow masking goes away, because
|
|
native endian always raises exceptions instead of overflow masking. */
|
|
|
|
/* Check endian and swap in faster functions */
|
|
{
|
|
int one = 1;
|
|
formatdef *native = native_table;
|
|
formatdef *other, *ptr;
|
|
if ((int)*(unsigned char*)&one)
|
|
other = lilendian_table;
|
|
else
|
|
other = bigendian_table;
|
|
/* Scan through the native table, find a matching
|
|
entry in the endian table and swap in the
|
|
native implementations whenever possible
|
|
(64-bit platforms may not have "standard" sizes) */
|
|
while (native->format != '\0' && other->format != '\0') {
|
|
ptr = other;
|
|
while (ptr->format != '\0') {
|
|
if (ptr->format == native->format) {
|
|
/* Match faster when formats are
|
|
listed in the same order */
|
|
if (ptr == other)
|
|
other++;
|
|
/* Only use the trick if the
|
|
size matches */
|
|
if (ptr->size != native->size)
|
|
break;
|
|
/* Skip float and double, could be
|
|
"unknown" float format */
|
|
if (ptr->format == 'd' || ptr->format == 'f')
|
|
break;
|
|
ptr->pack = native->pack;
|
|
ptr->unpack = native->unpack;
|
|
break;
|
|
}
|
|
ptr++;
|
|
}
|
|
native++;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
/* Add some symbolic constants to the module */
|
|
if (StructError == NULL) {
|
|
StructError = PyErr_NewException("struct.error", NULL, NULL);
|
|
if (StructError == NULL)
|
|
return;
|
|
}
|
|
|
|
Py_INCREF(StructError);
|
|
PyModule_AddObject(m, "error", StructError);
|
|
|
|
Py_INCREF((PyObject*)&PyStructType);
|
|
PyModule_AddObject(m, "Struct", (PyObject*)&PyStructType);
|
|
|
|
PyModule_AddIntConstant(m, "_PY_STRUCT_RANGE_CHECKING", 1);
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
PyModule_AddIntConstant(m, "_PY_STRUCT_OVERFLOW_MASKING", 1);
|
|
#endif
|
|
}
|