Changeset 2648 for branches

Timestamp:

Mar 15, 2006, 5:24:06 AM (19 years ago)

Author:

bird

Message:

#69: Corrected a few problems related to dos drives and slashes in basename and dirname.

Location:

branches/libc-0.6/src

Files:

• emx/src/lib/misc/basename.c (modified) (1 diff)
• emx/src/lib/misc/dirname.c (modified) (2 diffs)
• libctests/libc/Makefile (modified) (1 diff)
• libctests/libc/smoketests/basename-dirname-1.c (added)

branches/libc-0.6/src/emx/src/lib/misc/basename.c

@@ -71 +71 @@
         }
 
+        /* d:/ */
+        if (*endp == ':' && endp == path + 1) {
+                (void)strncpy(bname, path, 3);
+                bname[3] = '\0';
+                return(bname);
+        }
+
         /* Find the start of the base */
         startp = endp;
-        while (startp > path && *(startp - 1) != '/' && *(startp - 1) != '\\' && *(startp - 1) != ':')
+        while (    startp > path
+               &&  *(startp - 1) != '/'
+               &&  *(startp - 1) != '\\'
+               &&  (*(startp - 1) != ':' || startp != path + 2))
                 startp--;
 

branches/libc-0.6/src/emx/src/lib/misc/dirname.c

@@ -67 +67 @@
 
         /* Find the start of the dir */
-        while (endp > path && *endp != '/' && *endp != '/' && *endp != ':')
+        while (endp > path && *endp != '/' && *endp != '\\' && (*endp != ':' || endp != path + 1))
                 endp--;
 
@@ -74 +74 @@
                 (void)strcpy(bname, *endp == '/' || *endp == '\\' ? "/" : ".");
                 return(bname);
-        } else {
+        }
+
+        if (*endp == ':' && endp == path + 1) {
+                if (endp[1] == '/' || endp[1] == '\\')
+                        endp++;
+        } else if (endp != path + 2 || path[1] != ':') {
                 do {
                         endp--;

branches/libc-0.6/src/libctests/libc/Makefile

@@ -96 +96 @@
         smoketests/fchmod-1.c \
         smoketests/nonblock-1.c \
-        smoketests/fclose-2.c
+        smoketests/fclose-2.c \
+        smoketests/basename-dirname-1.c
         
 #       smoketests/weak-export-1.c - dll