Changeset 3060 for trunk/src/lib

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/lib

Files:

• Makefile.kmk (modified) (1 diff)
• nt/nthlp.h (modified) (1 diff)
• nt/nttypes.h (modified) (3 diffs)
• nt/ntunlink.c (modified) (2 diffs)
• nt/ntunlink.h (modified) (1 diff)
• nt/ntutimes.c (added)
• nt/ntutimes.h (copied) (copied from trunk/src/lib/nt/ntunlink.h ) (2 diffs)

trunk/src/lib/Makefile.kmk

@@ -53 +53 @@
        nt/ntstat.c \
        nt/ntunlink.c \
+       nt/ntutimes.c \
        nt/fts-nt.c \
        nt/kFsCache.c \

trunk/src/lib/nt/nthlp.h

@@ -89 +89 @@
 
 
+static __inline void birdNtTimeToTimeVal(__int64 iNtTime, BirdTimeVal_T *pTimeVal)
+{
+    iNtTime -= BIRD_NT_EPOCH_OFFSET_UNIX_100NS;
+    pTimeVal->tv_sec  = iNtTime / 10000000;
+    pTimeVal->tv_usec = (iNtTime % 10000000) / 10;
+}
+
+
+static __inline __int64 birdNtTimeFromTimeVal(BirdTimeVal_T const *pTimeVal)
+{
+    __int64 iNtTime = pTimeVal->tv_sec * 10000000;
+    iNtTime += pTimeVal->tv_usec * 10;
+    iNtTime += BIRD_NT_EPOCH_OFFSET_UNIX_100NS;
+    return iNtTime;
+}
+
+
 #endif
 

trunk/src/lib/nt/nttypes.h

@@ -5 +5 @@
 
 /*
- * Copyright (c) 2005-2013 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
+ * Copyright (c) 2005-2017 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -34 +34 @@
 #include <sys/types.h>
 
+typedef struct BirdTimeVal
+{
+    __int64       tv_sec;
+    __int32       tv_usec;
+    __int32       tv_padding0;
+} BirdTimeVal_T;
+
 typedef struct BirdTimeSpec
 {
@@ -47 +54 @@
 #endif
 
-

trunk/src/lib/nt/ntunlink.c

@@ -5 +5 @@
 
 /*
- * Copyright (c) 2005-2013 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
+ * Copyright (c) 2005-2017 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -33 +33 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <stdio.h>
-#include <errno.h>
-#include <malloc.h>
+#include "ntunlink.h"
 
 #include "ntstuff.h"

trunk/src/lib/nt/ntunlink.h

@@ -33 +33 @@
 
 #include "nttypes.h"
+#include <wchar.h>
 
 int birdUnlink(const char *pszFile);

trunk/src/lib/nt/ntutimes.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * MSC + NT unlink and variations.
+ * MSC + NT utimes and lutimes.
  */
 
 /*
- * Copyright (c) 2005-2013 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
+ * Copyright (c) 2005-2017 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -29 +29 @@
  */
 
-#ifndef ___nt_ntunlink_h
-#define ___nt_ntunlink_h
+#ifndef ___nt_ntutimes_h
+#define ___nt_ntutimes_h
 
 #include "nttypes.h"
 
-int birdUnlink(const char *pszFile);
-int birdUnlinkW(const wchar_t *pwszFile);
-int birdUnlinkEx(void *hRoot, const char *pszFile);
-int birdUnlinkExW(void *hRoot, const wchar_t *pwszFile);
-int birdUnlinkForced(const char *pszFile);
-int birdUnlinkForcedW(const wchar_t *pwszFile);
-int birdUnlinkForcedEx(void *hRoot, const char *pszFile);
-int birdUnlinkForcedExW(void *hRoot, const wchar_t *pszFile);
-int birdUnlinkForcedFast(const char *pszFile);
-int birdUnlinkForcedFastW(const wchar_t *pwszFile);
-int birdUnlinkForcedFastEx(void *hRoot, const char *pszFile);
-int birdUnlinkForcedFastExW(void *hRoot, const wchar_t *pwszFile);
+int birdUtimes(const char *pszFile, BirdTimeVal_T paTimes[2]);
+int birdLUtimes(const char *pszFile, BirdTimeVal_T paTimes[2]);
 
-#undef  unlink
-#define unlink(a_pszPath)     birdUnlinkForced(a_pszPath)
+#undef  utimes
+#define utimes(a_pszPath, a_paTimes)    birdUtimes(a_pszPath, a_paTimes)
+#undef  lutimes
+#define lutimes(a_pszPath, a_paTimes)   birdLUtimes(a_pszPath, a_paTimes)
 
 #endif