Changeset 3060 for trunk/src/kmk

Timestamp:

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

Author:

bird

Message:

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

Location:

trunk/src/kmk

Files:

• kmkbuiltin/mscfakes.c (modified) (3 diffs)
• kmkbuiltin/mscfakes.h (modified) (5 diffs)
• kmkbuiltin/touch.c (modified) (9 diffs)
• w32/pathstuff.c (modified) (1 diff)

trunk/src/kmk/kmkbuiltin/mscfakes.c

@@ -37 +37 @@
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <sys/timeb.h>
 #include "err.h"
 #include "mscfakes.h"
+
+#include "nt/ntutimes.h"
+#undef utimes
+#undef lutimes
 
 #define timeval windows_timeval
 #include <Windows.h>
 #undef timeval
+
 
 /*******************************************************************************
@@ -460 +466 @@
 
 
-int utimes(const char *pszPath, const struct timeval *paTimes)
-{
-    /** @todo implement me! */
-    return 0;
-}
-
-
 /* We override the libc write function (in our modules only, unfortunately) so
    we can kludge our way around a ENOSPC problem observed on build servers
@@ -651 +650 @@
 
 
+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);
+}
+
+
+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);
+}
+
+
+int gettimeofday(struct timeval *pNow, void *pvIgnored)
+{
+    struct __timeb64 Now;
+    int rc = _ftime64_s(&Now);
+    if (rc == 0)
+    {
+        pNow->tv_sec  = Now.time;
+        pNow->tv_usec = Now.millitm * 1000;
+        return 0;
+    }
+    errno = rc;
+    return -1;
+}
+
+
+struct tm *localtime_r(const __time64_t *pNow, struct tm *pResult)
+{
+    int rc = _localtime64_s(pResult, pNow);
+    if (rc == 0)
+        return pResult;
+    errno = rc;
+    return NULL;
+}
+
+
+__time64_t timegm(struct tm *pNow)
+{
+    return _mkgmtime64(pNow);
+}
+
+
 /**
  * Checks if the given file descriptor is a pipe or not.

trunk/src/kmk/kmkbuiltin/mscfakes.h

@@ -28 +28 @@
 #ifdef _MSC_VER
 
+#define timeval windows_timeval
+
 /* Include the config file (kmk's) so we don't need to duplicate stuff from it here. */
 #include "config.h"
@@ -50 +52 @@
 # define lseek _lseeki64
 #endif
+
+#undef timeval
 
 #undef  PATH_MAX
@@ -104 +108 @@
 #endif
 
-#if !defined(timerisset) && defined(MSCFAKES_NO_WINDOWS_H)
 struct timeval
 {
-    long tv_sec;
+    __time64_t tv_sec;
     long tv_usec;
 };
-#endif
 
 struct iovec
@@ -134 +136 @@
 #define chmod msc_chmod
 #define lchown(path, uid, gid) chown(path, uid, gid)
-#define lutimes(path, tvs) utimes(path, tvs)
 int link(const char *pszDst, const char *pszLink);
 int mkdir_msc(const char *path, mode_t mode);
@@ -158 +159 @@
 int symlink(const char *pszDst, const char *pszLink);
 int utimes(const char *pszPath, const struct timeval *paTimes);
+int lutimes(const char *pszPath, const struct timeval *paTimes);
 ssize_t writev(int fd, const struct iovec *vector, int count);
+
+int gettimeofday(struct timeval *pNow, void *pvIgnored);
+struct tm *localtime_r(const __time64_t *pNow, struct tm *pResult);
+__time64_t timegm(struct tm *pNow);
+#undef mktime
+#define mktime _mktime64
 
 /* bird write ENOSPC hacks. */

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)
     {

trunk/src/kmk/w32/pathstuff.c

@@ -16 +16 @@
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <Windows.h> /* bird */
 #include "make.h"
 #include <string.h>