X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirname.c;h=c27e5b5d8b3bf42dc5dc050ee3f029f421949235;hb=16908fc83e83a08e4f0e8c004141ff01ae12ca86;hp=2225800ab0dfbdc18fbdeecc612d86854cd81d50;hpb=05f0f7f4ca3fe72a316ad5f590c54f5abf4d978b;p=gnulib.git diff --git a/lib/dirname.c b/lib/dirname.c index 2225800ab..c27e5b5d8 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, 1998, 2000 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, 2004, 2005, 2006 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,171 +14,71 @@ 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. */ - -#if HAVE_CONFIG_H -# 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 + along with this program. If not, see . */ + +#include #include "dirname.h" -#ifndef ISSLASH -# define ISSLASH(C) ((C) == '/') -#endif +#include +#include "xalloc.h" -#define BACKSLASH_IS_PATH_SEPARATOR ISSLASH ('\\') +/* Return the length of the prefix of FILE that will be used by + dir_name. If FILE is in the working directory, this returns zero + even though `dir_name (FILE)' will return ".". Works properly even + if there are trailing slashes (by effectively ignoring them). */ -/* 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). */ size_t -dir_name_r (char const *path, char const **result) +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) - { - slash = memrchr (path, '/', slash - path); - if (BACKSLASH_IS_PATH_SEPARATOR) - { - char const *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) - { - char const *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; + size_t prefix_length = FILE_SYSTEM_PREFIX_LEN (file); + size_t length; + + /* Advance prefix_length beyond important leading slashes. */ + prefix_length += (prefix_length != 0 + ? (FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE + && ISSLASH (file[prefix_length])) + : (ISSLASH (file[0]) + ? ((DOUBLE_SLASH_IS_DISTINCT_ROOT + && ISSLASH (file[1]) && ! ISSLASH (file[2]) + ? 2 : 1)) + : 0)); + + /* Strip the basename and any redundant slashes before it. */ + for (length = last_component (file) - file; + prefix_length < length; length--) + if (! ISSLASH (file[length - 1])) + break; return length; } -/* Return the leading directories part of PATH, - allocated with malloc. If out of memory, return 0. - 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); - char *newpath = (char *) malloc (length + 1); - if (newpath == 0) - return 0; - strncpy (newpath, result, length); - newpath[length] = 0; - return newpath; -} - -#ifdef TEST_DIRNAME -/* - -Run the test like this (expect no output): - gcc -DHAVE_CONFIG_H -DTEST_DIRNAME -I.. -O -Wall memrchr.c dirname.c - sed -n '/^BEGIN-DATA$/,/^END-DATA$/p' dirname.c|grep -v DATA|./a.out -BEGIN-DATA -foo//// . -bar/foo//// bar -foo/ . -/ / -. . -a . -END-DATA +/* In general, we can't use the builtin `dirname' function if available, + since it has different meanings in different environments. + In some environments the builtin `dirname' modifies its argument. -*/ + Return the leading directories part of FILE, allocated with xmalloc. + Works properly even if there are trailing slashes (by effectively + ignoring them). Unlike POSIX dirname(), FILE cannot be NULL. -# define MAX_BUFF_LEN 1024 -# include -# include + If lstat (FILE) would succeed, then { chdir (dir_name (FILE)); + lstat (base_name (FILE)); } will access the same file. Likewise, + if the sequence { chdir (dir_name (FILE)); + rename (base_name (FILE), "foo"); } succeeds, you have renamed FILE + to "foo" in the same directory FILE was in. */ -int -main () +char * +dir_name (char const *file) { - char buff[MAX_BUFF_LEN + 1]; - - 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 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); - + size_t length = dir_len (file); + bool append_dot = (length == 0 + || (FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE + && length == FILE_SYSTEM_PREFIX_LEN (file) + && file[2] != '\0' && ! ISSLASH (file[2]))); + char *dir = xmalloc (length + append_dot + 1); + memcpy (dir, file, length); + if (append_dot) + dir[length++] = '.'; + dir[length] = '\0'; + return dir; } -#endif