SUSv2 specifies that if the extension is identical to the basename, it

should not be removed.  Patch backport from Matt Kraai

diff --git a/busybox/basename.c b/busybox/basename.c
index b83f387c29c70725fb69b22efee4e9a38d6133b7..c15afd53328aee8c9131a169efd78aa19a320ba9 100644 (file)
--- a/busybox/basename.c
+++ b/busybox/basename.c
@@ -44,7 +44,7 @@ extern int basename_main(int argc, char **argv)
                argv++;
                n = strlen(*argv);
                m = strlen(s);
-               if (m>=n && strncmp(s+m-n, *argv, n)==0)
+               if (m>n && strncmp(s+m-n, *argv, n)==0)
                        s[m-n] = '\0';
        }
        puts(s);

diff --git a/busybox/coreutils/basename.c b/busybox/coreutils/basename.c
index b83f387c29c70725fb69b22efee4e9a38d6133b7..c15afd53328aee8c9131a169efd78aa19a320ba9 100644 (file)
--- a/busybox/coreutils/basename.c
+++ b/busybox/coreutils/basename.c
@@ -44,7 +44,7 @@ extern int basename_main(int argc, char **argv)
                argv++;
                n = strlen(*argv);
                m = strlen(s);
-               if (m>=n && strncmp(s+m-n, *argv, n)==0)
+               if (m>n && strncmp(s+m-n, *argv, n)==0)
                        s[m-n] = '\0';
        }
        puts(s);