Merge branch 'busybox' into merge

8 files changed, 67 insertions, 45 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 8fae11998..6a189a8c9 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -110,14 +110,21 @@ static const char *unpack_usage_messages(void)
         char *outbuf = NULL;
         bunzip_data *bd;
         int i;
+        jmp_buf jmpbuf;
 
-        i = start_bunzip(&bd,
+        /* Setup for I/O error handling via longjmp */
+        i = setjmp(jmpbuf);
+        if (i == 0) {
+                i = start_bunzip(&jmpbuf,
+                        &bd,
                         /* src_fd: */ -1,
                         /* inbuf:  */ packed_usage,
-                        /* len:    */ sizeof(packed_usage));
-        /* read_bunzip can longjmp to start_bunzip, and ultimately
-         * end up here with i != 0 on read data errors! Not trivial */
-        if (!i) {
+                        /* len:    */ sizeof(packed_usage)
+                );
+        }
+        /* read_bunzip can longjmp and end up here with i != 0
+         * on read data errors! Not trivial */
+        if (i == 0) {
                 /* Cannot use xmalloc: will leak bd in NOFORK case! */
                 outbuf = malloc_or_warn(sizeof(UNPACKED_USAGE));
                 if (outbuf)
diff --git a/libbb/ask_confirmation.c b/libbb/ask_confirmation.c
index 6fbed89f4..e4814e215 100644
--- a/libbb/ask_confirmation.c
+++ b/libbb/ask_confirmation.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * bb_ask_confirmation implementation for busybox
+ * bb_ask_y_confirmation implementation for busybox
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
@@ -8,15 +8,16 @@
  */
 #include "libbb.h"
 
-/* Read a line from stdin.  If the first non-whitespace char is 'y' or 'Y',
+/* Read a line from fp.  If the first non-whitespace char is 'y' or 'Y',
  * return 1.  Otherwise return 0.
  */
-int FAST_FUNC bb_ask_confirmation(void)
+int FAST_FUNC bb_ask_y_confirmation_FILE(FILE *fp)
 {
         char first = 0;
         int c;
 
-        while (((c = getchar()) != EOF) && (c != '\n')) {
+        fflush_all();
+        while (((c = fgetc(fp)) != EOF) && (c != '\n')) {
                 if (first == 0 && !isblank(c)) {
                         first = c|0x20;
                 }
@@ -24,3 +25,8 @@ int FAST_FUNC bb_ask_confirmation(void)
 
         return first == 'y';
 }
+
+int FAST_FUNC bb_ask_y_confirmation(void)
+{
+        return bb_ask_y_confirmation_FILE(stdin);
+}
diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c
index aae35ec41..2dcead35a 100644
--- a/libbb/bb_askpass.c
+++ b/libbb/bb_askpass.c
@@ -13,16 +13,9 @@ static void askpass_timeout(int UNUSED_PARAM ignore)
 {
 }
 
-char* FAST_FUNC bb_ask_stdin(const char *prompt)
+char* FAST_FUNC bb_ask_noecho(int fd, int timeout, const char *prompt)
 {
-        return bb_ask(STDIN_FILENO, 0, prompt);
-}
-char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
-{
-        /* Was static char[BIGNUM] */
-        enum { sizeof_passwd = 128 };
-
-        char *passwd;
+#define MAX_LINE 0xfff
         char *ret;
         int i;
         struct sigaction sa, oldsa;
@@ -37,16 +30,17 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
 
         tcgetattr(fd, &oldtio);
         tio = oldtio;
-#if 0
-        /* Switch off UPPERCASE->lowercase conversion (never used since 198x)
-         * and XON/XOFF (why we want to mess with this??)
+        /* Switch off echo. ECHOxyz meaning:
+         * ECHO    echo input chars
+         * ECHOE   echo BS-SP-BS on erase character
+         * ECHOK   echo kill char specially, not as ^c (ECHOKE controls how exactly)
+         * ECHOKE  erase all input via BS-SP-BS on kill char (else go to next line)
+         * ECHOCTL Echo ctrl chars as ^c (else echo verbatim:
+         *         e.g. up arrow emits "ESC-something" and thus moves cursor up!)
+         * ECHONL  Echo NL even if ECHO is not set
+         * ECHOPRT On erase, echo erased chars
+         *         [qwe<BS><BS><BS> input looks like "qwe\ewq/" on screen]
          */
-# ifndef IUCLC
-#  define IUCLC 0
-# endif
-        tio.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
-#endif
-        /* Switch off echo */
         tio.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL);
         tcsetattr(fd, TCSANOW, &tio);
 
@@ -60,21 +54,30 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
                 alarm(timeout);
         }
 
-        passwd = auto_string(xmalloc(sizeof_passwd));
-        ret = passwd;
+        ret = NULL;
         i = 0;
         while (1) {
-                int r = read(fd, &ret[i], 1);
+                int r;
+
+                /* User input is uber-slow, no need to optimize reallocs.
+                 * Grow it on every char.
+                 */
+                ret = xrealloc(ret, i + 2);
+                r = read(fd, &ret[i], 1);
+
                 if ((i == 0 && r == 0) /* EOF (^D) with no password */
-                 || r < 0
+                 || r < 0 /* read is interrupted by timeout or ^C */
                 ) {
-                        /* read is interrupted by timeout or ^C */
+                        ret[i] = '\0'; /* paranoia */
+                        nuke_str(ret); /* paranoia */
+                        free(ret);
                         ret = NULL;
                         break;
                 }
+
                 if (r == 0 /* EOF */
                  || ret[i] == '\r' || ret[i] == '\n' /* EOL */
-                 || ++i == sizeof_passwd-1 /* line limit */
+                 || ++i == MAX_LINE /* line limit */
                 ) {
                         ret[i] = '\0';
                         break;
@@ -90,3 +93,7 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
         fflush_all();
         return ret;
 }
+char* FAST_FUNC bb_ask_noecho_stdin(const char *prompt)
+{
+        return bb_ask_noecho(STDIN_FILENO, 0, prompt);
+}
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index 5372d8680..c60765d95 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -48,7 +48,7 @@ static int ask_and_unlink(const char *dest, int flags)
                 // (No "opening without O_EXCL", no "unlink only if -f")
                 // Or else we will end up having 3 open()s!
                 fprintf(stderr, "%s: overwrite '%s'? ", applet_name, dest);
-                if (!bb_ask_confirmation())
+                if (!bb_ask_y_confirmation())
                         return 0; /* not allowed to overwrite */
         }
         if (unlink(dest) < 0) {
diff --git a/libbb/correct_password.c b/libbb/correct_password.c
index a6f7d9b3d..cbe6cb387 100644
--- a/libbb/correct_password.c
+++ b/libbb/correct_password.c
@@ -106,7 +106,7 @@ int FAST_FUNC ask_and_check_password_extended(const struct passwd *pw,
         if (!pw_pass[0]) /* empty password field? */
                 return CHECKPASS_PW_HAS_EMPTY_PASSWORD;
 
-        plaintext = bb_ask(STDIN_FILENO, timeout, prompt);
+        plaintext = bb_ask_noecho(STDIN_FILENO, timeout, prompt);
         if (!plaintext) {
                 /* EOF (such as ^D) or error (such as ^C) or timeout */
                 return -1;
diff --git a/libbb/dump.c b/libbb/dump.c
index db91fcfe7..5941ef902 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -464,11 +464,9 @@ static const char conv_str[] ALIGN1 =
         "\v"  "\\""v""\0"
         ;
 
-
 static void conv_c(PR *pr, unsigned char *p)
 {
         const char *str = conv_str;
-        char buf[10];
 
         do {
                 if (*p == *str) {
@@ -482,7 +480,9 @@ static void conv_c(PR *pr, unsigned char *p)
                 *pr->cchar = 'c';
                 printf(pr->fmt, *p);
         } else {
-                sprintf(buf, "%03o", (int) *p);
+                char buf[4];
+                /* gcc-8.0.1 needs lots of casts to shut up */
+                sprintf(buf, "%03o", (unsigned)(uint8_t)*p);
                 str = buf;
  strpr:
                 *pr->cchar = 's';
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 36b6abe2b..431f1c048 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -466,7 +466,8 @@ static void put_till_end_and_adv_cursor(void)
 static void goto_new_line(void)
 {
         put_till_end_and_adv_cursor();
-        if (cmdedit_x != 0)
+        /* "cursor == 0" is only if prompt is "" and user input is empty */
+        if (cursor == 0 || cmdedit_x != 0)
                 bb_putchar('\n');
 }
 
diff --git a/libbb/remove_file.c b/libbb/remove_file.c
index 8a1324393..86c9a5c56 100644
--- a/libbb/remove_file.c
+++ b/libbb/remove_file.c
@@ -39,9 +39,9 @@ int FAST_FUNC remove_file(const char *path, int flags)
                 if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 && isatty(0))
                  || (flags & FILEUTILS_INTERACTIVE)
                 ) {
-                        fprintf(stderr, "%s: descend into directory '%s'? ", applet_name,
-                                        path);
-                        if (!bb_ask_confirmation())
+                        fprintf(stderr, "%s: descend into directory '%s'? ",
+                                        applet_name, path);
+                        if (!bb_ask_y_confirmation())
                                 return 0;
                 }
 
@@ -67,8 +67,9 @@ int FAST_FUNC remove_file(const char *path, int flags)
                 }
 
                 if (flags & FILEUTILS_INTERACTIVE) {
-                        fprintf(stderr, "%s: remove directory '%s'? ", applet_name, path);
-                        if (!bb_ask_confirmation())
+                        fprintf(stderr, "%s: remove directory '%s'? ",
+                                        applet_name, path);
+                        if (!bb_ask_y_confirmation())
                                 return status;
                 }
 
@@ -92,7 +93,7 @@ int FAST_FUNC remove_file(const char *path, int flags)
          || (flags & FILEUTILS_INTERACTIVE)
         ) {
                 fprintf(stderr, "%s: remove '%s'? ", applet_name, path);
-                if (!bb_ask_confirmation())
+                if (!bb_ask_y_confirmation())
                         return 0;
         }