win32: simplify utimes(2) implementation

SetFileTime only needs FILE_WRITE_ATTRIBUTES access, not full
read/write access.  Therefore it isn't necessary to change the
permissions of read-only files.

The flag FILE_FLAG_BACKUP_SEMANTICS is required to access directories
but does no harm if used on a file.

As a result there's no need to get file attributes.

1 files changed, 6 insertions, 31 deletions

diff --git a/win32/mingw.c b/win32/mingw.c
index f84cb76d3..ea439a66d 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -678,31 +678,13 @@ int utimes(const char *file_name, const struct timeval tims[2])
 {
         FILETIME mft, aft;
         HANDLE fh;
-        DWORD flags, attrs;
-        int rc;
+        int rc = 0;
 
-        flags = FILE_ATTRIBUTE_NORMAL;
-
-        /* must have write permission */
-        attrs = GetFileAttributes(file_name);
-        if ( attrs != INVALID_FILE_ATTRIBUTES ) {
-            if ( attrs & FILE_ATTRIBUTE_READONLY ) {
-                        /* ignore errors here; open() will report them */
-                        SetFileAttributes(file_name, attrs & ~FILE_ATTRIBUTE_READONLY);
-                }
-
-            if ( attrs & FILE_ATTRIBUTE_DIRECTORY ) {
-                        flags = FILE_FLAG_BACKUP_SEMANTICS;
-                }
-        }
-
-        fh = CreateFile(file_name, GENERIC_READ|GENERIC_WRITE,
-                                FILE_SHARE_READ|FILE_SHARE_WRITE,
-                                NULL, OPEN_EXISTING, flags, NULL);
+        fh = CreateFile(file_name, FILE_WRITE_ATTRIBUTES, 0,
+                                NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
         if ( fh == INVALID_HANDLE_VALUE ) {
                 errno = err_win_to_posix(GetLastError());
-                rc = -1;
-                goto revert_attrs;
+                return -1;
         }
 
         if (tims) {
@@ -713,19 +695,12 @@ int utimes(const char *file_name, const struct timeval tims[2])
                 GetSystemTimeAsFileTime(&mft);
                 aft = mft;
         }
+
         if (!SetFileTime(fh, NULL, &aft, &mft)) {
                 errno = EINVAL;
                 rc = -1;
-        } else
-                rc = 0;
-        CloseHandle(fh);
-
-revert_attrs:
-        if (attrs != INVALID_FILE_ATTRIBUTES &&
-            (attrs & FILE_ATTRIBUTE_READONLY)) {
-                /* ignore errors again */
-                SetFileAttributes(file_name, attrs);
         }
+        CloseHandle(fh);
         return rc;
 }