From 6c1074888e147c11ac0175e97594daa4f0625844 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Mon, 17 Apr 2006 13:40:08 +0000
Subject: This patches fixes a number of byteorder problems in MacOSX specific
 code.

---
 Lib/plat-mac/applesingle.py  | 2 +-
 Lib/test/test_applesingle.py | 4 ++--
 Mac/Modules/gestaltmodule.c  | 9 +--------
 Python/mactoolboxglue.c      | 8 ++++++--
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Lib/plat-mac/applesingle.py b/Lib/plat-mac/applesingle.py
index b035d9e..76bdb06 100644
--- a/Lib/plat-mac/applesingle.py
+++ b/Lib/plat-mac/applesingle.py
@@ -25,7 +25,7 @@ class Error(ValueError):
     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
diff --git a/Lib/test/test_applesingle.py b/Lib/test/test_applesingle.py
index 2a2d60a..d533f1a 100644
--- a/Lib/test/test_applesingle.py
+++ b/Lib/test/test_applesingle.py
@@ -15,8 +15,8 @@ AS_VERSION=0x00020000
 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
diff --git a/Mac/Modules/gestaltmodule.c b/Mac/Modules/gestaltmodule.c
index f82687e..6d8673f 100644
--- a/Mac/Modules/gestaltmodule.c
+++ b/Mac/Modules/gestaltmodule.c
@@ -33,17 +33,10 @@ static PyObject *
 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);
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 */
-- 
cgit v0.12

