* generic/tclInt.decls: made TclSetPreInitScript() declaration

	generic as it is used on mac & aqua as well.
	* generic/tclIntDecls.h:
	* generic/tclStubInit.c: regen.
	* generic/tclCompile.h: added prototype for TclCompileVariableCmd.

	* mac/tclMacPort.h: removed incorrect <fcntl.h> definitions
	and obsolete <stat.h> definitions.
	* mac/tclMacChan.c: removed obsolete GetOpenMode() and replaced
	associated constants with the <fcntl.h> analogues (they existing
	defs were inconsistent with <fcntl.h> which was causing havoc when
	Tcl_GetOpenMode was used instead of private GetOpenMode).

	* mac/tclMacFCmd.c: removed GenerateUniqueName(), use equivalent
	(and identiaclly named) routine from MoreFiles instead.

	* mac/tclMacLoad.c: CONSTification, fixes to Vince's last changes.

	* mac/tclMacFile.c:
	* mac/tclMacTest.c:
	* mac/tclMacUnix.c: CONSTification.

	* mac/tclMacOSA.c: CONSTificcation, sprintf fixes, UH 3.4.x changes;
	fix for missing autoname token from TclOSACompileCmd. (bdesgraupes)
	* mac/AppleScript.html(AppleScript delete): doc fix. (bdesgraupes)

	* mac/tcltkMacBuildSupport.sea.hqx: updated MoreFiles to 1.5.3,
	updated build instructions for 8.4.
	* mac/tclMacProjects.sea.hqx: rebuilt archive.

1 files changed, 10 insertions, 172 deletions

diff --git a/mac/tclMacChan.c b/mac/tclMacChan.c
index 6c34e96..b31d30a 100644
--- a/mac/tclMacChan.c
+++ b/mac/tclMacChan.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclMacChan.c,v 1.17 2002/07/08 10:08:58 vincentdarley Exp $
+ * RCS: @(#) $Id: tclMacChan.c,v 1.18 2002/10/09 11:54:16 das Exp $
  */
 
 #include "tclInt.h"
@@ -33,24 +33,6 @@
 #endif
 
 /*
- * The following are flags returned by GetOpenMode.  They
- * are or'd together to determine how opening and handling
- * a file should occur.
- */
-
-#define TCL_RDONLY		(1<<0)
-#define TCL_WRONLY		(1<<1)
-#define TCL_RDWR		(1<<2)
-#define TCL_CREAT		(1<<3)
-#define TCL_TRUNC		(1<<4)
-#define TCL_APPEND		(1<<5)
-#define TCL_ALWAYS_APPEND	(1<<6)
-#define TCL_EXCL		(1<<7)
-#define TCL_NOCTTY		(1<<8)
-#define TCL_NONBLOCK		(1<<9)
-#define TCL_RW_MODES 		(TCL_RDONLY|TCL_WRONLY|TCL_RDWR)
-
-/*
  * This structure describes per-instance state of a 
  * macintosh file based channel.
  */
@@ -119,8 +101,6 @@ static int		FileSeek _ANSI_ARGS_((ClientData instanceData,
 			    long offset, int mode, int *errorCode));
 static void		FileSetupProc _ANSI_ARGS_((ClientData clientData,
 			    int flags));
-static int		GetOpenMode _ANSI_ARGS_((Tcl_Interp *interp,
-        		    CONST char *string));
 static Tcl_Channel	OpenFileChannel _ANSI_ARGS_((CONST char *fileName, 
 			    int mode, int permissions, int *errorCodePtr));
 static int		StdIOBlockMode _ANSI_ARGS_((ClientData instanceData,
@@ -827,12 +807,12 @@ OpenFileChannel(
      * Windows and UNIX and the feature is used by Tcl.
      */
 
-    switch (mode & (TCL_RDONLY | TCL_WRONLY | TCL_RDWR)) {
-	case TCL_RDWR:
+    switch (mode & (O_RDONLY | O_WRONLY | O_RDWR)) {
+	case O_RDWR:
 	    channelPermissions = (TCL_READABLE | TCL_WRITABLE);
 	    macPermision = fsRdWrShPerm;
 	    break;
-	case TCL_WRONLY:
+	case O_WRONLY:
 	    /*
 	     * Mac's fsRdPerm permission actually defaults to fsRdWrPerm because
 	     * the Mac OS doesn't realy support write only access.  We explicitly
@@ -842,7 +822,7 @@ OpenFileChannel(
 	    channelPermissions = TCL_WRITABLE;
 	    macPermision = fsRdWrShPerm;
 	    break;
-	case TCL_RDONLY:
+	case O_RDONLY:
 	default:
 	    channelPermissions = TCL_READABLE;
 	    macPermision = fsRdPerm;
@@ -856,14 +836,14 @@ OpenFileChannel(
 	return NULL;
     }
 
-    if ((err == fnfErr) && (mode & TCL_CREAT)) {
+    if ((err == fnfErr) && (mode & O_CREAT)) {
 	err = HCreate(fileSpec.vRefNum, fileSpec.parID, fileSpec.name, TCL_FILE_CREATOR, 'TEXT');
 	if (err != noErr) {
 	    *errorCodePtr = errno = TclMacOSErrorToPosixError(err);
 	    Tcl_SetErrno(errno);
 	    return NULL;
 	}
-    } else if ((mode & TCL_CREAT) && (mode & TCL_EXCL)) {
+    } else if ((mode & O_CREAT) && (mode & O_EXCL)) {
         *errorCodePtr = errno = EEXIST;
 	Tcl_SetErrno(errno);
         return NULL;
@@ -876,7 +856,7 @@ OpenFileChannel(
 	return NULL;
     }
 
-    if (mode & TCL_TRUNC) {
+    if (mode & O_TRUNC) {
 	SetEOF(fileRef, 0);
     }
     
@@ -897,13 +877,13 @@ OpenFileChannel(
     fileState->fileRef = fileRef;
     fileState->pending = 0;
     fileState->watchMask = 0;
-    if (mode & TCL_ALWAYS_APPEND) {
+    if (mode & O_APPEND) {
 	fileState->appendMode = true;
     } else {
 	fileState->appendMode = false;
     }
         
-    if ((mode & TCL_ALWAYS_APPEND) || (mode & TCL_APPEND)) {
+    if ((mode & O_APPEND) || (mode & O_APPEND)) {
         if (Tcl_Seek(chan, 0, SEEK_END) < 0) {
 	    *errorCodePtr = errno = EFAULT;
 	    Tcl_SetErrno(errno);
@@ -1244,145 +1224,3 @@ CommonWatch(
 	}
     }
 }
-
-/*
- *----------------------------------------------------------------------
- *
- * GetOpenMode --
- *
- * Description:
- *	Computes a POSIX mode mask from a given string and also sets
- *	a flag to indicate whether the caller should seek to EOF during
- *	opening of the file.
- *
- * Results:
- *	On success, returns mode to pass to "open". If an error occurs, the
- *	returns -1 and if interp is not NULL, sets the interp's result to an
- *	error message.
- *
- * Side effects:
- *	Sets the integer referenced by seekFlagPtr to 1 if the caller
- *	should seek to EOF during opening the file.
- *
- * Special note:
- *	This code is based on a prototype implementation contributed
- *	by Mark Diekhans.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-GetOpenMode(
-    Tcl_Interp *interp,			/* Interpreter to use for error
-					 * reporting - may be NULL. */
-    CONST char *string)			/* Mode string, e.g. "r+" or
-					 * "RDONLY CREAT". */
-{
-    int mode, modeArgc, c, i, gotRW;
-    CONST char **modeArgv, *flag;
-
-    /*
-     * Check for the simpler fopen-like access modes (e.g. "r").  They
-     * are distinguished from the POSIX access modes by the presence
-     * of a lower-case first letter.
-     */
-
-    mode = 0;
-    /*
-     * Guard against international characters before using byte oriented
-     * routines.
-     */
-
-    if (!(string[0] & 0x80)
-	    && islower(UCHAR(string[0]))) { /* INTL: ISO only. */
-	switch (string[0]) {
-	    case 'r':
-		mode = TCL_RDONLY;
-		break;
-	    case 'w':
-		mode = TCL_WRONLY|TCL_CREAT|TCL_TRUNC;
-		break;
-	    case 'a':
-		mode = TCL_WRONLY|TCL_CREAT|TCL_APPEND;
-		break;
-	    default:
-		error:
-                if (interp != (Tcl_Interp *) NULL) {
-                    Tcl_AppendResult(interp,
-                            "illegal access mode \"", string, "\"",
-                            (char *) NULL);
-                }
-		return -1;
-	}
-	if (string[1] == '+') {
-	    mode &= ~(TCL_RDONLY|TCL_WRONLY);
-	    mode |= TCL_RDWR;
-	    if (string[2] != 0) {
-		goto error;
-	    }
-	} else if (string[1] != 0) {
-	    goto error;
-	}
-        return mode;
-    }
-
-    /*
-     * The access modes are specified using a list of POSIX modes
-     * such as TCL_CREAT.
-     */
-
-    if (Tcl_SplitList(interp, string, &modeArgc, &modeArgv) != TCL_OK) {
-        if (interp != (Tcl_Interp *) NULL) {
-            Tcl_AddErrorInfo(interp,
-                    "\n    while processing open access modes \"");
-            Tcl_AddErrorInfo(interp, string);
-            Tcl_AddErrorInfo(interp, "\"");
-        }
-        return -1;
-    }
-    
-    gotRW = 0;
-    for (i = 0; i < modeArgc; i++) {
-	flag = modeArgv[i];
-	c = flag[0];
-	if ((c == 'R') && (strcmp(flag, "RDONLY") == 0)) {
-	    mode = (mode & ~TCL_RW_MODES) | TCL_RDONLY;
-	    gotRW = 1;
-	} else if ((c == 'W') && (strcmp(flag, "WRONLY") == 0)) {
-	    mode = (mode & ~TCL_RW_MODES) | TCL_WRONLY;
-	    gotRW = 1;
-	} else if ((c == 'R') && (strcmp(flag, "RDWR") == 0)) {
-	    mode = (mode & ~TCL_RW_MODES) | TCL_RDWR;
-	    gotRW = 1;
-	} else if ((c == 'A') && (strcmp(flag, "APPEND") == 0)) {
-	    mode |= TCL_ALWAYS_APPEND;
-	} else if ((c == 'C') && (strcmp(flag, "CREAT") == 0)) {
-	    mode |= TCL_CREAT;
-	} else if ((c == 'E') && (strcmp(flag, "EXCL") == 0)) {
-	    mode |= TCL_EXCL;
-	} else if ((c == 'N') && (strcmp(flag, "NOCTTY") == 0)) {
-	    mode |= TCL_NOCTTY;
-	} else if ((c == 'N') && (strcmp(flag, "NONBLOCK") == 0)) {
-	    mode |= TCL_NONBLOCK;
-	} else if ((c == 'T') && (strcmp(flag, "TRUNC") == 0)) {
-	    mode |= TCL_TRUNC;
-	} else {
-            if (interp != (Tcl_Interp *) NULL) {
-                Tcl_AppendResult(interp, "invalid access mode \"", flag,
-                        "\": must be RDONLY, WRONLY, RDWR, APPEND, CREAT",
-                        " EXCL, NOCTTY, NONBLOCK, or TRUNC", (char *) NULL);
-            }
-	    ckfree((char *) modeArgv);
-	    return -1;
-	}
-    }
-    ckfree((char *) modeArgv);
-    if (!gotRW) {
-        if (interp != (Tcl_Interp *) NULL) {
-            Tcl_AppendResult(interp, "access mode must include either",
-                    " RDONLY, WRONLY, or RDWR", (char *) NULL);
-        }
-	return -1;
-    }
-    return mode;
-}