X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbasename.c;h=f4f38f9a626bcbae6dc7f80d3b70e0633121face;hb=e29fbaee8afd6fd9b6c0291562740807ca11a0c6;hp=56a6c04dd05f561b3275786397f686b35acc4891;hpb=3b8ba971c0e2dab242e8bbf8ede60a2fdee05f71;p=gnulib.git

diff --git a/lib/basename.c b/lib/basename.c
index 56a6c04dd..f4f38f9a6 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 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
@@ -12,30 +12,33 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
-#ifndef strrchr
-#define strrchr rindex
+#ifndef FILESYSTEM_PREFIX_LEN
+# define FILESYSTEM_PREFIX_LEN(Filename) 0
 #endif
+
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == '/')
 #endif
 
-/* Return NAME with any leading path stripped off.  */
+/* 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.  */
 
 char *
-basename (name)
-     char *name;
+base_name (char const *name)
 {
-  char *base;
+  char const *base = name += FILESYSTEM_PREFIX_LEN (name);
+
+  for (; *name; name++)
+    if (ISSLASH (*name))
+      base = name + 1;
 
-  base = strrchr (name, '/');
-  return base ? base + 1 : name;
+  return (char *) base;
 }