update from libit

[gnulib.git] / lib / basename.c

diff --git a/lib/basename.c b/lib/basename.c
index 0fd981f..f4f38f9 100644 (file)
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -1,15 +1,30 @@
-/* basename.c -- return the last element in a path */
+/* basename.c -- return the last element in a path
+   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
+   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
 #ifndef FILESYSTEM_PREFIX_LEN
-# define FILESYSTEM_PREFIX_LEN(f) 0
+# define FILESYSTEM_PREFIX_LEN(Filename) 0
 #endif
 
 #ifndef ISSLASH
-# define ISSLASH(c) ((c) == '/')
+# define ISSLASH(C) ((C) == '/')
 #endif
 
 /* In general, we can't use the builtin `basename' function if available,
@@ -17,8 +32,7 @@
    In some environments the builtin `basename' modifies its argument.  */
 
 char *
-base_name (name)
-     char const *name;
+base_name (char const *name)
 {
   char const *base = name += FILESYSTEM_PREFIX_LEN (name);
 
@@ -28,71 +42,3 @@ base_name (name)
 
   return (char *) base;
 }
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
-
-char *
-base_name_strip_trailing_slashes (name)
-     char const *name;
-{
-  char const *end_p = name += FILESYSTEM_PREFIX_LEN (name);
-  char const *first, *p;
-  char *base;
-  int length;
-
-  /* Make END_P point to the byte after the last non-slash character
-     in NAME if one exists.  */
-  for (p = name; *p; p++)
-    if (!ISSLASH (*p))
-      end_p = p + 1;
-
-  if (end_p == name)
-    {
-      first = end_p;
-    }
-  else
-    {
-      first = end_p - 1;
-      while (first > name && !ISSLASH (*(first - 1)))
-       --first;
-    }
-
-  length = end_p - first;
-  base = (char *) malloc (length + 1);
-  if (base == 0)
-    return 0;
-
-  memcpy (base, first, length);
-  base[length] = '\0';
-
-  return base;
-}
-
-#ifdef TEST
-# include <assert.h>
-# include <stdlib.h>
-
-# define CHECK(a,b) assert (strcmp (base_name_strip_trailing_slashes(a), b) \
-                           == 0)
-
-int
-main ()
-{
-  CHECK ("a", "a");
-  CHECK ("ab", "ab");
-  CHECK ("ab/c", "c");
-  CHECK ("/ab/c", "c");
-  CHECK ("/ab/c/", "c");
-  CHECK ("/ab/c////", "c");
-  CHECK ("/", "");
-  CHECK ("////", "");
-  CHECK ("////a", "a");
-  CHECK ("//a//", "a");
-  CHECK ("/a", "a");
-  exit (0);
-}
-#endif