Patch from Matt Kraai to fix 'dirname /'

diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index ceb750cb8a81093af6c3442b921281919a7f89a6..63c557a299ba8cc3c695ac891cc15f497e896ee1 100644 (file)
--- 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;
 }

diff --git a/dirname.c b/dirname.c
index ceb750cb8a81093af6c3442b921281919a7f89a6..63c557a299ba8cc3c695ac891cc15f497e896ee1 100644 (file)
--- a/dirname.c
+++ b/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;
 }