Changeset 1194

Timestamp:

Oct 6, 2007, 3:59:35 AM (18 years ago)

Author:

bird

Message:

Fixed a couple of slash problems in cp and install (dos based systems).

Location:

trunk/src/kmk/kmkbuiltin

Files:

• cp.c (modified) (4 diffs)
• install.c (modified) (6 diffs)

trunk/src/kmk/kmkbuiltin/cp.c ¶

@@ -100 +100 @@
 #endif
 
+#if defined(__WIN32__) || defined(__WIN64__) || defined(__OS2__)
+# define IS_SLASH(ch)   ((ch) == '/' || (ch) == '\\')
+#else
+# define IS_SLASH(ch)   ((ch) == '/')
+#endif
+
 #define STRIP_TRAILING_SLASH(p) {                                       \
-        while ((p).p_end > (p).p_path + 1 && (p).p_end[-1] == '/')      \
+        while ((p).p_end > (p).p_path + 1 && IS_SLASH((p).p_end[-1]))   \
                 *--(p).p_end = 0;                                       \
 }
@@ -257 +263 @@
                 *to.p_end = 0;
         }
-        have_trailing_slash = (to.p_end[-1] == '/');
+        have_trailing_slash = IS_SLASH(to.p_end[-1]);
         if (have_trailing_slash)
                 STRIP_TRAILING_SLASH(to);
@@ -388 +394 @@
                                 if (type != DIR_TO_DNE) {
                                         p = strrchr(curr->fts_path, '/');
+#if defined(__WIN32__) || defined(__WIN64__) || defined(__OS2__)
+                                        if (strrchr(curr->fts_path, '\\') > p)
+                                            p = strrchr(curr->fts_path, '\\');
+#endif
                                         base = (p == NULL) ? 0 :
                                             (int)(p - curr->fts_path + 1);
@@ -401 +411 @@
                         nlen = curr->fts_pathlen - base;
                         target_mid = to.target_end;
-                        if (*p != '/' && target_mid[-1] != '/')
+                        if (!IS_SLASH(*p) && !IS_SLASH(target_mid[-1]))
                                 *target_mid++ = '/';
                         *target_mid = 0;

trunk/src/kmk/kmkbuiltin/install.c ¶

@@ -115 +115 @@
 #endif
 
+#if defined(__WIN32__) || defined(__WIN64__) || defined(__OS2__)
+# define IS_SLASH(ch)   ((ch) == '/' || (ch) == '\\')
+#else
+# define IS_SLASH(ch)   ((ch) == '/')
+#endif
+
 static gid_t gid;
 static uid_t uid;
@@ -141 +147 @@
 #endif
 static int      usage(FILE *);
+static char    *last_slash(const char *);
 
 int
@@ -389 +396 @@
                         (void)snprintf(pathbuf, sizeof(pathbuf), "%s/%s",
                             to_name,
-                            (p = strrchr(from_name, '/')) ? ++p : from_name);
+                            (p = last_slash(from_name)) ? ++p : from_name);
                         to_name = pathbuf;
                 }
@@ -744 +751 @@
         (void)strncpy(temp, path, tsize);
         temp[tsize - 1] = '\0';
-        if ((p = strrchr(temp, '/')) != NULL)
+        if ((p = last_slash(temp)) != NULL)
                 p++;
         else
@@ -915 +922 @@
 
         for (p = path;; ++p)
-                if (!*p || (p != path && *p  == '/')) {
+                if (!*p || (p != path && IS_SLASH(*p))) {
                         ch = *p;
                         *p = '\0';
@@ -981 +988 @@
 }
 #endif
+
+/* figures out where the last slash or colon is. */
+static char *
+last_slash(const char *path)
+{
+#if defined(__WIN32__) || defined(__WIN64__) || defined(__OS2__)
+    char *p = (char *)strrchr(path, '/');
+    if (p)
+    {
+        char *p2 = strrchr(p, '\\');
+        if (p2)
+            p = p2;
+    }
+    else
+    {
+        p = (char *)strrchr(path, '\\');
+        if (!p && isalpha(path[0]) && path[1] == ':')
+            p = (char *)&path[1];
+    }
+    return p;
+#else
+    return strrchr(path, '/');
+#endif
+}
+