Changeset 3060 for trunk/src/kmk/kmkbuiltin/touch.c

Timestamp:

Sep 21, 2017, 5:11:07 PM (8 years ago)

Author:

bird

Message:

kmk,lib: ported kmk_touch to windows (nt).

File:

• trunk/src/kmk/kmkbuiltin/touch.c (modified) (9 diffs)

trunk/src/kmk/kmkbuiltin/touch.c

@@ -38 +38 @@
 # include <ctype.h>
 # include <io.h>
+# include <sys/timeb.h>
 #else
 # include <unistd.h>
@@ -47 +48 @@
 #include "kbuild_version.h"
 #include "kmkbuiltin.h"
+
+#ifdef _MSC_VER
+# include "nt/ntstat.h"
+# undef FILE_TIMESTAMP_HI_RES
+# define FILE_TIMESTAMP_HI_RES 1
+#endif
+
 
 /*********************************************************************************************************************************
@@ -99 +107 @@
     int             cFiles;
     /** The specified files.   */
-    const char    **papszFiles;
+    char          **papszFiles;
 } KMKTOUCHOPTS;
 typedef KMKTOUCHOPTS *PKMKTOUCHOPTS;
+
 
 
@@ -217 +226 @@
 {
     const char * const  pszTsIn = pszTs;
-    KBOOL               fIsZulu = K_FALSE;
     struct tm           ExpTime;
 
@@ -244 +252 @@
         return touch_error("Malformed timestamp '%s' given to -d: expected to two digit month at position 6 followed by a dash",
                            pszTsIn);
-    ExpTime.tm_mon = TWO_CHARS_TO_INT(pszTs[0], pszTs[1]);
+    ExpTime.tm_mon = TWO_CHARS_TO_INT(pszTs[0], pszTs[1]) - 1;
     pszTs += 3;
 
@@ -301 +309 @@
 
     /* zulu time indicator */
+    ExpTime.tm_isdst = -1;
     if (*pszTs == 'Z' || *pszTs == 'z')
     {
-        fIsZulu = K_TRUE;
+        ExpTime.tm_isdst = 0;
         pszTs++;
         if (*pszTs != '\0')
@@ -315 +324 @@
      * Convert to UTC seconds using either timegm or mktime.
      */
-    ExpTime.tm_isdst = fIsZulu ? 0 : -1;
     ExpTime.tm_yday  = -1;
     ExpTime.tm_wday  = -1;
-    pDst->tv_sec  = fIsZulu ? timegm(&ExpTime) : mktime(&ExpTime);
-    if (pDst->tv_sec != -1)
-        return 0;
-    return touch_error("%s failed on '%s': %s", fIsZulu ? "timegm" : "mktime", pszTs, strerror(errno));
+    if (ExpTime.tm_isdst == 0)
+    {
+        pDst->tv_sec = timegm(&ExpTime);
+        if (pDst->tv_sec == -1)
+            return touch_error("timegm failed on '%s': %s", pszTs, strerror(errno));
+    }
+    else
+    {
+        pDst->tv_sec = mktime(&ExpTime);
+        if (pDst->tv_sec == -1)
+            return touch_error("mktime failed on '%s': %s", pszTs, strerror(errno));
+    }
+    return 0;
 }
 
@@ -421 +438 @@
     }
 
-    pExpTime->tm_mon  = TWO_CHARS_TO_INT(pszTs[cchTsNoSec - 8], pszTs[cchTsNoSec - 7]);
+    pExpTime->tm_mon  = TWO_CHARS_TO_INT(pszTs[cchTsNoSec - 8], pszTs[cchTsNoSec - 7]) - 1;
     pExpTime->tm_mday = TWO_CHARS_TO_INT(pszTs[cchTsNoSec - 6], pszTs[cchTsNoSec - 5]);
     pExpTime->tm_hour = TWO_CHARS_TO_INT(pszTs[cchTsNoSec - 4], pszTs[cchTsNoSec - 3]);
@@ -894 +911 @@
     Opts.fDereference   = K_TRUE;
     Opts.cFiles         = 0;
-    Opts.papszFiles     = (const char **)calloc(argc, sizeof(const char *));
+    Opts.papszFiles     = (char **)calloc(argc, sizeof(char *));
     if (Opts.papszFiles)
     {