X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbasename.c;h=67d9420a6d9d1a5e1e18f589cc9dba152b66ca4c;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=e648b1a7e251bde1faabae3061fcd70f8ae2d021;hpb=cd988caa7e078e616f1f411197b4ea9b5208c00e;p=gnulib.git

diff --git a/lib/basename.c b/lib/basename.c
index e648b1a7e..67d9420a6 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, 1998, 1999 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-2014 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,44 +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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef FILESYSTEM_PREFIX_LEN
-# define FILESYSTEM_PREFIX_LEN(Filename) 0
-#endif
+#include <config.h>
 
-#ifndef ISSLASH
-# define ISSLASH(C) ((C) == '/')
-#endif
+#include "dirname.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.
-   If NAME is all slashes, be sure to return `/'.  */
+#include <string.h>
+#include "xalloc.h"
+#include "xstrndup.h"
 
 char *
 base_name (char const *name)
 {
-  char const *base = name += FILESYSTEM_PREFIX_LEN (name);
-  int all_slashes = 1;
-  char const *p;
-
-  for (p = name; *p; p++)
+  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))
     {
-      if (ISSLASH (*p))
-	base = p + 1;
-      else
-	all_slashes = 0;
+      char *p = xmalloc (length + 3);
+      p[0] = '.';
+      p[1] = '/';
+      memcpy (p + 2, base, length);
+      p[length + 2] = '\0';
+      return p;
     }
 
-  /* If NAME is all slashes, arrange to return `/'.  */
-  if (*base == '\0' && ISSLASH (*name) && all_slashes)
-    --base;
-
-  return (char *) base;
+  /* Finally, copy the basename.  */
+  return xstrndup (base, length);
 }