Use c2pstr() in stead of Pstring() to convert C-strings to

Pascal-strings. Safer, because Pstring converts in-place and the
pathname may be reused later for error messages.

diff --git a/Python/dynload_mac.c b/Python/dynload_mac.c
index 8f057e747489cfed6509b7251e2cdf61afd3270a..645df906c58daa663aa9623dc0bf98e7cfe523b2 100644 (file)
--- a/Python/dynload_mac.c
+++ b/Python/dynload_mac.c
@@ -10,6 +10,7 @@
 #include "TFileSpec.h"         /* for Path2FSSpec() */
 #endif
 #include <Files.h>
+#include <TextUtils.h>
 #include "macdefs.h"
 #include "macglue.h"
 
@@ -56,12 +57,12 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
 #ifdef USE_GUSI1
        err = Path2FSSpec(pathname, &libspec);
 #else
-       (void)FSMakeFSSpec(0, 0, Pstring(pathname), &libspec);
+       c2pstrcpy((unsigned char *)buf, pathname);
+       (void)FSMakeFSSpec(0, 0, (unsigned char *)buf, &libspec);
        err = ResolveAliasFile(&libspec, 1, &isfolder, &didsomething);
 #endif
        if ( err ) {
-               sprintf(buf, "%.255s: %.200s",
-                       pathname, PyMac_StrError(err));
+               sprintf(buf, "%.200s: %.200s", pathname, PyMac_StrError(err));
                PyErr_SetString(PyExc_ImportError, buf);
                return NULL;
        }