X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbasename.c;h=90ac5012a4650354291ed4b4b7f1582eab8a8689;hb=93dca9da5d488fcf40c38f63d9762a9f54b1a8b0;hp=7e0c1f611c7527f7576d764e6c19338886c03fab;hpb=3751b3e9e1d95b6e6b0d076420ae549fa472b22f;p=gnulib.git

diff --git a/lib/basename.c b/lib/basename.c
index 7e0c1f611..90ac5012a 100644
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -1,10 +1,12 @@
-/* basename.c -- return the last element in a path
-   Copyright (C) 1990 Free Software Foundation, Inc.
+/* basename.c -- return the last element in a file name
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2011 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.
+   the Free Software Foundation; either version 3 of the License, 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
@@ -12,27 +14,45 @@
    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, see <http://www.gnu.org/licenses/>.  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
-/* Return NAME with any leading path stripped off.
-   Don't use strrchr/rindex.  */
+#include "dirname.h"
+
+#include <string.h>
+#include "xalloc.h"
+#include "xstrndup.h"
 
 char *
-basename (name)
-     const char *name;
+base_name (char const *name)
 {
-  const char *base = name;
+  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));
 
-  while (*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))
     {
-      if (*name == '/')
-	base = name + 1;
-      ++name;
+      char *p = xmalloc (length + 3);
+      p[0] = '.';
+      p[1] = '/';
+      memcpy (p + 2, base, length);
+      p[length + 2] = '\0';
+      return p;
     }
-  return (char *) base;
+
+  /* Finally, copy the basename.  */
+  return xstrndup (base, length);
 }