X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fbasename.c;h=24da93ac47293e9cee5f714862f57ab0bca9c58f;hb=b187ff0528e2a081392a834e684d1d0c161708a7;hp=f1a7266ad6776859eac2785da41d8ef8e948ad39;hpb=783c1624bd8b027a65b3fba57d3213ccb1a6ddbd;p=gnulib.git
diff --git a/lib/basename.c b/lib/basename.c
index f1a7266ad..24da93ac4 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-2010 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
+
+#include
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include "dirname.h"
-/* Return NAME with any leading path stripped off.
- Don't use strrchr/rindex. */
+#include
+#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);
}