X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbasename.c;h=4087e3dc0fdad8c6e5c0edcbc60c8945677296f7;hb=refs%2Ftags%2FTEXTUTILS-1_22c;hp=a47b200e5fc55c016414f708c77d5764693b3eef;hpb=efa6ff0544d9e86b1a03e99373bb0c649a5b4281;p=gnulib.git

diff --git a/lib/basename.c b/lib/basename.c
index a47b200e5..4087e3dc0 100644
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -1,41 +1,30 @@
-/* basename.c -- return the last element in a path
-   Copyright (C) 1990 Free Software Foundation, Inc.
+/* basename.c -- return the last element in a path */
 
-   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   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.  */
-
-#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(f) 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)
-     const char *name;
+base_name (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 : (char *) name;
+  return (char *) base;
 }