X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbasename.c;h=5ff29893305b01f8d59ab2a63c14440c6309a3cc;hb=fdae5d9f72a0596fc7b5933509a9cd03cbebf6eb;hp=0fd981f3032e09dbd35c276e6ef6224dcb5d40ce;hpb=c34b054fecc1f90dad141e3e988f357e22f1e473;p=gnulib.git

diff --git a/lib/basename.c b/lib/basename.c
index 0fd981f30..5ff298933 100644
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -1,98 +1,79 @@
-/* basename.c -- return the last element in a path */
+/* basename.c -- return the last element in a path
+
+   Copyright (C) 1990, 1998, 1999, 2000, 2001, 2003 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
-#endif
-
-#ifndef ISSLASH
-# define ISSLASH(c) ((c) == '/')
-#endif
+#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.
-   In some environments the builtin `basename' modifies its argument.  */
+   In some environments the builtin `basename' modifies its argument.
+
+   Return the address of the last file name component of NAME.  If
+   NAME has no file name components because it is all slashes, return
+   NAME if it is empty, the address of its last slash otherwise.  */
 
 char *
-base_name (name)
-     char const *name;
+base_name (char const *name)
 {
-  char const *base = name += FILESYSTEM_PREFIX_LEN (name);
+  char const *base = name + FILESYSTEM_PREFIX_LEN (name);
+  char const *p;
 
-  for (; *name; name++)
-    if (ISSLASH (*name))
-      base = name + 1;
+  for (p = base; *p; p++)
+    {
+      if (ISSLASH (*p))
+	{
+	  /* Treat multiple adjacent slashes like a single slash.  */
+	  do p++;
+	  while (ISSLASH (*p));
+
+	  /* If the file name ends in slash, use the trailing slash as
+	     the basename if no non-slashes have been found.  */
+	  if (! *p)
+	    {
+	      if (ISSLASH (*base))
+		base = p - 1;
+	      break;
+	    }
+
+	  /* *P is a non-slash preceded by a slash.  */
+	  base = p;
+	}
+    }
 
   return (char *) base;
 }
 
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
+/* Return the length of of the basename NAME.  Typically NAME is the
+   value returned by base_name.  Act like strlen (NAME), except omit
+   redundant trailing slashes.  */
 
-char *
-base_name_strip_trailing_slashes (name)
-     char const *name;
+size_t
+base_len (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;
+  size_t len;
 
-  memcpy (base, first, length);
-  base[length] = '\0';
+  for (len = strlen (name);  1 < len && ISSLASH (name[len - 1]);  len--)
+    continue;
 
-  return base;
+  return len;
 }
-
-#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