[Tclresource-commits] Source tclResourceOSX.c,1.8,1.9

[Bernard D. <bde...@us...>]

Update of /cvsroot/tclresource/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6228/Source

Modified Files:
	tclResourceOSX.c 
Log Message:
bug 1020224 fixed. Minor quirks.

Index: tclResourceOSX.c
===================================================================
RCS file: /cvsroot/tclresource/Source/tclResourceOSX.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- tclResourceOSX.c	11 Dec 2003 09:43:11 -0000	1.8
+++ tclResourceOSX.c	3 Sep 2004 08:21:57 -0000	1.9
@@ -234,7 +234,7 @@
 	    RESOURCE_READ, RESOURCE_TYPES, RESOURCE_UPDATE, RESOURCE_WRITE
     };
               
-    resultPtr = Tcl_GetObjResult(interp);
+	resultPtr = Tcl_NewObj();
     
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
@@ -306,6 +306,8 @@
 	    panic("Tcl_GetIndexFromObj returned unrecognized option");
 	    return TCL_ERROR;	/* Should never be reached. */
     }
+	
+	Tcl_SetObjResult(interp, resultPtr);
     return result;
 }
 
@@ -1001,7 +1003,7 @@
 	    Tcl_ResetResult(interp);
 	    if (objc != 5) {
 		Tcl_WrongNumArgs(interp, 2, objv,
-			"resourceType resourceId resourceRef");
+			"resourceType resourceName resourceRef");
 		return TCL_ERROR;
 	    }
 
@@ -1154,7 +1156,7 @@
 		UseResFile(saveRef);
 	    }
 	
-	    return TCL_OK;
+	    return result;
 }
 
 
@@ -1267,7 +1269,7 @@
     int fromFork, foundFork = from_unspecified, filenameIdx = 2;
     long fileRef;
     char *stringPtr;
-    char macPermision;
+    SInt8 macPermision;
     CONST char *str;
 	char *native;
     FSSpec fileSpec;
@@ -1523,7 +1525,7 @@
 			Tcl_AppendStringsToObj(resultPtr,
 			"file does not exist", (char *) NULL);
 			return TCL_ERROR;
-		} else if (err == eofErr) {
+		} else if (err == eofErr || err == mapReadErr) {
 			switch (fromFork) {
 				case from_rezfork:
 				Tcl_AppendStringsToObj(resultPtr,