Changeset 1555 in kBuild for trunk/src/kmk/kmkbuiltin/rm.c

Timestamp:

Apr 23, 2008 1:08:50 AM (17 years ago)

Author:

bird

Message:

bugfixes for windows/os2.

File:

• trunk/src/kmk/kmkbuiltin/rm.c (modified) (3 diffs)

trunk/src/kmk/kmkbuiltin/rm.c

@@ -350 +350 @@
      */
 #if defined(_MSC_VER) || defined(__OS2__)
-    if (IS_SLASH(path[0]) && IS_SLASH(path[1]) && !IS_SLASH(path[2])) {
+        if (IS_SLASH(path[0]) && IS_SLASH(path[1]) && !IS_SLASH(path[2])) {
                 /* skip the root - UNC */
                 path += 3;
@@ -369 +369 @@
                 }
 
-                if (IS_SLASH(path[drive_letter ? 2 : 0])) {
+                if (!IS_SLASH(path[drive_letter ? 2 : 0])) {
                         /*
                          * Relative path, must count cwd depth first.
                          */
-                        char *tmp = _getdcwd(drive_letter, NULL, 32);
+                        char *cwd = _getdcwd(drive_letter, NULL, 32);
+                        char *tmp = cwd;
                         if (!tmp) {
                                 eval = err(1, "_getdcwd");
@@ -393 +394 @@
                         }
                         components = count_sub_path_components(tmp, 0);
-                        free(tmp);
+                        free(cwd);
                 } else {
                         /* skip the drive letter and while we're at it, the root slash too. */