diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/dirname.c | 38 | ||||
| -rw-r--r-- | misc/tst-dirname.c | 9 |
2 files changed, 39 insertions, 8 deletions
diff --git a/misc/dirname.c b/misc/dirname.c index 8be25e51b8..b837404975 100644 --- a/misc/dirname.c +++ b/misc/dirname.c @@ -1,5 +1,5 @@ /* dirname - return directory part of PATH. - Copyright (C) 1996, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -32,16 +32,40 @@ dirname (char *path) last_slash = path != NULL ? strrchr (path, '/') : NULL; if (last_slash != NULL && last_slash != path && last_slash[1] == '\0') - /* The '/' is the last character, we have to look further. */ - last_slash = __memrchr (path, '/', last_slash - path); + { + /* Determine whether all remaining characters are slashes. */ + char *runp; + + for (runp = last_slash; runp != path; --runp) + if (runp[-1] != '/') + break; + + /* The '/' is the last character, we have to look further. */ + if (runp != path) + last_slash = __memrchr (path, '/', runp - path); + } if (last_slash != NULL) { + /* Determine whether all remaining characters are slashes. */ + char *runp; + + for (runp = last_slash; runp != path; --runp) + if (runp[-1] != '/') + break; + /* Terminate the path. */ - if (last_slash == path) - /* The last slash is the first character in the string. We have to - return "/". */ - ++last_slash; + if (runp == path) + { + /* The last slash is the first character in the string. We have to + return "/". As a special case we have to return "//" if there + are exactly two slashes at the beginning of the string. See + XBD 4.10 Path Name Resolution for more information. */ + if (last_slash == path + 1) + ++last_slash; + else + last_slash = path + 1; + } last_slash[0] = '\0'; } diff --git a/misc/tst-dirname.c b/misc/tst-dirname.c index e688bd3a42..aa0d782392 100644 --- a/misc/tst-dirname.c +++ b/misc/tst-dirname.c @@ -1,5 +1,5 @@ /* Test program for dirname function a la XPG. - Copyright (C) 1996, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -54,6 +54,13 @@ main (void) /* Some more tests. */ result |= test ("/usr/lib/", "/usr"); result |= test ("/usr", "/"); + result |= test ("a//", "."); + result |= test ("a////", "."); + result |= test ("////usr", "/"); + result |= test ("////usr//", "/"); + result |= test ("//usr", "//"); + result |= test ("//usr//", "//"); + result |= test ("//", "//"); return result != 0; } |