-/* dirname.c -- return all but the last element in a path
- Copyright (C) 1990, 1998, 2000 Free Software Foundation, Inc.
+/* dirname.c -- return all but the last element in a file name
+
+ Copyright (C) 1990, 1998, 2000, 2001, 2003, 2004, 2005 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
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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
-#if defined STDC_HEADERS || defined HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef strrchr
-# define strrchr rindex
-# endif
-#endif
-#include <assert.h>
-
-#ifndef HAVE_DECL_MEMRCHR
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_MEMRCHR
-void *memrchr ();
-#endif
-
#include "dirname.h"
-#ifndef FILESYSTEM_PREFIX_LEN
-# define FILESYSTEM_PREFIX_LEN(Filename) 0
-#endif
+#include <string.h>
+#include "xalloc.h"
-#ifndef ISSLASH
-# define ISSLASH(C) ((C) == '/')
-#endif
-
-#define BACKSLASH_IS_PATH_SEPARATOR ISSLASH ('\\')
-
-/* Return the length of `dirname (PATH)' and set *RESULT to point
- to PATH or to `"."', as appropriate. Works properly even if
- there are trailing slashes (by effectively ignoring them).
- WARNING: This function doesn't work for cwd-relative names like
- `a:foo' that are specified with a drive-letter prefix. That case
- is handled in the caller. */
-static size_t
-dir_name_r (char const *path, char const **result)
+/* Return the length of `dirname (FILE)', or zero if FILE is
+ in the working directory. Works properly even if
+ there are trailing slashes (by effectively ignoring them). */
+size_t
+dir_len (char const *file)
{
- char const *slash;
- size_t length; /* Length of result, not including NUL. */
-
- slash = strrchr (path, '/');
- if (BACKSLASH_IS_PATH_SEPARATOR)
- {
- char const *b = strrchr (path, '\\');
- if (b && slash < b)
- slash = b;
- }
-
- /* If the last byte of PATH is a slash, decrement SLASH until it's
- pointing at the leftmost in a sequence of trailing slashes. */
- if (slash && slash[1] == 0)
- {
- while (path < slash && ISSLASH (slash[-1]))
- {
- --slash;
- }
-
- if (path < slash)
- {
- size_t len = slash - path;
- slash = memrchr (path, '/', len);
- if (BACKSLASH_IS_PATH_SEPARATOR)
- {
- char const *b = memrchr (path, '\\', len);
- if (b && slash < b)
- slash = b;
- }
- }
- }
-
- if (slash == 0)
- {
- /* File is in the current directory. */
-
- length = FILESYSTEM_PREFIX_LEN (path);
-
- if (length == 0)
- {
- path = ".";
- length = 1;
- }
- }
- else
- {
- /* Remove any trailing slashes from the result. If we have a
- canonicalized "d:/path", leave alone the root case "d:/". */
- char const *lim = path + FILESYSTEM_PREFIX_LEN (path);
+ size_t prefix_length = FILE_SYSTEM_PREFIX_LEN (file);
+ size_t length;
- while (slash > lim && ISSLASH (*slash))
- --slash;
+ /* Strip the basename and any redundant slashes before it. */
+ for (length = base_name (file) - file; prefix_length < length; length--)
+ if (! ISSLASH (file[length - 1]))
+ return length;
- length = slash - path + 1;
- }
-
- *result = path;
- return length;
+ /* But don't strip the only slash from "/". */
+ return prefix_length + ISSLASH (file[prefix_length]);
}
-/* Return the leading directories part of PATH,
- allocated with malloc. If out of memory, return 0.
+/* Return the leading directories part of FILE,
+ allocated with xmalloc.
Works properly even if there are trailing slashes
(by effectively ignoring them). */
char *
-dir_name (char const *path)
+dir_name (char const *file)
{
- char const *result;
- size_t length = dir_name_r (path, &result);
- int append_dot = (length && length == FILESYSTEM_PREFIX_LEN (newpath));
- char *newpath = (char *) malloc (length + append_dot + 1);
- if (newpath == 0)
- return 0;
- strncpy (newpath, result, length);
- /* If PATH is "d:foo", return "d:.", the CWD on drive d: */
+ size_t length = dir_len (file);
+ bool append_dot = (length == FILE_SYSTEM_PREFIX_LEN (file));
+ char *dir = xmalloc (length + append_dot + 1);
+ memcpy (dir, file, length);
if (append_dot)
- newpath[length++] = '.';
- newpath[length] = 0;
- return newpath;
+ dir[length++] = '.';
+ dir[length] = 0;
+ return dir;
}
#ifdef TEST_DIRNAME
/*
Run the test like this (expect no output):
- gcc -DHAVE_CONFIG_H -DTEST_DIRNAME -I.. -O -Wall memrchr.c dirname.c
+ gcc -DHAVE_CONFIG_H -DTEST_DIRNAME -I.. -O -Wall \
+ basename.c dirname.c xmalloc.c error.c
sed -n '/^BEGIN-DATA$/,/^END-DATA$/p' dirname.c|grep -v DATA|./a.out
+If it's been built on a DOS or Windows platforms, run another test like
+this (again, expect no output):
+ sed -n '/^BEGIN-DOS-DATA$/,/^END-DOS-DATA$/p' dirname.c|grep -v DATA|./a.out
+
BEGIN-DATA
foo//// .
bar/foo//// bar
a .
END-DATA
+BEGIN-DOS-DATA
+c:///// c:/
+c:/ c:/
+c:/. c:/
+c:foo c:.
+c:foo/bar c:foo
+END-DOS-DATA
+
*/
# define MAX_BUFF_LEN 1024
# include <stdio.h>
-# include <stdlib.h>
+
+char *program_name;
int
-main ()
+main (int argc, char *argv[])
{
char buff[MAX_BUFF_LEN + 1];
+ program_name = argv[0];
+
buff[MAX_BUFF_LEN] = 0;
while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
{
- char path[MAX_BUFF_LEN];
+ char file[MAX_BUFF_LEN];
char expected_result[MAX_BUFF_LEN];
char const *result;
- sscanf (buff, "%s %s", path, expected_result);
- result = dir_name (path);
+ sscanf (buff, "%s %s", file, expected_result);
+ result = dir_name (file);
if (strcmp (result, expected_result))
- printf ("%s: got %s, expected %s\n", path, result, expected_result);
+ printf ("%s: got %s, expected %s\n", file, result, expected_result);
}
- exit (0);
-
+ return 0;
}
#endif
projects / gnulib.git / blobdiff