Bring along a trailing null when guessing the path to the program under test

diff --git a/cat/test/main.c b/cat/test/main.c
index 54a7d01eb8c0099919e5a24a71c611dac4905aed..8c414da1431f5640479af65c4347cebd1d47e586 100644 (file)
--- a/cat/test/main.c
+++ b/cat/test/main.c
@@ -2659,7 +2659,7 @@ main(int argc, char **argv)
                        exit(1);
                }
                memmove(testprogdir + strlen(pwd) + 1, testprogdir,
-                   strlen(testprogdir));
+                   strlen(testprogdir) + 1);
                memcpy(testprogdir, pwd, strlen(pwd));
                testprogdir[strlen(pwd)] = '/';
        }

diff --git a/cpio/test/main.c b/cpio/test/main.c
index b10ab1e45ee49f3cd6a1ca0a7719903e317f77b2..5801127443564862e8a40754075043fc97275909 100644 (file)
--- a/cpio/test/main.c
+++ b/cpio/test/main.c
@@ -2660,7 +2660,7 @@ main(int argc, char **argv)
                        exit(1);
                }
                memmove(testprogdir + strlen(pwd) + 1, testprogdir,
-                   strlen(testprogdir));
+                   strlen(testprogdir) + 1);
                memcpy(testprogdir, pwd, strlen(pwd));
                testprogdir[strlen(pwd)] = '/';
        }

diff --git a/libarchive/test/main.c b/libarchive/test/main.c
index 3cd8766b498ad2f3a3816e2b508aabf7a58f124b..b39c2bf78d70508e07c4ac39d479e793d12ec535 100644 (file)
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -2658,7 +2658,7 @@ main(int argc, char **argv)
                        exit(1);
                }
                memmove(testprogdir + strlen(pwd) + 1, testprogdir,
-                   strlen(testprogdir));
+                   strlen(testprogdir) + 1);
                memcpy(testprogdir, pwd, strlen(pwd));
                testprogdir[strlen(pwd)] = '/';
        }

diff --git a/tar/test/main.c b/tar/test/main.c
index d60a9dca5c1e1557102172c9d05db8579859081b..33a6364b2cf1d66921b04530e2fcde30e32e0e94 100644 (file)
--- a/tar/test/main.c
+++ b/tar/test/main.c
@@ -2660,7 +2660,7 @@ main(int argc, char **argv)
                        exit(1);
                }
                memmove(testprogdir + strlen(pwd) + 1, testprogdir,
-                   strlen(testprogdir));
+                   strlen(testprogdir) + 1);
                memcpy(testprogdir, pwd, strlen(pwd));
                testprogdir[strlen(pwd)] = '/';
        }