Tcl Source Code

Artifact [9b743262c1]
Login

Artifact 9b743262c18008b6ef1bd771414b591f37e7ddcd:

Attachment "tclWinFile.c.patch" to ticket [855923ffff] added by cc_benny 2003-12-08 04:58:13.
Index: tclWinFile.c
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinFile.c,v
retrieving revision 1.55
diff -u -w -u -w -p -r1.55 tclWinFile.c
--- tclWinFile.c	13 Oct 2003 16:48:07 -0000	1.55
+++ tclWinFile.c	7 Dec 2003 21:38:12 -0000
@@ -1413,22 +1413,23 @@ NativeAccess(nativePath, mode)
 	    goto accessError;
 	}
 	(*tclWinProcs->revertToSelfProc)();
+
 	memset (&genMap, 0x00, sizeof (GENERIC_MAPPING));
+
 	/* 
-	 * Fill GenericMask type according to access priveleges
-	 * we are checking.
+	 * Setup desiredAccess according to the access priveleges we
+	 * are checking.
 	 */
-	genMap.GenericAll = 0;
 	if (mode & R_OK) {
-	    genMap.GenericRead = FILE_GENERIC_READ;
+	    desiredAccess |= FILE_GENERIC_READ;
 	}
 	if (mode & W_OK) {
-	    genMap.GenericWrite = FILE_GENERIC_WRITE;
+	    desiredAccess |= FILE_GENERIC_WRITE;
 	}
 	if (mode & X_OK) {
-	    genMap.GenericExecute = FILE_GENERIC_EXECUTE;
+	    desiredAccess |= FILE_GENERIC_EXECUTE;
 	}
-	(*tclWinProcs->mapGenericMaskProc)(&desiredAccess, &genMap);
+
 	/* 
 	 * Perform access check using the token. 
 	 */