diff Mac/Python/macglue.c @ 2209:4053d4cb50e0 legacy-trunk

renamed Get routines to PyMac_Get; added macfs to config.c
author Guido van Rossum <guido@python.org>
date Sat, 21 Jan 1995 13:46:04 +0000
parents 62bdded5f00a
children 32435d33f34a
line wrap: on
line diff
--- a/Mac/Python/macglue.c	Fri Jan 20 23:05:52 1995 +0000
+++ b/Mac/Python/macglue.c	Sat Jan 21 13:46:04 1995 +0000
@@ -31,6 +31,8 @@
 	int len;
 
 	len = strlen(str);
+	if (len > 255)
+		len = 255;
 	buf[0] = (unsigned char)len;
 	strncpy((char *)buf+1, str, len);
 	return buf;
@@ -147,20 +149,19 @@
 
 	if ( PyString_Check(v) ) {
 		/* It's a pathname */
-		if( !PyArg_Parse(v, "O&", GetStr255, &path) )
+		if( !PyArg_Parse(v, "O&", PyMac_GetStr255, &path) )
 			return 0;
 		refnum = 0; /* XXXX Should get CurWD here... */
 		parid = 0;
 	} else {
-		PyErr_Clear();
-		if( !PyArg_Parse(v, "(hlO&); FSSpec should be fullpath or (int,int,string)",
-							&refnum, &parid, GetStr255, &path))
+		if( !PyArg_Parse(v, "(hlO&); FSSpec should be fullpath or (vrefnum,dirid,path)",
+							&refnum, &parid, PyMac_GetStr255, &path)) {
 			return 0;
+		}
 	}
 	err = FSMakeFSSpec(refnum, parid, path, fs);
 	if ( err && err != fnfErr ) {
-		PyErr_SetString(PyExc_TypeError,
-			"FSMakeFSSpec error");
+		PyErr_Mac(PyExc_ValueError, err);
 		return 0;
 	}
 	return 1;