On Windows, it is possible that the program name should have a slash '/'

character not only a backslash '\' character. We have to check both
a slash and a backslash to get the running program name of bsdcpio or
bsdtar.

diff --git a/cpio/cpio.c b/cpio/cpio.c
index 627e9c019bb49a16f7760e7909afe236a29871aa..081f211e17cae57a21002d1fcd5633abb0bbd30b 100644 (file)
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
@@ -155,9 +155,9 @@ main(int argc, char *argv[])
        else {
 #if defined(_WIN32) && !defined(__CYGWIN__)
                lafe_progname = strrchr(*argv, '\\');
-#else
-               lafe_progname = strrchr(*argv, '/');
+               if (strrchr(*argv, '/') > lafe_progname)
 #endif
+               lafe_progname = strrchr(*argv, '/');
                if (lafe_progname != NULL)
                        lafe_progname++;
                else

diff --git a/tar/bsdtar.c b/tar/bsdtar.c
index 52b5c91badd16b77fbf009219e66614d9a5faf4e..b92ada1ecb3ca3069efebcd0353db3fe229fbdab 100644 (file)
--- a/tar/bsdtar.c
+++ b/tar/bsdtar.c
@@ -179,9 +179,9 @@ main(int argc, char **argv)
        else {
 #if defined(_WIN32) && !defined(__CYGWIN__)
                lafe_progname = strrchr(*argv, '\\');
-#else
-               lafe_progname = strrchr(*argv, '/');
+               if (strrchr(*argv, '/') > lafe_progname)
 #endif
+               lafe_progname = strrchr(*argv, '/');
                if (lafe_progname != NULL)
                        lafe_progname++;
                else