Changeset 3350 in kBuild for trunk/src

Timestamp:

May 23, 2020 5:05:29 PM (5 years ago)

Author:

bird

Message:

kmk_rm: Fast-delete doesn't work for symlinked directories on windows. Regular deletion works.

File:

• trunk/src/kmk/kmkbuiltin/rm.c (modified) (1 diff)

trunk/src/kmk/kmkbuiltin/rm.c

@@ -477 +477 @@
 #ifdef KBUILD_OS_WINDOWS
                                 if (p->fts_parent->fts_dirfd != NT_FTS_INVALID_HANDLE_VALUE) {
-                                    rval = birdUnlinkForcedFastEx(p->fts_parent->fts_dirfd, p->fts_name);
+                                        if (p->fts_info != FTS_SL && p->fts_info != FTS_SLNONE) {
+                                                rval = birdUnlinkForcedFastEx(p->fts_parent->fts_dirfd, p->fts_name);
+                                        } else { /* NtDeleteFile doesn't work on directory links, so slow symlink deletion: */
+                                                rval = birdUnlinkForcedEx(p->fts_parent->fts_dirfd, p->fts_name);
+                                        }
                                 } else {
-                                    rval = birdUnlinkForcedFast(p->fts_accpath);
+                                        if (p->fts_info != FTS_SL && p->fts_info != FTS_SLNONE) {
+                                                rval = birdUnlinkForcedFast(p->fts_accpath);
+                                        } else { /* NtDeleteFile doesn't work on directory links, so slow symlink deletion: */
+                                                rval = birdUnlinkForced(p->fts_accpath);
+                                        }
                                 }
 #else