Changeset 2995 for trunk/src

Timestamp:

Nov 2, 2016, 12:27:34 AM (9 years ago)

Author:

bird

Message:

rm.c: Use fts_dirfd on windows.

File:

• trunk/src/kmk/kmkbuiltin/rm.c (modified) (2 diffs)

trunk/src/kmk/kmkbuiltin/rm.c

@@ -389 +389 @@
                         case FTS_DP:
                         case FTS_DNR:
+#ifdef KBUILD_OS_WINDOWS
+                                if (p->fts_parent->fts_dirfd != NT_FTS_INVALID_HANDLE_VALUE) {
+                                    rval = birdUnlinkForcedEx(p->fts_parent->fts_dirfd, p->fts_name);
+                                } else {
+                                    rval = birdUnlinkForced(p->fts_accpath);
+                                }
+#else
                                 rval = rmdir(p->fts_accpath);
+#endif
                                 if (rval == 0 || (fflag && errno == ENOENT)) {
                                         if (rval == 0 && vflag)
@@ -431 +439 @@
                                                 continue;
 #ifdef KBUILD_OS_WINDOWS
-                                rval = birdUnlinkForcedFast(p->fts_accpath);
+                                if (p->fts_parent->fts_dirfd != NT_FTS_INVALID_HANDLE_VALUE) {
+                                    rval = birdUnlinkForcedFastEx(p->fts_parent->fts_dirfd, p->fts_name);
+                                } else {
+                                    rval = birdUnlinkForcedFast(p->fts_accpath);
+                                }
 #else
                                 rval = unlink(p->fts_accpath);