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

diff --git a/lib/basename.c b/lib/basename.c
index 0fd981f30..d73fd41aa 100644
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -1,98 +1,58 @@
-/* basename.c -- return the last element in a path */
+/* basename.c -- return the last element in a file name
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2013 Free Software
+   Foundation, Inc.
 
-#ifndef FILESYSTEM_PREFIX_LEN
-# define FILESYSTEM_PREFIX_LEN(f) 0
-#endif
+   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 3 of the License, or
+   (at your option) any later version.
 
-#ifndef ISSLASH
-# define ISSLASH(c) ((c) == '/')
-#endif
+   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.
 
-/* 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.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-char *
-base_name (name)
-     char const *name;
-{
-  char const *base = name += FILESYSTEM_PREFIX_LEN (name);
+#include <config.h>
 
-  for (; *name; name++)
-    if (ISSLASH (*name))
-      base = name + 1;
-
-  return (char *) base;
-}
+#include "dirname.h"
 
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
+#include <string.h>
+#include "xalloc.h"
+#include "xstrndup.h"
 
 char *
-base_name_strip_trailing_slashes (name)
-     char const *name;
+base_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
+  char const *base = last_component (name);
+  size_t length;
+
+  /* If there is no last component, then name is a file system root or the
+     empty string.  */
+  if (! *base)
+    return xstrndup (name, base_len (name));
+
+  /* Collapse a sequence of trailing slashes into one.  */
+  length = base_len (base);
+  if (ISSLASH (base[length]))
+    length++;
+
+  /* On systems with drive letters, "a/b:c" must return "./b:c" rather
+     than "b:c" to avoid confusion with a drive letter.  On systems
+     with pure POSIX semantics, this is not an issue.  */
+  if (FILE_SYSTEM_PREFIX_LEN (base))
     {
-      first = end_p - 1;
-      while (first > name && !ISSLASH (*(first - 1)))
-	--first;
+      char *p = xmalloc (length + 3);
+      p[0] = '.';
+      p[1] = '/';
+      memcpy (p + 2, base, length);
+      p[length + 2] = '\0';
+      return p;
     }
 
-  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);
+  /* Finally, copy the basename.  */
+  return xstrndup (base, length);
 }
-#endif