Changeset 2702 for trunk/src/kmk/kmkbuiltin

Timestamp:

Nov 21, 2013, 1:11:08 AM (12 years ago)

Author:

bird

Message:

kmk/WindowsNT: Avoiding unnecessary stat() calls. Reimplemented stat(), lstat(), fstat(), opendir(), readdir(), and closedir() using native NT APIs.

Location:

trunk/src/kmk/kmkbuiltin

Files:

• cp.c (modified) (1 diff)
• mscfakes.c (modified) (7 diffs)
• mscfakes.h (modified) (3 diffs)
• rm.c (modified) (1 diff)

trunk/src/kmk/kmkbuiltin/cp.c

@@ -83 +83 @@
 
 #if defined(_MSC_VER) || defined(__gnu_linux__) || defined(__linux__)
-extern char *strlcpy(char *, const char *, size_t);
+extern size_t strlcpy(char *, const char *, size_t);
 #endif
 

trunk/src/kmk/kmkbuiltin/mscfakes.c

@@ -109 +109 @@
 
 
-static int
-msc_set_errno(DWORD dwErr)
+int
+birdSetErrno(DWORD dwErr)
 {
     switch (dwErr)
@@ -184 +184 @@
     DWORD fAttr = GetFileAttributes(pszPath);
     if (fAttr == INVALID_FILE_ATTRIBUTES)
-        rc = msc_set_errno(GetLastError());
+        rc = birdSetErrno(GetLastError());
     else if (fMustBeDir & !(fAttr & FILE_ATTRIBUTE_DIRECTORY))
     {
@@ -200 +200 @@
             fAttr |= FILE_ATTRIBUTE_READONLY;
         if (!SetFileAttributes(pszPath, fAttr))
-            rc = msc_set_errno(GetLastError());
+            rc = birdSetErrno(GetLastError());
     }
 
@@ -224 +224 @@
     DWORD fAttr = GetFileAttributes(pszPath);
     if (fAttr == INVALID_FILE_ATTRIBUTES)
-        rc = msc_set_errno(GetLastError());
+        rc = birdSetErrno(GetLastError());
     else if (fMustBeDir & !(fAttr & FILE_ATTRIBUTE_DIRECTORY))
     {
@@ -245 +245 @@
             fAttr |= FILE_ATTRIBUTE_READONLY;
         if (!SetFileAttributes(pszPath, fAttr))
-            rc = msc_set_errno(GetLastError());
+            rc = birdSetErrno(GetLastError());
     }
 
@@ -283 +283 @@
     if (s_pfnCreateHardLinkA(pszLink, pszDst, NULL))
         return 0;
-    return msc_set_errno(GetLastError());
+    return birdSetErrno(GetLastError());
 }
 
@@ -535 +535 @@
 
 
-/*
- * Workaround for directory names with trailing slashes.
- */
-#undef stat
-int
-bird_w32_stat(const char *path, struct stat *st)
-{
-    int rc = stat(path, st);
-    if (    rc != 0
-        &&  errno == ENOENT
-        &&  *path != '\0')
-    {
-        char *slash = strchr(path, '\0') - 1;
-        if (*slash == '/' || *slash == '\\')
-        {
-            size_t len_path = slash - path + 1;
-            char *tmp = alloca(len_path + 4);
-            memcpy(tmp, path, len_path);
-            tmp[len_path] = '.';
-            tmp[len_path + 1] = '\0';
-            errno = 0;
-            rc = stat(tmp, st);
-            if (    rc == 0
-                &&  !S_ISDIR(st->st_mode))
-            {
-                errno = ENOTDIR;
-                rc = -1;
-            }
-        }
-    }
-#ifdef KMK_PRF
-    {
-        int err = errno;
-        fprintf(stderr, "stat(%s,) -> %d/%d\n", path, rc, errno);
-        errno = err;
-    }
-#endif
-    return rc;
-}
-

trunk/src/kmk/kmkbuiltin/mscfakes.h

@@ -39 +39 @@
 #include <io.h>
 #include <direct.h>
+#include "nt/ntstat.h"
 #if defined(MSC_DO_64_BIT_IO) && _MSC_VER >= 1400 /* We want 64-bit file lengths here when possible. */
 # define off_t __int64
-# undef stat
-# define stat  _stat64
-# define fstat _fstat64
 # define lseek _lseeki64
-#else
-# ifndef STAT_REDEFINED_ALREADY
-#  define STAT_REDEFINED_ALREADY
-#  undef stat
-#  define stat(_path, _st) bird_w32_stat(_path, _st)
-extern int bird_w32_stat(const char *, struct stat *);
-# endif
 #endif
-
-#ifndef S_ISDIR
-# define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
-#endif
-#ifndef S_ISREG
-# define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
-#endif
-#define S_ISLNK(m)  0
-#define S_IRWXU (_S_IREAD | _S_IWRITE | _S_IEXEC)
-#define S_IXUSR _S_IEXEC
-#define S_IWUSR _S_IWRITE
-#define S_IRUSR _S_IREAD
-#define S_IRWXG 0000070
-#define S_IRGRP 0000040
-#define S_IWGRP 0000020
-#define S_IXGRP 0000010
-#define S_IRWXO 0000007
-#define S_IROTH 0000004
-#define S_IWOTH 0000002
-#define S_IXOTH 0000001
-#define S_ISUID 0004000
-#define S_ISGID 0002000
-#define ALLPERMS 0000777
 
 #undef  PATH_MAX
@@ -141 +109 @@
 #define geteuid()  0
 #define getegid()  0
-#define lstat(path, s) stat(path, s)
 int lchmod(const char *path, mode_t mode);
 int msc_chmod(const char *path, mode_t mode);
@@ -172 +139 @@
 int writev(int fd, const struct iovec *vector, int count);
 
+
+
+/*
+ * MSC fake internals / helpers.
+ */
+int birdSetErrno(unsigned dwErr);
+
 #endif /* _MSC_VER */
 #endif

trunk/src/kmk/kmkbuiltin/rm.c

@@ -499 +499 @@
                                 rval = undelete(f);
                                 operation = "undelete";
+#ifndef _MSC_VER
                         } else if (S_ISDIR(sb.st_mode)) {
+#else
+                        } else if (S_ISDIR(sb.st_mode) || sb.st_dirsymlink) {
+#endif
                                 rval = rmdir(f);
                                 operation = "rmdir";