*** empty log message ***

[gnulib.git] / lib / dirname.c

diff --git a/lib/dirname.c b/lib/dirname.c
index 237dd4b..22efc10 100644 (file)
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -1,5 +1,5 @@
 /* dirname.c -- return all but the last element in a path
-   Copyright (C) 1990, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
@@ -32,15 +32,15 @@ char *malloc ();
 #  define strrchr rindex
 # endif
 #endif
+#include <assert.h>
 
-#include <ctype.h>
+#include "dirname.h"
 
-#if defined STDC_HEADERS || (!defined isascii && !defined HAVE_ISASCII)
-# define IN_CTYPE_DOMAIN(c) 1
-#else
-# define IN_CTYPE_DOMAIN(c) isascii(c)
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == '/')
 #endif
-#define ISALPHA(Ch) (IN_CTYPE_DOMAIN (Ch) && isalpha (Ch))
+
+#define BACKSLASH_IS_PATH_SEPARATOR ISSLASH ('\\')
 
 /* Return the leading directories part of PATH,
    allocated with malloc.  If out of memory, return 0.
@@ -48,14 +48,26 @@ char *malloc ();
    removed.  */
 
 char *
-dirname (path)
-     char *path;
+dir_name (const char *path)
 {
   char *newpath;
   char *slash;
   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.  */
@@ -64,19 +76,26 @@ dirname (path)
     }
   else
     {
-      char *lim = path;
-
-#ifdef MSDOS
-      /* If canonicalized "d:/path", leave alone the root case "d:/".  */
-      lim = (ISALPHA (path[0]) && path[1] == ':') ? path + 2 : path;
-#endif
-
       /* Remove any trailing slashes from the result.  */
-      while (slash > path && *slash == '/')
-       --slash;
+      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 && ISSLASH (*slash))
+           --slash;
+       }
+      else
+       {
+         while (slash > path && ISSLASH (*slash))
+           --slash;
+       }
 
       length = slash - path + 1;
     }
+
   newpath = (char *) malloc (length + 1);
   if (newpath == 0)
     return 0;