diff options
| author | Eric Andersen <andersen@codepoet.org> | 2000-12-12 23:27:48 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2000-12-12 23:27:48 +0000 |
| commit | 483262f633837f98c02261fb035dd25845cbe893 (patch) | |
| tree | 261f7093500d43f6fac2192b1193900949b5f6a1 | |
| parent | 4d4b3b1d88296efab67e789a676feb61b7929412 (diff) | |
| download | busybox-483262f633837f98c02261fb035dd25845cbe893.tar.gz | |
Patch from Matt Kraai to fix 'dirname /'
| -rw-r--r-- | coreutils/dirname.c | 11 | ||||
| -rw-r--r-- | dirname.c | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/coreutils/dirname.c b/coreutils/dirname.c index ceb750cb8..63c557a29 100644 --- a/coreutils/dirname.c +++ b/coreutils/dirname.c @@ -32,13 +32,14 @@ extern int dirname_main(int argc, char **argv) argv++; s=*argv+strlen(*argv)-1; - while (s && *s == '/') { - *s = '\0'; - s=*argv+strlen(*argv)-1; + while (s != *argv && *s == '/') { + *s-- = '\0'; } s = strrchr(*argv, '/'); - if (s && *s) + if (s != NULL && s == *argv) + s[1] = '\0'; + else if (s != NULL) *s = '\0'; - printf("%s\n", (s)? *argv : "."); + puts(s ? *argv : "."); return EXIT_SUCCESS; } @@ -32,13 +32,14 @@ extern int dirname_main(int argc, char **argv) argv++; s=*argv+strlen(*argv)-1; - while (s && *s == '/') { - *s = '\0'; - s=*argv+strlen(*argv)-1; + while (s != *argv && *s == '/') { + *s-- = '\0'; } s = strrchr(*argv, '/'); - if (s && *s) + if (s != NULL && s == *argv) + s[1] = '\0'; + else if (s != NULL) *s = '\0'; - printf("%s\n", (s)? *argv : "."); + puts(s ? *argv : "."); return EXIT_SUCCESS; } |