X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbasename.c;h=36e0f62b13d797b85f9d0ffa2620717503739818;hb=be888b85ebe1d2e8c04a2dfc28144e164ba02865;hp=f4f38f9a626bcbae6dc7f80d3b70e0633121face;hpb=18ab6ee18233961743bef66f79851b2cbcfa4d76;p=gnulib.git

diff --git a/lib/basename.c b/lib/basename.c
index f4f38f9a6..36e0f62b1 100644
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -1,5 +1,5 @@
 /* basename.c -- return the last element in a path
-   Copyright (C) 1990, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 1999, 2000, 2001 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
@@ -19,26 +19,53 @@
 # include <config.h>
 #endif
 
+#include <stdio.h>
+#include <assert.h>
+
 #ifndef FILESYSTEM_PREFIX_LEN
 # define FILESYSTEM_PREFIX_LEN(Filename) 0
 #endif
 
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
 #ifndef ISSLASH
 # define ISSLASH(C) ((C) == '/')
 #endif
 
+char *base_name PARAMS ((char const *name));
+
 /* In general, we can't use the builtin `basename' function if available,
    since it has different meanings in different environments.
-   In some environments the builtin `basename' modifies its argument.  */
+   In some environments the builtin `basename' modifies its argument.
+   If NAME is all slashes, be sure to return `/'.  */
 
 char *
 base_name (char const *name)
 {
   char const *base = name += FILESYSTEM_PREFIX_LEN (name);
+  int all_slashes = 1;
+  char const *p;
+
+  for (p = name; *p; p++)
+    {
+      if (ISSLASH (*p))
+	base = p + 1;
+      else
+	all_slashes = 0;
+    }
+
+  /* If NAME is all slashes, arrange to return `/'.  */
+  if (*base == '\0' && ISSLASH (*name) && all_slashes)
+    --base;
 
-  for (; *name; name++)
-    if (ISSLASH (*name))
-      base = name + 1;
+  /* Make sure the last byte is not a slash.  */
+  assert (all_slashes || !ISSLASH (*(p - 1)));
 
   return (char *) base;
 }