Changeset 2681 in kBuild for trunk/src/kash/shfile.c

Timestamp:

Apr 14, 2013 6:41:58 PM (12 years ago)

Author:

bird

Message:

shfile.c: Fixed windows problem with stat() failing if the directory ends with a slash.\

File:

• trunk/src/kash/shfile.c (modified) (3 diffs)

trunk/src/kash/shfile.c

@@ -427 +427 @@
 
 # if K_OS == K_OS_WINDOWS
+
+/**
+ * Adjusts the file name if it ends with a trailing directory slash.
+ *
+ * Windows APIs doesn't like trailing slashes.
+ *
+ * @returns 1 if it has a directory slash, 0 if not.
+ *
+ * @param   abspath     The path to adjust (SHFILE_MAX_PATH).
+ */
+static int shfile_trailing_slash_hack(char *abspath)
+{
+    /*
+     * Anything worth adjust here?
+     */
+    size_t path_len = strlen(abspath);
+    if (   path_len == 0
+        || (   abspath[path_len - 1] != '/'
+#  if K_OS == K_OS_WINDOWS || K_OS == K_OS_OS2
+            && abspath[path_len - 1] != '\\'
+#  endif
+           )
+       )
+        return 0;
+
+    /*
+     * Ok, make the adjustment.
+     */
+    if (path_len + 2 <= SHFILE_MAX_PATH)
+    {
+        /* Add a '.' to the end. */
+        abspath[path_len++] = '.';
+        abspath[path_len]   = '\0';
+    }
+    else
+    {
+        /* No space for a dot, remove the slash if it's alone or just remove
+           one and add a dot like above. */
+        if (   abspath[path_len - 2] != '/'
+#  if K_OS == K_OS_WINDOWS || K_OS == K_OS_OS2
+            && abspath[path_len - 2] != '\\'
+#  endif
+           )
+            abspath[--path_len] = '\0';
+        else
+            abspath[path_len - 1] = '.';
+    }
+
+    return 1;
+}
+
 
 /**
@@ -1555 +1606 @@
     {
 # if K_OS == K_OS_WINDOWS
+        int dir_slash = shfile_trailing_slash_hack(abspath);
         rc = stat(abspath, pst); /** @todo re-implement stat. */
+        if (!rc && dir_slash && !S_ISDIR(pst->st_mode))
+        {
+            rc = -1;
+            errno = ENOTDIR;
+        }
 # else
         rc = stat(abspath, pst);
@@ -1577 +1634 @@
     {
 # if K_OS == K_OS_WINDOWS
-        rc = stat(abspath, pst); /** @todo implement lstat. */
+        int dir_slash = shfile_trailing_slash_hack(abspath);
+        rc = stat(abspath, pst); /** @todo re-implement stat. */
+        if (!rc && dir_slash && !S_ISDIR(pst->st_mode))
+        {
+            rc = -1;
+            errno = ENOTDIR;
+        }
 # else
         rc = lstat(abspath, pst);