From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 5 Oct 2012 09:17:17 +0000 (+0200)
Subject: Support setting file times of directories on MS-Windows.
X-Git-Tag: emacs-24.2.90~241^2~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0d9f584b2c2a816670a22948615d7e0a5b93fc10;p=emacs.git

Support setting file times of directories on MS-Windows.

 src/w32.c (utime): Open the file with FILE_FLAG_BACKUP_SEMANTICS, so
 that time stamps of directories could also be changed.  Don't
 request the too broad GENERIC_WRITE, only the more restrictive
 FILE_WRITE_ATTRIBUTES access rights.
 src/fileio.c (Fset_file_times): Special-case ignoring errors for
 directories only on MSDOS, not on MS-Windows.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 396240bb7b8..b2502010619 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2012-10-05  Eli Zaretskii  <eliz@gnu.org>
+
+	* w32.c (utime): Open the file with FILE_FLAG_BACKUP_SEMANTICS, so
+	that time stamps of directories could also be changed.  Don't
+	request the too broad GENERIC_WRITE, only the more restrictive
+	FILE_WRITE_ATTRIBUTES access rights.
+
+	* fileio.c (Fset_file_times): Special-case ignoring errors for
+	directories only on MSDOS, not on MS-Windows.
+
 2012-10-05  Ikumi Keita  <ikumi@ikumi.que.jp>  (tiny change)
 
 	* minibuf.c (Fcompleting_read): Doc fix.  (Bug#12555)
diff --git a/src/fileio.c b/src/fileio.c
index 9ce9e7b8395..b4eda01afcc 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3034,7 +3034,7 @@ Use the current time if TIMESTAMP is nil.  TIMESTAMP is in the format of
   {
     if (set_file_times (-1, SSDATA (encoded_absname), t, t))
       {
-#ifdef DOS_NT
+#ifdef MSDOS
         struct stat st;
 
         /* Setting times on a directory always fails.  */
diff --git a/src/w32.c b/src/w32.c
index 6b52fb8398d..5809e3ff91f 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3952,8 +3952,9 @@ utime (const char *name, struct utimbuf *times)
     }
 
   /* Need write access to set times.  */
-  fh = CreateFile (name, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
-		   0, OPEN_EXISTING, 0, NULL);
+  fh = CreateFile (name, FILE_WRITE_ATTRIBUTES,
+		   FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+		   0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
   if (fh != INVALID_HANDLE_VALUE)
     {
       convert_from_time_t (times->actime, &atime);