diff options
author | Jim Meyering <jim@meyering.net> | 2000-08-01 07:10:05 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2000-08-01 07:10:05 +0000 |
commit | 452732993e882857c9f767adea1b9d74382250a0 (patch) | |
tree | ea32518d967c177047d0e873ae51380e3fe7b1a5 /lib/dirname.c | |
parent | c47aaffe5d98ae18760467a6c248e4eddaf5644d (diff) | |
download | gnulib-452732993e882857c9f767adea1b9d74382250a0.tar.gz |
(ISSLASH): Define.
(BACKSLASH_IS_PATH_SEPARATOR): Define.
(dir_name) [BACKSLASH_IS_PATH_SEPARATOR]: Handle the case in which
both `\' and `/' may be use as path separators.
Based on a patch from Prashant TR.
Diffstat (limited to 'lib/dirname.c')
-rw-r--r-- | lib/dirname.c | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/lib/dirname.c b/lib/dirname.c index d332b5e469..22efc10607 100644 --- a/lib/dirname.c +++ b/lib/dirname.c @@ -36,6 +36,12 @@ char *malloc (); #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 @@ -49,6 +55,12 @@ dir_name (const char *path) int length; /* Length of result, not including NUL. */ 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. */ @@ -65,20 +77,25 @@ dir_name (const char *path) else { /* Remove any trailing slashes from the result. */ -#ifdef __MSDOS__ - const char *lim = ((path[0] >= 'A' && path[0] <= 'z' && path[1] == ':') - ? path + 2 : path); + 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 && *slash == '/') - --slash; -#else - while (slash > path && *slash == '/') - --slash; -#endif + /* 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 = (char *) malloc (length + 1); if (newpath == 0) return 0; |