[Python-checkins] r45487 - in python/trunk: Lib/plat-mac/applesingle.py Lib/test/test_applesingle.py Mac/Modules/gestaltmodule.c Python/mactoolboxglue.c
ronald.oussoren
python-checkins at python.org
Mon Apr 17 15:40:08 CEST 2006
Author: ronald.oussoren
Date: Mon Apr 17 15:40:08 2006
New Revision: 45487
Modified:
python/trunk/Lib/plat-mac/applesingle.py
python/trunk/Lib/test/test_applesingle.py
python/trunk/Mac/Modules/gestaltmodule.c
python/trunk/Python/mactoolboxglue.c
Log:
This patches fixes a number of byteorder problems in MacOSX specific code.
Modified: python/trunk/Lib/plat-mac/applesingle.py
==============================================================================
--- python/trunk/Lib/plat-mac/applesingle.py (original)
+++ python/trunk/Lib/plat-mac/applesingle.py Mon Apr 17 15:40:08 2006
@@ -25,7 +25,7 @@
pass
# File header format: magic, version, unused, number of entries
-AS_HEADER_FORMAT=">ll16sh"
+AS_HEADER_FORMAT=">LL16sh"
AS_HEADER_LENGTH=26
# The flag words for AppleSingle
AS_MAGIC=0x00051600
Modified: python/trunk/Lib/test/test_applesingle.py
==============================================================================
--- python/trunk/Lib/test/test_applesingle.py (original)
+++ python/trunk/Lib/test/test_applesingle.py Mon Apr 17 15:40:08 2006
@@ -15,8 +15,8 @@
dataforkdata = 'hello\r\0world\n'
resourceforkdata = 'goodbye\ncruel\0world\r'
-applesingledata = struct.pack("ll16sh", AS_MAGIC, AS_VERSION, "foo", 2) + \
- struct.pack("llllll", 1, 50, len(dataforkdata),
+applesingledata = struct.pack(">ll16sh", AS_MAGIC, AS_VERSION, "foo", 2) + \
+ struct.pack(">llllll", 1, 50, len(dataforkdata),
2, 50+len(dataforkdata), len(resourceforkdata)) + \
dataforkdata + \
resourceforkdata
Modified: python/trunk/Mac/Modules/gestaltmodule.c
==============================================================================
--- python/trunk/Mac/Modules/gestaltmodule.c (original)
+++ python/trunk/Mac/Modules/gestaltmodule.c Mon Apr 17 15:40:08 2006
@@ -33,17 +33,10 @@
gestalt_gestalt(PyObject *self, PyObject *args)
{
OSErr iErr;
- char *str;
- int size;
OSType selector;
long response;
- if (!PyArg_Parse(args, "s#", &str, &size))
+ if (!PyArg_Parse(args, "O&", PyMac_GetOSType, &selector))
return NULL;
- if (size != 4) {
- PyErr_SetString(PyExc_TypeError, "gestalt arg must be 4-char string");
- return NULL;
- }
- selector = *(OSType*)str;
iErr = Gestalt ( selector, &response );
if (iErr != 0)
return PyMac_Error(iErr);
Modified: python/trunk/Python/mactoolboxglue.c
==============================================================================
--- python/trunk/Python/mactoolboxglue.c (original)
+++ python/trunk/Python/mactoolboxglue.c Mon Apr 17 15:40:08 2006
@@ -25,6 +25,7 @@
#include "Python.h"
#include "pymactoolbox.h"
+#include <arpa/inet.h> /* for ntohl, htonl */
/* Like strerror() but for Mac OS error numbers */
@@ -156,12 +157,14 @@
int
PyMac_GetOSType(PyObject *v, OSType *pr)
{
+ uint32_t tmp;
if (!PyString_Check(v) || PyString_Size(v) != 4) {
PyErr_SetString(PyExc_TypeError,
"OSType arg must be string of 4 chars");
return 0;
}
- memcpy((char *)pr, PyString_AsString(v), 4);
+ memcpy((char *)&tmp, PyString_AsString(v), 4);
+ *pr = (OSType)ntohl(tmp);
return 1;
}
@@ -169,7 +172,8 @@
PyObject *
PyMac_BuildOSType(OSType t)
{
- return PyString_FromStringAndSize((char *)&t, 4);
+ uint32_t tmp = htonl((uint32_t)t);
+ return PyString_FromStringAndSize((char *)&tmp, 4);
}
/* Convert an NumVersion value to a 4-element tuple */
More information about the Python-checkins
mailing list