Changeset 3682 for trunk/src/kmk/kmkbuiltin

Timestamp:

Aug 13, 2025, 1:34:19 AM (3 months ago)

Author:

bird

Message:

lib/nt,kmk: Fixed around rm/unlink semantics and general support for long file names in lib/nt.

Location:

trunk/src/kmk/kmkbuiltin

Files:

• mscfakes.c (modified) (3 diffs)
• mscfakes.h (modified) (3 diffs)
• rm.c (modified) (5 diffs)

trunk/src/kmk/kmkbuiltin/mscfakes.c

@@ -44 +44 @@
 #undef utimes
 #undef lutimes
+#include "nt/ntmkdirat.h"
+#undef mkdir
+#undef mkdirat
 
 #include "console.h"
@@ -314 +317 @@
 int mkdir_msc(const char *path, mode_t mode)
 {
+#if 0
     int rc = (mkdir)(path);
     if (rc)
@@ -328 +332 @@
     }
     return rc;
+#else
+    return birdMkDir(path, mode);
+#endif
 }
 

trunk/src/kmk/kmkbuiltin/mscfakes.h

@@ -50 +50 @@
 #include <stdio.h> /* unlink for UCRT */
 #include "nt/ntstat.h"
-#include "nt/ntunlink.h"
+#include "nt/ntunlink.h" /* redefines both unlink and rmdir */
 #ifdef MSC_DO_64_BIT_IO
 # if _MSC_VER >= 1400 /* We want 64-bit file lengths here when possible. */
@@ -61 +61 @@
 
 #undef  PATH_MAX
-#define PATH_MAX   _MAX_PATH
+/*#define PATH_MAX   _MAX_PATH */
+#define PATH_MAX   1024
 #undef  MAXPATHLEN
-#define MAXPATHLEN _MAX_PATH
+#define MAXPATHLEN PATH_MAX
 
 #define EX_OK 0
@@ -146 +147 @@
 #define readlink(link, buf, size) -1
 #define reallocf(old, size) realloc(old, size)
-int rmdir_msc(const char *path);
-#define rmdir(path) rmdir_msc(path)
+/*int rmdir_msc(const char *path);
+#define rmdir(path) rmdir_msc(path) */
 intmax_t strtoimax(const char *nptr, char **endptr, int base);
 uintmax_t strtoumax(const char *nptr, char **endptr, int base);

trunk/src/kmk/kmkbuiltin/rm.c

@@ -82 +82 @@
 #  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)
+# include "nt/ntunlink.h" /* redefines both unlink & rmdir */
 #endif
 #if defined(__OS2__) || defined(_MSC_VER)
@@ -430 +427 @@
 #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);
+                                    rval = birdRmDirForcedEx(p->fts_parent->fts_dirfd, p->fts_name);
                                 } else {
-                                    rval = birdUnlinkForced(p->fts_accpath);
+                                    rval = birdRmDirForced(p->fts_accpath);
                                 }
 #else
@@ -480 +477 @@
                                                 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);
+                                                if (p->fts_stat.st_isdirsymlink) {
+                                                        rval = birdRmDirForcedEx(p->fts_parent->fts_dirfd, p->fts_name);
+                                                } else {
+                                                        rval = birdUnlinkForcedEx(p->fts_parent->fts_dirfd, p->fts_name);
+                                                }
                                         }
                                 } else {
@@ -486 +487 @@
                                                 rval = birdUnlinkForcedFast(p->fts_accpath);
                                         } else { /* NtDeleteFile doesn't work on directory links, so slow symlink deletion: */
-                                                rval = birdUnlinkForced(p->fts_accpath);
+                                                if (p->fts_stat.st_isdirsymlink) {
+                                                        rval = birdRmDirForced(p->fts_accpath);
+                                                } else {
+                                                        rval = birdUnlinkForced(p->fts_accpath);
+                                                }
                                         }
                                 }
@@ -586 +591 @@
                                 operation = "unlink";
 #else
-                                if (pThis->fUseNtDeleteFile) {
+                                /*if (sb.st_isdirsymlink) {
+                                        rval = birdRmDirForced(f);
+                                        operation = "rmdir";
+                                } else*/ if (pThis->fUseNtDeleteFile /*&& S_ISREG(sb.st_mode) && !sb.st_isdirsymlink*/) {
                                         rval = birdUnlinkForcedFast(f);
                                         operation = "NtDeleteFile";