Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Completed (hopefully) the unification of THINK 6.0 and MPW 3.2 

versions -- they now share config.c and config.h, and statting is
always done through macstat.[ch] (THINK's <stat.h> defines funny
constants).  Also the configuration of stdwin is done differently: you
have to define USE_STDWIN to the compiler prefix.
This commit is contained in:
Guido van Rossum 1994-08-29 08:42:37 +00:00
parent e783444440
commit 739267b7c3
8 changed files with 71 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mac/Compat/getwd.c
View File

@ -27,10 +27,10 @@
Public domain by Guido van Rossum, CWI, Amsterdam (July 1987). Public domain by Guido van Rossum, CWI, Amsterdam (July 1987).
*/ */
#include "macdefs.h"
#ifdef MPW #ifdef MPW
#include <Strings.h> #include <Strings.h>
#endif #endif
#include "macdefs.h"
#define ROOTID 2 /* Root directory ID */ #define ROOTID 2 /* Root directory ID */

42
Mac/Compat/macstat.c
View File

@ -1,9 +1,10 @@
/* Minimal 'stat' emulation: tells directories from files and /* Minimal 'stat' emulation: tells directories from files and
gives length and mtime. gives length and mtime.
Public domain by Guido van Rossum, CWI, Amsterdam (July 1987). Public domain by Guido van Rossum, CWI, Amsterdam (July 1987).
Updated to give more info, August 1994.
*/ */
#include "stat.h" #include "macstat.h"
#include "macdefs.h" #include "macdefs.h"
/* Bits in ioFlAttrib: */ /* Bits in ioFlAttrib: */
@ -11,9 +12,9 @@
#define DIRBIT (1<<4) /* It's a directory */ #define DIRBIT (1<<4) /* It's a directory */
int int
stat(path, buf) macstat(path, buf)
char *path; char *path;
struct stat *buf; struct macstat *buf;
{ {
union { union {
DirInfo d; DirInfo d;
@ -23,35 +24,42 @@ stat(path, buf)
char name[256]; char name[256];
short err; short err;
pb.d.ioNamePtr= (unsigned char *)c2pstr(strcpy(name, path)); pb.d.ioNamePtr = (unsigned char *)c2pstr(strcpy(name, path));
pb.d.ioVRefNum= 0; pb.d.ioVRefNum = 0;
pb.d.ioFDirIndex= 0; pb.d.ioFDirIndex = 0;
pb.d.ioDrDirID= 0; pb.d.ioDrDirID = 0;
pb.f.ioFVersNum= 0; /* Fix found by Timo! See Tech Note 102 */ pb.f.ioFVersNum = 0; /* Fix found by Timo! See Tech Note 102 */
if (hfsrunning()) if (hfsrunning())
err= PBGetCatInfo((CInfoPBPtr)&pb, FALSE); err = PBGetCatInfo((CInfoPBPtr)&pb, FALSE);
else else
err= PBGetFInfo((ParmBlkPtr)&pb, FALSE); err = PBGetFInfo((ParmBlkPtr)&pb, FALSE);
if (err != noErr) { if (err != noErr) {
errno = ENOENT; errno = ENOENT;
return -1; return -1;
} }
if (pb.d.ioFlAttrib & LOCKBIT) if (pb.d.ioFlAttrib & LOCKBIT)
buf->st_mode= 0444; buf->st_mode = 0444;
else else
buf->st_mode= 0666; buf->st_mode = 0666;
if (pb.d.ioFlAttrib & DIRBIT) { if (pb.d.ioFlAttrib & DIRBIT) {
buf->st_mode |= 0111 | S_IFDIR; buf->st_mode |= 0111 | S_IFDIR;
buf->st_size= pb.d.ioDrNmFls; buf->st_size = pb.d.ioDrNmFls;
buf->st_rsize= 0; buf->st_rsize = 0;
} }
else { else {
buf->st_mode |= S_IFREG; buf->st_mode |= S_IFREG;
if (pb.f.ioFlFndrInfo.fdType == 'APPL') if (pb.f.ioFlFndrInfo.fdType == 'APPL')
buf->st_mode |= 0111; buf->st_mode |= 0111;
buf->st_size= pb.f.ioFlLgLen;
buf->st_rsize= pb.f.ioFlRLgLen;
} }
buf->st_mtime= pb.f.ioFlMdDat - TIMEDIFF; buf->st_ino = pb.hf.ioDirID;
buf->st_nlink = 1;
buf->st_uid = 1;
buf->st_gid = 1;
buf->st_size = pb.f.ioFlLgLen;
buf->st_mtime = buf->st_atime = pb.f.ioFlMdDat;
buf->st_ctime = pb.f.ioFlCrDat;
buf->st_rsize = pb.f.ioFlRLgLen;
*(unsigned long *)buf->st_type = pb.f.ioFlFndrInfo.fdType;
*(unsigned long *)buf->st_creator = pb.f.ioFlFndrInfo.fdCreator;
return 0; return 0;
} }

27
Mac/Compat/macstat.h
View File

@ -1,25 +1,28 @@
/* Include file belonging to stat emulator. /* Include file belonging to stat emulator.
Public domain by Guido van Rossum, CWI, Amsterdam (July 1987). */ Public domain by Guido van Rossum, CWI, Amsterdam (July 1987).
Updated August 1994. */
struct stat { struct macstat {
unsigned short st_dev;
unsigned long st_ino;
unsigned short st_mode; unsigned short st_mode;
unsigned short st_nlink;
unsigned short st_uid;
unsigned short st_gid;
unsigned short st_rdev;
unsigned long st_size; unsigned long st_size;
unsigned long st_rsize; /* Resource size -- nonstandard */ unsigned long st_atime;
unsigned long st_mtime; unsigned long st_mtime;
unsigned long st_ctime;
/* Non-standard additions */
unsigned long st_rsize; /* Resource size */
char st_type[4]; /* File type, e.g. 'APPL' or 'TEXT' */
char st_creator[4]; /* File creator, e.g. 'PYTH' */
}; };
#ifdef UNIX_COMPAT
#define S_IFMT 0170000L #define S_IFMT 0170000L
#define S_IFDIR 0040000L #define S_IFDIR 0040000L
#define S_IFREG 0100000L #define S_IFREG 0100000L
#define S_IREAD 0400 #define S_IREAD 0400
#define S_IWRITE 0200 #define S_IWRITE 0200
#define S_IEXEC 0100 #define S_IEXEC 0100
#else
#define S_IFMT 0xFFFF
#define S_IFDIR 0x0000
#define S_IFREG 0x0003
#define S_IREAD 0400
#define S_IWRITE 0200
#define S_IEXEC 0100
#endif

7
Mac/Include/config.h
View File

@ -1,4 +1,9 @@
/* config.h for Macintosh THINK C 6.0. */ /* config.h for Macintosh THINK C 6.0 and MPW 3.2. */
#ifdef MPW
/* This must be is MPW 3.x */
#define MPW_3 1
#endif
/* Define if on Macintosh (THINK_C or MPW should also be defined) */ /* Define if on Macintosh (THINK_C or MPW should also be defined) */
#define macintosh #define macintosh

11
Mac/Include/macdefs.h
View File

@ -7,17 +7,13 @@
#include <Files.h> #include <Files.h>
#include <OSUtils.h> #include <OSUtils.h>
#ifndef MPW #ifdef THINK_C
#include <pascal.h> #include <pascal.h>
#endif #endif
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
/* Difference in origin between Mac and Unix clocks: */
#define TIMEDIFF ((unsigned long) \
(((1970-1904)*365 + (1970-1904)/4) * 24 * 3600))
/* Macro to find out whether we can do HFS-only calls: */ /* Macro to find out whether we can do HFS-only calls: */
#define FSFCBLen (* (short *) 0x3f6) #define FSFCBLen (* (short *) 0x3f6)
#define hfsrunning() (FSFCBLen > 0) #define hfsrunning() (FSFCBLen > 0)
@ -31,8 +27,3 @@
#endif #endif
#define EOS '\0' #define EOS '\0'
#define SEP ':' #define SEP ':'
#if 0 // doesn't work
/* Call Macsbug: */
pascal void Debugger() extern 0xA9FF;
#endif

2
Mac/Modules/config.c
View File

@ -31,8 +31,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef macintosh #ifdef macintosh
/* The Macintosh main program is in macmain.c */ /* The Macintosh main program is in macmain.c */
#define NO_MAIN #define NO_MAIN
/* Comment this out if you're not interested in STDWIN */
#define USE_STDWIN
#endif #endif
#include <stdio.h> #include <stdio.h>

27
Mac/Modules/macmodule.c
View File

@ -23,8 +23,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
******************************************************************/ ******************************************************************/
/* Mac module implementation */ /* Mac module implementation */
/* Richard J. Walker April 7, 1994 Island Graphics Corp. */
/* Thanks to Guido's unix emulation routines */
#include "allobjects.h" #include "allobjects.h"
#include "modsupport.h" #include "modsupport.h"
@ -33,7 +31,19 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <stat.h>
#ifdef THINK_C
#include "unix.h"
#undef S_IFMT
#undef S_IFDIR
#undef S_IFCHR
#undef S_IFBLK
#undef S_IFREG
#undef S_ISDIR
#undef S_ISREG
#endif
#include "macstat.h"
#include <fcntl.h> #include <fcntl.h>
@ -54,9 +64,12 @@ DIR * opendir PROTO((char *));
void closedir PROTO((DIR *)); void closedir PROTO((DIR *));
struct dirent * readdir PROTO((DIR *)); struct dirent * readdir PROTO((DIR *));
int rmdir PROTO((const char *path)); int rmdir PROTO((const char *path));
int stat PROTO((const char *path, struct stat *buf));
int sync PROTO((void)); int sync PROTO((void));
#ifdef THINK_C
int unlink PROTO((char *));
#else
int unlink PROTO((const char *)); int unlink PROTO((const char *));
#endif
@ -357,13 +370,13 @@ mac_stat(self, args)
object *self; object *self;
object *args; object *args;
{ {
struct stat st; struct macstat st;
char *path; char *path;
int res; int res;
if (!getargs(args, "s", &path)) if (!getargs(args, "s", &path))
return NULL; return NULL;
BGN_SAVE BGN_SAVE
res = stat(path, &st); res = macstat(path, &st);
END_SAVE END_SAVE
if (res != 0) if (res != 0)
return mac_error(); return mac_error();
@ -402,7 +415,7 @@ mac_unlink(self, args)
object *self; object *self;
object *args; object *args;
{ {
return mac_1str(args, unlink); return mac_1str(args, (int (*)(const char *))unlink);
} }
static object * static object *

6
Mac/Python/macgetmtime.c
View File

@ -1,4 +1,4 @@
#include <stat.h> #include "macstat.h"
/* Interfaced used by import.c */ /* Interfaced used by import.c */
@ -6,8 +6,8 @@ long
getmtime(path) getmtime(path)
char *path; char *path;
{ {
struct stat st; struct macstat st;
if (stat(path, &st) != 0) if (macstat(path, &st) != 0)
return -1L; return -1L;
return st.st_mtime; return st.st_mtime;
} }