From: Tor Lillqvist <tml@novell.com>
Date: Thu, 29 May 2008 23:05:35 +0000 (+0000)
Subject: Mask out X_OK to avoid problem on Vista. X_OK was just ignored by access()
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=87bc41714fe3fcb66083fe0fe40602f2bf77cb0b;p=dana%2Fcg-glib.git

Mask out X_OK to avoid problem on Vista. X_OK was just ignored by access()

2008-05-30  Tor Lillqvist  <tml@novell.com>

	* glib/gstdio.c (g_access) [Win32]: Mask out X_OK to avoid problem
	on Vista. X_OK was just ignored by access() in earlier Microsoft C
	libraries. (Which is fine as executability has little meaning on
	Windows.) The one on Vista returns an error if X_OK is passed.


svn path=/trunk/; revision=6961
---

diff --git a/ChangeLog b/ChangeLog
index f6c9cee6..f99fdbca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-30  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gstdio.c (g_access) [Win32]: Mask out X_OK to avoid problem
+	on Vista. X_OK was just ignored by access() in earlier Microsoft C
+	libraries. (Which is fine as executability has little meaning on
+	Windows.) The one on Vista returns an error if X_OK is passed.
+
 2008-05-29  Tor Lillqvist  <tml@novell.com>
 
 	* glib/gstdio.h
diff --git a/glib/gstdio.c b/glib/gstdio.c
index 09167a7e..285bfe91 100644
--- a/glib/gstdio.c
+++ b/glib/gstdio.c
@@ -85,7 +85,7 @@ g_access (const gchar *filename,
       return -1;
     }
 
-  retval = _waccess (wfilename, mode);
+  retval = _waccess (wfilename, mode & ~X_OK);
   save_errno = errno;
 
   g_free (wfilename);