*** empty log message ***

[gnulib.git] / lib / dirname.c

diff --git a/lib/dirname.c b/lib/dirname.c
index acaeba1..22efc10 100644 (file)
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -32,12 +32,15 @@ char *malloc ();
 #  define strrchr rindex
 # endif
 #endif
+#include <assert.h>
+
+#include "dirname.h"
 
 #ifndef ISSLASH
 # define ISSLASH(C) ((C) == '/')
 #endif
 
-#include "dirname.h"
+#define BACKSLASH_IS_PATH_SEPARATOR ISSLASH ('\\')
 
 /* Return the leading directories part of PATH,
    allocated with malloc.  If out of memory, return 0.
@@ -52,6 +55,19 @@ dir_name (const char *path)
   int length;                  /* Length of result, not including NUL.  */
 
   slash = strrchr (path, '/');
+  if (BACKSLASH_IS_PATH_SEPARATOR)
+    {
+      char *b = strrchr (path, '\\');
+      if (b && slash < b)
+       slash = b;
+    }
+
+  /* Make sure there are no trailing slashes.  */
+  assert (slash == NULL           /* There are no slashes in PATH.  */
+         || slash[1] != 0 /* There is a non-NUL byte after the last slash.  */
+         || path == slash /* PATH is just `/'.  */
+         );
+
   if (slash == 0)
     {
       /* File is in the current directory.  */
@@ -61,20 +77,25 @@ dir_name (const char *path)
   else
     {
       /* Remove any trailing slashes from the result.  */
-#ifdef MSDOS
-      const char *lim = ((path[0] >= 'A' && path[0] <= 'z' && path[1] == ':')
-                        ? path + 2 : path);
+      if (BACKSLASH_IS_PATH_SEPARATOR)
+       {
+         const char *lim = ((path[0] >= 'A' && path[0] <= 'z'
+                             && path[1] == ':')
+                            ? path + 2 : path);
 
-      /* If canonicalized "d:/path", leave alone the root case "d:/".  */
-      while (slash > lim && *slash == '/')
-       --slash;
-#else
-      while (slash > path && *slash == '/')
-       --slash;
-#endif
+         /* If canonicalized "d:/path", leave alone the root case "d:/".  */
+         while (slash > lim && ISSLASH (*slash))
+           --slash;
+       }
+      else
+       {
+         while (slash > path && ISSLASH (*slash))
+           --slash;
+       }
 
       length = slash - path + 1;
     }
+
   newpath = (char *) malloc (length + 1);
   if (newpath == 0)
     return 0;