X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbasename.c;h=5cc97cd4a4873586805b87acae8a244e8377f611;hb=fb84631f1ec8e82d252cbad0b5b7f83a98e74ba9;hp=ff55b58002d917b309055159e52fc122721f8511;hpb=aa4998c802964cc7ea2a09e8aacfbadc5a78b843;p=gnulib.git

diff --git a/lib/basename.c b/lib/basename.c
index ff55b5800..5cc97cd4a 100644
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -1,5 +1,7 @@
-/* basename.c -- return the last element in a path
-   Copyright (C) 1990, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+/* basename.c -- return the last element in a file name
+
+   Copyright (C) 1990, 1998, 1999, 2000, 2001, 2003, 2004, 2005 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
@@ -13,16 +15,14 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-#if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-#endif
-#include <dirname.h>
+#include "dirname.h"
+#include <string.h>
 
 /* In general, we can't use the builtin `basename' function if available,
    since it has different meanings in different environments.
@@ -35,7 +35,7 @@
 char *
 base_name (char const *name)
 {
-  char const *base = name + FILESYSTEM_PREFIX_LEN (name);
+  char const *base = name + FILE_SYSTEM_PREFIX_LEN (name);
   char const *p;
 
   for (p = base; *p; p++)