Changeset 1194 for trunk/src/kmk/kmkbuiltin/cp.c

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).

File:

• trunk/src/kmk/kmkbuiltin/cp.c (modified) (4 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;