X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbasename.c;h=f1a7266ad6776859eac2785da41d8ef8e948ad39;hb=fa145a9f05c90f266754ff5b8e9ff2c81fc5ef3d;hp=a47b200e5fc55c016414f708c77d5764693b3eef;hpb=efa6ff0544d9e86b1a03e99373bb0c649a5b4281;p=gnulib.git

diff --git a/lib/basename.c b/lib/basename.c
index a47b200e5..f1a7266ad 100644
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -12,30 +12,27 @@
    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>
+# include <config.h>
 #endif
 
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
-#ifndef strrchr
-#define strrchr rindex
-#endif
-#endif
-
-/* Return NAME with any leading path stripped off.  */
+/* Return NAME with any leading path stripped off.
+   Don't use strrchr/rindex.  */
 
 char *
 basename (name)
      const char *name;
 {
-  char *base;
-
-  base = strrchr (name, '/');
-  return base ? base + 1 : (char *) name;
+  const char *base = name;
+
+  while (*name)
+    {
+      if (*name == '/')
+	base = name + 1;
+      ++name;
+    }
+  return (char *) base;
 }