X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbasename.c;h=f2babbee23fa232e4b7f1c3339110dcd5b0ca4ed;hb=268eada996dead3b74bf2e99e0f8e663db8c3e81;hp=f1a7266ad6776859eac2785da41d8ef8e948ad39;hpb=783c1624bd8b027a65b3fba57d3213ccb1a6ddbd;p=gnulib.git

diff --git a/lib/basename.c b/lib/basename.c
index f1a7266ad..f2babbee2 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 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 1999 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,24 +15,51 @@
    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
 
-/* Return NAME with any leading path stripped off.
-   Don't use strrchr/rindex.  */
+#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.
+   If NAME is all slashes, be sure to return `/'.  */
 
 char *
-basename (name)
-     const char *name;
+base_name (char const *name)
 {
-  const char *base = name;
+  char const *base = name += FILESYSTEM_PREFIX_LEN (name);
+  int all_slashes = 1;
+  char const *p;
 
-  while (*name)
+  for (p = name; *p; p++)
     {
-      if (*name == '/')
-	base = name + 1;
-      ++name;
+      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;
+
   return (char *) base;
 }