Merge branch 'busybox' into merge

3 files changed, 6 insertions, 10 deletions

diff --git a/archival/libarchive/header_list.c b/archival/libarchive/header_list.c
index 0621aa406..9490b3635 100644
--- a/archival/libarchive/header_list.c
+++ b/archival/libarchive/header_list.c
@@ -8,5 +8,5 @@
 void FAST_FUNC header_list(const file_header_t *file_header)
 {
 //TODO: cpio -vp DIR should output "DIR/NAME", not just "NAME" */
-        puts(file_header->name);
+        puts(printable_string(file_header->name));
 }
diff --git a/archival/libarchive/header_verbose_list.c b/archival/libarchive/header_verbose_list.c
index a575a08a0..e7a09430d 100644
--- a/archival/libarchive/header_verbose_list.c
+++ b/archival/libarchive/header_verbose_list.c
@@ -57,13 +57,13 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
                 ptm->tm_hour,
                 ptm->tm_min,
                 ptm->tm_sec,
-                file_header->name);
+                printable_string(file_header->name));
 
 #endif /* FEATURE_TAR_UNAME_GNAME */
 
         /* NB: GNU tar shows "->" for symlinks and "link to" for hardlinks */
         if (file_header->link_target) {
-                printf(" -> %s", file_header->link_target);
+                printf(" -> %s", printable_string(file_header->link_target));
         }
         bb_putchar('\n');
 }
diff --git a/shell/ash.c b/shell/ash.c
index 3722c2c23..ae49687da 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -16380,14 +16380,11 @@ init(void)
  * Process the shell command line arguments.
  */
 static int
-procargs(char **argv)
+procargs(char **xargv)
 {
         int i;
-        const char *xminusc;
-        char **xargv;
         int login_sh;
 
-        xargv = argv;
 #if ENABLE_PLATFORM_MINGW32
         login_sh = applet_name[0] == 'l';
 #else
@@ -16408,9 +16405,8 @@ procargs(char **argv)
                 raise_exception(EXERROR); /* does not return */
         }
         xargv = argptr;
-        xminusc = minusc;
         if (*xargv == NULL) {
-                if (xminusc)
+                if (minusc)
                         ash_msg_and_raise_error(bb_msg_requires_arg, "-c");
                 sflag = 1;
         }
@@ -16432,7 +16428,7 @@ procargs(char **argv)
         debug = 1;
 #endif
         /* POSIX 1003.2: first arg after "-c CMD" is $0, remainder $1... */
-        if (xminusc) {
+        if (minusc) {
                 minusc = *xargv++;
                 if (*xargv)
                         goto setarg0;