fs update

2 files changed, 65 insertions, 49 deletions

diff --git a/mac/tclMacFCmd.c b/mac/tclMacFCmd.c
index 462d48e..e3c2366 100644
--- a/mac/tclMacFCmd.c
+++ b/mac/tclMacFCmd.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: tclMacFCmd.c,v 1.8 2001/07/31 19:12:07 vincentdarley Exp $
+ * RCS: @(#) $Id: tclMacFCmd.c,v 1.9 2001/08/23 17:37:08 vincentdarley Exp $
  */
 
 #include "tclInt.h"
@@ -102,14 +102,14 @@ int
 TclpObjCreateDirectory(pathPtr)
     Tcl_Obj *pathPtr;
 {
-    return TclpCreateDirectory(Tcl_FSGetTranslatedPath(NULL, pathPtr));
+    return DoCreateDirectory(Tcl_FSGetNativePath(pathPtr));
 }
 
 int 
 TclpObjDeleteFile(pathPtr)
     Tcl_Obj *pathPtr;
 {
-    return TclpDeleteFile(Tcl_FSGetTranslatedPath(NULL, pathPtr));
+    return DoDeleteFile(Tcl_FSGetNativePath(pathPtr));
 }
 
 int 
@@ -120,8 +120,8 @@ TclpObjCopyDirectory(srcPathPtr, destPathPtr, errorPtr)
 {
     Tcl_DString ds;
     int ret;
-    ret = TclpCopyDirectory(Tcl_FSGetTranslatedPath(NULL,srcPathPtr),
-			    Tcl_FSGetTranslatedPath(NULL,destPathPtr), &ds);
+    ret = DoCopyDirectory(Tcl_FSGetNativePath(srcPathPtr),
+			  Tcl_FSGetNativePath(destPathPtr), &ds);
     if (ret != TCL_OK) {
 	*errorPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), -1);
 	Tcl_DStringFree(&ds);
@@ -135,8 +135,8 @@ TclpObjCopyFile(srcPathPtr, destPathPtr)
     Tcl_Obj *srcPathPtr;
     Tcl_Obj *destPathPtr;
 {
-    return TclpCopyFile(Tcl_FSGetTranslatedPath(NULL,srcPathPtr),
-			Tcl_FSGetTranslatedPath(NULL,destPathPtr));
+    return DoCopyFile(Tcl_FSGetNativePath(srcPathPtr),
+		      Tcl_FSGetNativePath(destPathPtr));
 }
 
 int 
@@ -147,7 +147,7 @@ TclpObjRemoveDirectory(pathPtr, recursive, errorPtr)
 {
     Tcl_DString ds;
     int ret;
-    ret = TclpRemoveDirectory(Tcl_FSGetTranslatedPath(NULL, pathPtr),recursive, &ds);
+    ret = DoRemoveDirectory(Tcl_FSGetNativePath(pathPtr),recursive, &ds);
     if (ret != TCL_OK) {
 	*errorPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), -1);
 	Tcl_DStringFree(&ds);
@@ -161,8 +161,8 @@ TclpObjRenameFile(srcPathPtr, destPathPtr)
     Tcl_Obj *srcPathPtr;
     Tcl_Obj *destPathPtr;
 {
-    return TclpRenameFile(Tcl_FSGetTranslatedPath(NULL,srcPathPtr),
-			  Tcl_FSGetTranslatedPath(NULL,destPathPtr));
+    return DoRenameFile(Tcl_FSGetNativePath(srcPathPtr),
+			Tcl_FSGetNativePath(destPathPtr));
 }
 
 /*
@@ -744,8 +744,8 @@ TclpCopyDirectory(
 static int
 DoCopyDirectory(
     CONST char *src,		/* Pathname of directory to be copied
-				 * (UTF-8). */
-    CONST char *dst,		/* Pathname of target directory (UTF-8). */
+				 * (Native). */
+    CONST char *dst,		/* Pathname of target directory (Native). */
     Tcl_DString *errorPtr)	/* If non-NULL, uninitialized or free
 				 * DString filled with UTF-8 name of file
 				 * causing error. */
@@ -1555,23 +1555,20 @@ SetFileReadOnly(
 /*
  *---------------------------------------------------------------------------
  *
- * TclpListVolumes --
+ * TclpObjListVolumes --
  *
  *	Lists the currently mounted volumes
  *
  * Results:
- *	A standard Tcl result.  Will always be TCL_OK, since there is no way
- *	that this command can fail.  Also, the interpreter's result is set to 
- *	the list of volumes.
+ *	The list of volumes.
  *
  * Side effects:
  *	None
  *
  *---------------------------------------------------------------------------
  */
-int
-TclpListVolumes( 
-		Tcl_Interp *interp)    /* Interpreter to which to pass the volume list */
+Tcl_Obj*
+TclpObjListVolumes(void)
 {
     HParamBlockRec pb;
     Str255 name;
@@ -1606,15 +1603,15 @@ TclpListVolumes(
         elemPtr = Tcl_NewStringObj(Tcl_DStringValue(&dstr),
 		Tcl_DStringLength(&dstr));
         Tcl_AppendToObj(elemPtr, ":", 1);
-        Tcl_ListObjAppendElement(interp, resultPtr, elemPtr);
+        Tcl_ListObjAppendElement(NULL, resultPtr, elemPtr);
         
         Tcl_DStringFree(&dstr);
                 
         volIndex++;             
     }
-        
-    Tcl_SetObjResult(interp, resultPtr);
-    return TCL_OK;      
+
+    Tcl_IncrRefCount(resultPtr);
+    return resultPtr;
 }
 
 /*
diff --git a/mac/tclMacFile.c b/mac/tclMacFile.c
index fd186b7..c8aaf85 100644
--- a/mac/tclMacFile.c
+++ b/mac/tclMacFile.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclMacFile.c,v 1.10 2001/07/31 19:12:07 vincentdarley Exp $
+ * RCS: @(#) $Id: tclMacFile.c,v 1.11 2001/08/23 17:37:08 vincentdarley Exp $
  */
 
 /*
@@ -146,14 +146,14 @@ TclpMatchInDirectory(interp, resultPtr, pathPtr, pattern, types)
     OSType okType = 0;
     OSType okCreator = 0;
     Tcl_DString dsOrig;
-    char *fileName2;
+    Tcl_Obj *fileNamePtr;
 
-    fileName2 = Tcl_FSGetTranslatedPath(interp, pathPtr);
-    if (fileName2 == NULL) {
+    fileNamePtr = Tcl_FSGetTranslatedPath(interp, pathPtr);
+    if (fileNamePtr == NULL) {
 	return TCL_ERROR;
     }
     Tcl_DStringInit(&dsOrig);
-    Tcl_DStringAppend(&dsOrig, fileName2, -1);
+    Tcl_DStringAppend(&dsOrig, Tcl_GetString(fileNamePtr), -1);
     baseLength = Tcl_DStringLength(&dsOrig);
 
     /*
@@ -241,6 +241,8 @@ TclpMatchInDirectory(interp, resultPtr, pathPtr, pattern, types)
 		    typeOk = 0;
 		}
 	    } else {
+		struct stat buf;
+
 		if (pb.hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible) {
 		    /* If invisible */
 		    if ((types->perm == 0) || 
@@ -268,12 +270,14 @@ TclpMatchInDirectory(interp, resultPtr, pathPtr, pattern, types)
 		    }
 		}
 		if (typeOk == 1 && types->type != 0) {
-		    struct stat buf;
-		    /*
-		     * We must match at least one flag to be listed
-		     */
-		    typeOk = 0;
-		    if (TclpLstat(fname, &buf) >= 0) {
+		    if (types->perm == 0) {
+			/* We haven't yet done a stat on the file */
+			if (TclpStat(fname, &buf) != 0) {
+			    /* Posix error occurred */
+			    typeOk = 0;
+			}
+		    }
+		    if (typeOk) {
 			/*
 			 * In order bcdpfls as in 'find -t'
 			 */
@@ -288,19 +292,24 @@ TclpMatchInDirectory(interp, resultPtr, pathPtr, pattern, types)
 				    S_ISFIFO(buf.st_mode)) ||
 			    ((types->type & TCL_GLOB_TYPE_FILE) &&
 				    S_ISREG(buf.st_mode))
-#ifdef S_ISLNK
-			    || ((types->type & TCL_GLOB_TYPE_LINK) &&
-				    S_ISLNK(buf.st_mode))
-#endif
-#ifdef S_ISSOCK
+    #ifdef S_ISSOCK
 			    || ((types->type & TCL_GLOB_TYPE_SOCK) &&
 				    S_ISSOCK(buf.st_mode))
-#endif
+    #endif
 			    ) {
-			    typeOk = 1;
+			    /* Do nothing -- this file is ok */
+			} else {
+			    typeOk = 0;
+    #ifdef S_ISLNK
+			    if (types->type & TCL_GLOB_TYPE_LINK) {
+				if (TclpLstat(fname, &buf) == 0) {
+				    if (S_ISLNK(buf.st_mode)) {
+					typeOk = 1;
+				    }
+				}
+			    }
+    #endif
 			}
-		    } else {
-			/* Posix error occurred */
 		    }
 		}
 		if (typeOk && (
@@ -1090,15 +1099,25 @@ TclpTempFileName()
 #ifdef S_IFLNK
 
 Tcl_Obj* 
-TclpObjReadlink(pathPtr)
+TclpObjLink(pathPtr, toPtr)
     Tcl_Obj *pathPtr;
+    Tcl_Obj *toPtr;
 {
-    Tcl_DString ds;
     Tcl_Obj* link = NULL;
-    if (TclpReadlink(Tcl_FSGetTranslatedPath(NULL, pathPtr), &ds) != NULL) {
-	link = Tcl_NewStringObj(Tcl_DStringValue(&ds), -1);
-	Tcl_IncrRefCount(link);
-	Tcl_DStringFree(&ds);
+
+    if (toPtr != NULL) {
+	return NULL;
+    } else {
+	Tcl_DString ds;
+	Tcl_Obj *transPtr = Tcl_FSGetTranslatedPath(NULL, pathPtr);
+	if (transPtr == NULL) {
+	    return NULL;
+	}
+	if (TclpReadlink(Tcl_GetString(transPtr), &ds) != NULL) {
+	    link = Tcl_NewStringObj(Tcl_DStringValue(&ds), -1);
+	    Tcl_IncrRefCount(link);
+	    Tcl_DStringFree(&ds);
+	}
     }
     return link;
 }