X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirname.c;h=22efc10607541b5912fac9be2bc990221747aec4;hb=115741fa52092c59e33d75428b776513caa88f87;hp=929061480594ee42f85b0dbd1d10ec7961778609;hpb=300424a2d37b17d304be2783ed40f2efa4d950c0;p=gnulib.git diff --git a/lib/dirname.c b/lib/dirname.c index 929061480..22efc1060 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 Free Software Foundation, Inc. + Copyright (C) 1990, 1998, 2000 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 @@ -12,41 +12,62 @@ 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, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H -#include +#if HAVE_CONFIG_H +# include #endif #ifdef STDC_HEADERS -#include +# include #else char *malloc (); #endif -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) -#include -#ifndef rindex -#define rindex strrchr -#endif +#if defined STDC_HEADERS || defined HAVE_STRING_H +# include #else -#include +# include +# ifndef strrchr +# define strrchr rindex +# endif +#endif +#include + +#include "dirname.h" + +#ifndef ISSLASH +# define ISSLASH(C) ((C) == '/') #endif +#define BACKSLASH_IS_PATH_SEPARATOR ISSLASH ('\\') + /* Return the leading directories part of PATH, allocated with malloc. If out of memory, return 0. Assumes that trailing slashes have already been removed. */ char * -dirname (path) - char *path; +dir_name (const char *path) { char *newpath; char *slash; int length; /* Length of result, not including NUL. */ - slash = rindex (path, '/'); + slash = strrchr (path, '/'); + if (BACKSLASH_IS_PATH_SEPARATOR) + { + char *b = strrchr (path, '\\'); + if (b && slash < b) + slash = b; + } + + /* Make sure there are no trailing slashes. */ + assert (slash == NULL /* There are no slashes in PATH. */ + || slash[1] != 0 /* There is a non-NUL byte after the last slash. */ + || path == slash /* PATH is just `/'. */ + ); + if (slash == 0) { /* File is in the current directory. */ @@ -56,12 +77,26 @@ dirname (path) else { /* Remove any trailing slashes from the result. */ - while (slash > path && *slash == '/') - --slash; + 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; } - newpath = malloc (length + 1); + + newpath = (char *) malloc (length + 1); if (newpath == 0) return 0; strncpy (newpath, path, length);