X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirname.c;h=7671a0d62e43cf9415df0f7c1d1d9ba83067061c;hb=a10e3d19c8c812a60794c247ff6940a04ed51bea;hp=94f8c8936ed6744b235b03aa97d4772d529f0b68;hpb=38b8fad546a66fb6e851b0bf8ab22bc22b9be35a;p=gnulib.git diff --git a/lib/dirname.c b/lib/dirname.c index 94f8c8936..7671a0d62 100644 --- a/lib/dirname.c +++ b/lib/dirname.c @@ -1,5 +1,7 @@ /* dirname.c -- return all but the last element in a path - Copyright (C) 1990, 1998, 2000 Free Software Foundation, Inc. + + Copyright (C) 1990, 1998, 2000, 2001, 2003, 2004 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 @@ -19,126 +21,41 @@ # include #endif -#ifdef STDC_HEADERS -# include -#else -char *malloc (); -#endif -#if defined STDC_HEADERS || defined HAVE_STRING_H -# include -#else -# include -# ifndef strrchr -# define strrchr rindex -# endif -#endif -#include - -#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 +#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 (PATH)', or zero if PATH is + in the working directory. Works properly even if + there are trailing slashes (by effectively ignoring them). */ +size_t +dir_len (char const *path) { - 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 (path); + size_t length; - while (lim < slash && ISSLASH (*slash)) - --slash; + /* Strip the basename and any redundant slashes before it. */ + for (length = base_name (path) - path; prefix_length < length; length--) + if (! ISSLASH (path[length - 1])) + return length; - length = slash - path + 1; - } - - *result = path; - return length; + /* But don't strip the only slash from "/". */ + return prefix_length + ISSLASH (path[prefix_length]); } /* Return the leading directories part of PATH, - allocated with malloc. If out of memory, return 0. + allocated with xmalloc. Works properly even if there are trailing slashes (by effectively ignoring them). */ char * dir_name (char const *path) { - 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 (path); + bool append_dot = (length == FILE_SYSTEM_PREFIX_LEN (path)); + char *newpath = xmalloc (length + append_dot + 1); + memcpy (newpath, path, length); if (append_dot) newpath[length++] = '.'; newpath[length] = 0; @@ -149,9 +66,14 @@ dir_name (char const *path) /* 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 @@ -161,17 +83,28 @@ foo/ . 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 -# include + +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]) { @@ -183,7 +116,6 @@ main () if (strcmp (result, expected_result)) printf ("%s: got %s, expected %s\n", path, result, expected_result); } - exit (0); - + return 0; } #endif