Changeset 3469 for trunk/src

Timestamp:

Sep 16, 2020, 1:47:57 AM (5 years ago)

Author:

bird

Message:

kash: Use ntstat.c/h on windows, the crt version isn't reliable.

Location:

trunk/src/kash

Files:

• Makefile.kmk (modified) (1 diff)
• shfile.c (modified) (5 diffs)
• shfile.h (modified) (1 diff)

trunk/src/kash/Makefile.kmk

@@ -134 +134 @@
         strsignal.c \
         strlcpy.c \
+       ../lib/nt/ntstat.c \
+       ../lib/nt/nthlpcore.c \
+       ../lib/nt/nthlpfs.c \
        ../lib/nt/nt_child_inject_standard_handles.c
 ifdef KASH_WIN_FORKED_MODE

trunk/src/kash/shfile.c

@@ -2158 +2158 @@
     {
 # if K_OS == K_OS_WINDOWS
+#  if 1
+        rc = birdStatFollowLink(abspath, pst);
+#  else
         int dir_slash = shfile_trailing_slash_hack(abspath);
         rc = stat(abspath, pst); /** @todo re-implement stat. */
@@ -2164 +2167 @@
             rc = -1;
             errno = ENOTDIR;
-        }
+
+       }
+#  endif
 # else
         rc = stat(abspath, pst);
 # endif
     }
-    TRACE2((NULL, "shfile_stat(,%s,) -> %d [%d]\n", path, rc, errno));
+    TRACE2((NULL, "shfile_stat(,%s,) -> %d [%d] st_size=%llu st_mode=%o\n",
+            path, rc, errno, (unsigned long long)pst->st_size, pst->st_mode));
     return rc;
 #else
@@ -2186 +2192 @@
     {
 # if K_OS == K_OS_WINDOWS
+#  if 1
+        rc = birdStatOnLink(abspath, pst);
+#  else
         int dir_slash = shfile_trailing_slash_hack(abspath);
         rc = stat(abspath, pst); /** @todo re-implement stat. */
@@ -2193 +2202 @@
             errno = ENOTDIR;
         }
+#  endif
 # else
         rc = lstat(abspath, pst);
@@ -2200 +2210 @@
     rc = stat(path, pst);
 #endif
-    TRACE2((NULL, "shfile_stat(,%s,) -> %d [%d]\n", path, rc, errno));
+    TRACE2((NULL, "shfile_lstat(,%s,) -> %d [%d] st_size=%llu st_mode=%o\n",
+            path, rc, errno, (unsigned long long)pst->st_size, pst->st_mode));
     return rc;
 }

trunk/src/kash/shfile.h

@@ -95 +95 @@
 
 #endif
+#if K_OS == K_OS_WINDOWS
+# include "nt/ntstat.h"
+#endif