X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirname.c;h=22efc10607541b5912fac9be2bc990221747aec4;hb=115741fa52092c59e33d75428b776513caa88f87;hp=acaeba16cd3d4069245a7b3a0f216d2e1af9baff;hpb=068326dbb1eabf05e68dab458bbaf44e71b924fb;p=gnulib.git

diff --git a/lib/dirname.c b/lib/dirname.c
index acaeba16c..22efc1060 100644
--- 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;