Changeset 3094 for trunk/src

Timestamp:

Oct 14, 2017, 5:32:50 AM (8 years ago)

Author:

bird

Message:

utime/lutime windows emulation fixes.

Location:

trunk/src

Files:

• kmk/kmkbuiltin/mscfakes.c (modified) (2 diffs)
• lib/nt/ntutimes.c (modified) (1 diff)

trunk/src/kmk/kmkbuiltin/mscfakes.c

@@ -652 +652 @@
 int utimes(const char *pszPath, const struct timeval *paTimes)
 {
-    BirdTimeVal_T aTimes[2];
-    aTimes[0].tv_sec  = paTimes[0].tv_sec;
-    aTimes[0].tv_usec = paTimes[0].tv_usec;
-    aTimes[1].tv_sec  = paTimes[1].tv_sec;
-    aTimes[1].tv_usec = paTimes[1].tv_usec;
-    return birdUtimes(pszPath, aTimes);
+    if (paTimes)
+    {
+        BirdTimeVal_T aTimes[2];
+        aTimes[0].tv_sec  = paTimes[0].tv_sec;
+        aTimes[0].tv_usec = paTimes[0].tv_usec;
+        aTimes[1].tv_sec  = paTimes[1].tv_sec;
+        aTimes[1].tv_usec = paTimes[1].tv_usec;
+        return birdUtimes(pszPath, aTimes);
+    }
+    return birdUtimes(pszPath, NULL);
 }
 
@@ -663 +667 @@
 int lutimes(const char *pszPath, const struct timeval *paTimes)
 {
-    BirdTimeVal_T aTimes[2];
-    aTimes[0].tv_sec  = paTimes[0].tv_sec;
-    aTimes[0].tv_usec = paTimes[0].tv_usec;
-    aTimes[1].tv_sec  = paTimes[1].tv_sec;
-    aTimes[1].tv_usec = paTimes[1].tv_usec;
-    return birdUtimes(pszPath, aTimes);
+    if (paTimes)
+    {
+        BirdTimeVal_T aTimes[2];
+        aTimes[0].tv_sec  = paTimes[0].tv_sec;
+        aTimes[0].tv_usec = paTimes[0].tv_usec;
+        aTimes[1].tv_sec  = paTimes[1].tv_sec;
+        aTimes[1].tv_usec = paTimes[1].tv_usec;
+        return birdUtimes(pszPath, aTimes);
+    }
+    return birdUtimes(pszPath, NULL);
 }
 

trunk/src/lib/nt/ntutimes.c

@@ -57 +57 @@
 
         memset(&Info, 0, sizeof(0));
-        Info.LastAccessTime.QuadPart = birdNtTimeFromTimeVal(&paTimes[0]);
-        Info.LastWriteTime.QuadPart  = birdNtTimeFromTimeVal(&paTimes[1]);
+        if (paTimes)
+        {
+            Info.LastAccessTime.QuadPart = birdNtTimeFromTimeVal(&paTimes[0]);
+            Info.LastWriteTime.QuadPart  = birdNtTimeFromTimeVal(&paTimes[1]);
+        }
+        else
+        {
+            /** @todo replace this with something from ntdll  */
+            FILETIME Now;
+            GetSystemTimeAsFileTime(&Now);
+            Info.LastAccessTime.HighPart  = Now.dwHighDateTime;
+            Info.LastAccessTime.LowPart   = Now.dwLowDateTime;
+            Info.LastWriteTime.HighPart   = Now.dwHighDateTime;
+            Info.LastWriteTime.LowPart    = Now.dwLowDateTime;
+        }
 
         Ios.Information = -1;