mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

renamed Get routines to PyMac_Get; added macfs to config.c

Browse source
This commit is contained in:
Guido van Rossum 1995-01-21 13:46:04 +00:00
parent 796b259a1c
commit 9aa3d1370e
5 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mac/Include/macglue.h
View file

@ -10,7 +10,3 @@ int PyMac_GetStr255 Py_PROTO((PyObject *, Str255)); /* argument parser for Str25
int PyMac_GetFSSpec Py_PROTO((PyObject *, FSSpec *)); /* argument parser for FSSpec */ int PyMac_GetFSSpec Py_PROTO((PyObject *, FSSpec *)); /* argument parser for FSSpec */
PyObject *PyMac_BuildFSSpec Py_PROTO((FSSpec *)); /* Convert FSSpec to PyObject */ PyObject *PyMac_BuildFSSpec Py_PROTO((FSSpec *)); /* Convert FSSpec to PyObject */
PyObject *PyMac_BuildOSType Py_PROTO((OSType)); /* Convert OSType to PyObject */ PyObject *PyMac_BuildOSType Py_PROTO((OSType)); /* Convert OSType to PyObject */
#define GetOSType PyMac_GetOSType
#define GetStr255 PyMac_GetStr255
#define GetFSSpec PyMac_GetFSSpec

4
Mac/Modules/config.c
View file

@ -261,10 +261,9 @@ extern void initnew();
extern void initdl(); extern void initdl();
extern void initsyslog(); extern void initsyslog();
extern void initgestalt(); extern void initgestalt();
#ifdef THINK_C
extern void initmacconsole(); extern void initmacconsole();
#endif
extern void initctb(); extern void initctb();
extern void initmacfs();
extern void initmacspeech(); extern void initmacspeech();
extern void initmacdnr(); extern void initmacdnr();
extern void initmactcp(); extern void initmactcp();
@ -302,6 +301,7 @@ struct {
{"macconsole", initmacconsole}, {"macconsole", initmacconsole},
#endif #endif
{"ctb", initctb}, {"ctb", initctb},
{"macfs", initmacfs},
#ifdef __MWERKS__ #ifdef __MWERKS__
/* This is really "Jack Jansen" specific for now :-) */ /* This is really "Jack Jansen" specific for now :-) */
{"macspeech", initmacspeech}, {"macspeech", initmacspeech},

8
Mac/Modules/macfsmodule.c
View file

@ -48,7 +48,7 @@ mfs_NewAlias(self, args)
FSSpec src, dst, *dstptr; FSSpec src, dst, *dstptr;
src.name[0] = 0; src.name[0] = 0;
if (!newgetargs(args, "O&|O&", GetFSSpec, &dst, GetFSSpec, &src)) if (!newgetargs(args, "O&|O&", PyMac_GetFSSpec, &dst, PyMac_GetFSSpec, &src))
return NULL; return NULL;
/* XXXX */ /* XXXX */
@ -90,7 +90,7 @@ mfs_StandardPutFile(self, args)
StandardFileReply reply; StandardFileReply reply;
dft[0] = 0; dft[0] = 0;
if (!newgetargs(args, "O&|O&", GetStr255, &prompt, GetStr255, &dft) ) if (!newgetargs(args, "O&|O&", PyMac_GetStr255, &prompt, PyMac_GetStr255, &dft) )
return NULL; return NULL;
StandardPutFile(prompt, dft, &reply); StandardPutFile(prompt, dft, &reply);
return mkvalue("(iO)", reply.sfGood, PyMac_BuildFSSpec(&reply.sfFile)); return mkvalue("(iO)", reply.sfGood, PyMac_BuildFSSpec(&reply.sfFile));
@ -126,7 +126,7 @@ mfs_FSSpecNormalize(self, args)
{ {
FSSpec fss; FSSpec fss;
if (!newgetargs(args, "O&", GetFSSpec, &fss)) if (!newgetargs(args, "O&", PyMac_GetFSSpec, &fss))
return NULL; return NULL;
return PyMac_BuildFSSpec(&fss); return PyMac_BuildFSSpec(&fss);
} }
@ -140,7 +140,7 @@ mfs_FSSpecPath(self, args)
char strbuf[257]; char strbuf[257];
OSErr err; OSErr err;
if (!newgetargs(args, "O&", GetFSSpec, &fss)) if (!newgetargs(args, "O&", PyMac_GetFSSpec, &fss))
return NULL; return NULL;
err = nfullpath(&fss, strbuf); err = nfullpath(&fss, strbuf);
if ( err ) { if ( err ) {

8
Mac/Modules/macosmodule.c
View file

@ -157,7 +157,7 @@ MacOS_GetResource(PyObject *self, PyObject *args)
ResType rt; ResType rt;
int id; int id;
Handle h; Handle h;
if (!PyArg_ParseTuple(args, "O&i", GetOSType, &rt, &id)) if (!PyArg_ParseTuple(args, "O&i", PyMac_GetOSType, &rt, &id))
return NULL; return NULL;
h = GetResource(rt, id); h = GetResource(rt, id);
return (PyObject *)Rsrc_FromHandle(h); return (PyObject *)Rsrc_FromHandle(h);
@ -169,7 +169,7 @@ MacOS_GetNamedResource(PyObject *self, PyObject *args)
ResType rt; ResType rt;
Str255 name; Str255 name;
Handle h; Handle h;
if (!PyArg_ParseTuple(args, "O&O&", GetOSType, &rt, GetStr255, &name)) if (!PyArg_ParseTuple(args, "O&O&", PyMac_GetOSType, &rt, PyMac_GetStr255, &name))
return NULL; return NULL;
h = GetNamedResource(rt, name); h = GetNamedResource(rt, name);
return (PyObject *)Rsrc_FromHandle(h); return (PyObject *)Rsrc_FromHandle(h);
@ -186,7 +186,7 @@ MacOS_GetFileType(PyObject *self, PyObject *args)
PyObject *type, *creator, *res; PyObject *type, *creator, *res;
OSErr err; OSErr err;
if (!PyArg_ParseTuple(args, "O&", GetStr255, &name)) if (!PyArg_ParseTuple(args, "O&", PyMac_GetStr255, &name))
return NULL; return NULL;
if ((err = GetFInfo(name, 0, &info)) != noErr) { if ((err = GetFInfo(name, 0, &info)) != noErr) {
errno = err; errno = err;
@ -210,7 +210,7 @@ MacOS_SetFileType(PyObject *self, PyObject *args)
OSErr err; OSErr err;
if (!PyArg_ParseTuple(args, "O&O&O&", if (!PyArg_ParseTuple(args, "O&O&O&",
GetStr255, &name, GetOSType, &type, GetOSType, &creator)) PyMac_GetStr255, &name, PyMac_GetOSType, &type, PyMac_GetOSType, &creator))
return NULL; return NULL;
if ((err = GetFInfo(name, 0, &info)) != noErr) { if ((err = GetFInfo(name, 0, &info)) != noErr) {
errno = err; errno = err;

13
Mac/Python/macglue.c
View file

@ -31,6 +31,8 @@ Pstring(char *str)
int len; int len;
len = strlen(str); len = strlen(str);
if (len > 255)
len = 255;
buf[0] = (unsigned char)len; buf[0] = (unsigned char)len;
strncpy((char *)buf+1, str, len); strncpy((char *)buf+1, str, len);
return buf; return buf;
@ -147,20 +149,19 @@ PyMac_GetFSSpec(PyObject *v, FSSpec *fs)
if ( PyString_Check(v) ) { if ( PyString_Check(v) ) {
/* It's a pathname */ /* It's a pathname */
if( !PyArg_Parse(v, "O&", GetStr255, &path) ) if( !PyArg_Parse(v, "O&", PyMac_GetStr255, &path) )
return 0; return 0;
refnum = 0; /* XXXX Should get CurWD here... */ refnum = 0; /* XXXX Should get CurWD here... */
parid = 0; parid = 0;
} else { } else {
PyErr_Clear(); if( !PyArg_Parse(v, "(hlO&); FSSpec should be fullpath or (vrefnum,dirid,path)",
if( !PyArg_Parse(v, "(hlO&); FSSpec should be fullpath or (int,int,string)", &refnum, &parid, PyMac_GetStr255, &path)) {
&refnum, &parid, GetStr255, &path))
return 0; return 0;
}
} }
err = FSMakeFSSpec(refnum, parid, path, fs); err = FSMakeFSSpec(refnum, parid, path, fs);
if ( err && err != fnfErr ) { if ( err && err != fnfErr ) {
PyErr_SetString(PyExc_TypeError, PyErr_Mac(PyExc_ValueError, err);
"FSMakeFSSpec error");
return 0; return 0;
} }
return 1; return 1;