X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fdirname.c;h=411ded31b88048b6359aef91cab4a7e8e76da6fd;hb=4f6a7ef5f2097b501ddeac9db94d02306e4546d0;hp=5a92ce557ff6d6f08fc9e527ddbea90dea46752f;hpb=b06578954912a7dcfbe0c6f6efca230b04ad0e7f;p=gnulib.git
diff --git a/lib/dirname.c b/lib/dirname.c
index 5a92ce557..411ded31b 100644
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -1,10 +1,12 @@
-/* dirname.c -- return all but the last element in a path
- Copyright (C) 1990 Free Software Foundation, Inc.
+/* dirname.c -- return all but the last element in a file name
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1990, 1998, 2000-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,55 +14,25 @@
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 . */
+
+#include
+
+#include "dirname.h"
-#ifdef STDC_HEADERS
#include
-#else
-char *malloc ();
-#endif
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
#include
-#ifndef rindex
-#define rindex strrchr
-#endif
-#else
-#include
-#endif
+#include "xalloc.h"
-/* Return the leading directories part of PATH,
- allocated with malloc. If out of memory, return 0.
- Assumes that trailing slashes have already been
- removed. */
+/* Just like mdir_name (dirname-lgpl.c), except, rather than
+ returning NULL upon malloc failure, here, we report the
+ "memory exhausted" condition and exit. */
char *
-dirname (path)
- char *path;
+dir_name (char const *file)
{
- char *newpath;
- char *slash;
- int length; /* Length of result, not including NUL. */
-
- slash = rindex (path, '/');
- if (slash == 0)
- {
- /* File is in the current directory. */
- path = ".";
- length = 1;
- }
- else
- {
- /* Remove any trailing slashes from the result. */
- while (slash > path && *slash == '/')
- --slash;
-
- length = slash - path + 1;
- }
- newpath = malloc (length + 1);
- if (newpath == 0)
- return 0;
- strncpy (newpath, path, length);
- newpath[length] = 0;
- return newpath;
+ char *result = mdir_name (file);
+ if (!result)
+ xalloc_die ();
+ return result;
}