X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirname.c;h=815192a66f43c7d67b2ffeae93f910141cdd4438;hb=7f5a14a4366b8696b9f58cc78d8b3a02912ffc6d;hp=3487015343dc0c890294470a7dbf4faccde2663f;hpb=bbbfa79c3f7327e1359af33e833c9d078ba52ff1;p=gnulib.git diff --git a/lib/dirname.c b/lib/dirname.c index 348701534..815192a66 100644 --- a/lib/dirname.c +++ b/lib/dirname.c @@ -1,5 +1,5 @@ /* 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 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,121 +19,43 @@ # 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 ISSLASH -# define ISSLASH(C) ((C) == '/') -#endif +#include +#include "xalloc.h" -#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). */ +/* 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_name_r (const char *path, const char **result) +dir_len (char const *path) { - char *slash; - size_t length; /* Length of result, not including NUL. */ + size_t prefix_length = FILESYSTEM_PREFIX_LEN (path); + size_t length; - slash = strrchr (path, '/'); - if (BACKSLASH_IS_PATH_SEPARATOR) - { - char *b = strrchr (path, '\\'); - if (b && slash < b) - slash = b; - } + /* 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; - /* 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) - { - slash = memrchr (path, '/', slash - path); - if (BACKSLASH_IS_PATH_SEPARATOR) - { - char *b = memrchr (path, '\\', slash - path); - if (b && slash < b) - slash = b; - } - } - } - - if (slash == 0) - { - /* File is in the current directory. */ - path = "."; - length = 1; - } - else - { - /* Remove any trailing slashes from the result. */ - if (BACKSLASH_IS_PATH_SEPARATOR) - { - const char *lim = ((path[0] >= 'A' && path[0] <= 'z' - && path[1] == ':') - ? path + 2 : path); - - /* If canonicalized "d:/path", leave alone the root case "d:/". */ - while (slash > lim && ISSLASH (*slash)) - --slash; - } - else - { - while (slash > path && ISSLASH (*slash)) - --slash; - } - - 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 (const char *path) +dir_name (char const *path) { - const char *result; - size_t length = dir_name_r (path, &result); - char *newpath = (char *) malloc (length + 1); - if (newpath == 0) - return 0; - strncpy (newpath, result, length); + size_t length = dir_len (path); + int append_dot = (length == FILESYSTEM_PREFIX_LEN (path)); + char *newpath = xmalloc (length + append_dot + 1); + memcpy (newpath, path, length); + if (append_dot) + newpath[length++] = '.'; newpath[length] = 0; return newpath; } @@ -142,9 +64,14 @@ dir_name (const char *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 @@ -154,29 +81,39 @@ 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]) { char path[MAX_BUFF_LEN]; char expected_result[MAX_BUFF_LEN]; - char *result; + char const *result; sscanf (buff, "%s %s", path, expected_result); result = dir_name (path); if (strcmp (result, expected_result)) printf ("%s: got %s, expected %s\n", path, result, expected_result); } - exit (0); - + return 0; } #endif