Changeset 2713 for trunk/src/kmk

Timestamp:

Nov 21, 2013, 10:11:00 PM (12 years ago)

Author:

bird

Message:

Some unlink(), rmdir() and kmk_rm optimizations.

Location:

trunk/src/kmk/kmkbuiltin

Files:

• mscfakes.h (modified) (1 diff)
• rm.c (modified) (9 diffs)

trunk/src/kmk/kmkbuiltin/mscfakes.h

@@ -40 +40 @@
 #include <direct.h>
 #include "nt/ntstat.h"
+#include "nt/ntunlink.h"
 #if defined(MSC_DO_64_BIT_IO) && _MSC_VER >= 1400 /* We want 64-bit file lengths here when possible. */
 # define off_t __int64

trunk/src/kmk/kmkbuiltin/rm.c

@@ -67 +67 @@
 # include "haikufakes.h"
 #endif
-#ifdef _MSC_VER
-# include "mscfakes.h"
+#ifdef KBUILD_OS_WINDOWS
+# ifdef _MSC_VER
+#  include "mscfakes.h"
+# endif
+# include "nt/ntunlink.h"
+  /* Use the special unlink implementation to do rmdir too. */
+# undef  rmdir
+# define rmdir(a_pszPath)       birdUnlinkForced(a_pszPath)
 #endif
 #if defined(__OS2__) || defined(_MSC_VER)
@@ -77 +83 @@
 #include "kbuild_protection.h"
 
-#if defined(__EMX__) || defined(_MSC_VER)
+#if defined(__EMX__) || defined(KBUILD_OS_WINDOWS)
 # define IS_SLASH(ch)   ( (ch) == '/' || (ch) == '\\' )
 # define HAVE_DOS_PATHS 1
@@ -100 +106 @@
 
 static int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok;
+#ifdef KBUILD_OS_WINDOWS
+static int fUseNtDeleteFile;
+#endif
 static uid_t uid;
 
@@ -114 +123 @@
     { "disable-full-protection",                        no_argument, 0, 266 },
     { "protection-depth",                               required_argument, 0, 267 },
+#ifdef KBUILD_OS_WINDOWS
+    { "nt-delete-file",                                 no_argument, 0, 268 },
+#endif
     { 0, 0,     0, 0 },
 };
@@ -149 +161 @@
         argv0 = argv[0];
         dflag = eval = fflag = iflag = Pflag = vflag = Wflag = stdin_ok = 0;
+#ifdef KBUILD_OS_WINDOWS
+        fUseNtDeleteFile = 0;
+#endif
         uid = 0;
         kBuildProtectionInit(&g_ProtData);
@@ -215 +230 @@
                         }
                         break;
+#ifdef KBUILD_OS_WINDOWS
+                case 268:
+                        fUseNtDeleteFile = 1;
+                        break;
+#endif
                 case '?':
                 default:
@@ -404 +424 @@
                                         if (!rm_overwrite(p->fts_accpath, NULL))
                                                 continue;
+#ifdef KBUILD_OS_WINDOWS
+                                rval = birdUnlinkForcedFast(p->fts_accpath);
+#else
                                 rval = unlink(p->fts_accpath);
-#ifdef _MSC_VER
-                                if (rval != 0) {
-                                        chmod(p->fts_accpath, 0777);
-                                        rval = unlink(p->fts_accpath);
-                                }
 #endif
 
@@ -499 +517 @@
                                 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";
@@ -510 +524 @@
                                         if (!rm_overwrite(f, &sb))
                                                 continue;
+#ifndef KBUILD_OS_WINDOWS
                                 rval = unlink(f);
-#ifdef _MSC_VER
-                                if (rval != 0) {
-                                        chmod(f, 0777);
-                                        rval = unlink(f);
+                                operation = "unlink";
+#else
+                                if (fUseNtDeleteFile) {
+                                        rval = birdUnlinkForcedFast(f);
+                                        operation = "NtDeleteFile";
+                                } else {
+                                        rval = birdUnlinkForced(f);
+                                        operation = "unlink";
                                 }
 #endif
-                                operation = "unlink";
                         }
                 }