diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-04-17 13:40:08 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-04-17 13:40:08 (GMT) |
| commit | 6c1074888e147c11ac0175e97594daa4f0625844 (patch) | |
| tree | 6353ef17fa9f6da7a71f1cd752bf2871bb1e1078 /Python | |
| parent | 749d070e93f0052bc9540c163d465a6c00eed4ed (diff) | |
| download | cpython-6c1074888e147c11ac0175e97594daa4f0625844.zip cpython-6c1074888e147c11ac0175e97594daa4f0625844.tar.gz cpython-6c1074888e147c11ac0175e97594daa4f0625844.tar.bz2 | |
This patches fixes a number of byteorder problems in MacOSX specific code.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/mactoolboxglue.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Python/mactoolboxglue.c b/Python/mactoolboxglue.c index 7f0627e..0aa2cfd 100644 --- a/Python/mactoolboxglue.c +++ b/Python/mactoolboxglue.c @@ -25,6 +25,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #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 @@ PyMac_GetFullPathname(FSSpec *fss, char *path, int len) 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 @@ PyMac_GetOSType(PyObject *v, OSType *pr) 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 */ |