tar: support -T - and -X -

[oweals/busybox.git] / libbb / bb_askpass.c

diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c
index f9b918cecef643a070d35a33d6d7aec88f25524d..9a4188f52f8303430a94a566b2026c15ac46b00c 100644 (file)
--- a/libbb/bb_askpass.c
+++ b/libbb/bb_askpass.c
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
@@ -30,10 +30,6 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
        struct sigaction sa, oldsa;
        struct termios tio, oldtio;
 
-       if (!passwd)
-               passwd = xmalloc(sizeof_passwd);
-       memset(passwd, 0, sizeof_passwd);
-
        tcgetattr(fd, &oldtio);
        tcflush(fd, TCIFLUSH);
        tio = oldtio;
@@ -42,11 +38,11 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
 #endif
        tio.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
        tio.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP);
-       tcsetattr_stdin_TCSANOW(&tio);
+       tcsetattr(fd, TCSANOW, &tio);
 
        memset(&sa, 0, sizeof(sa));
        /* sa.sa_flags = 0; - no SA_RESTART! */
-       /* SIGINT and SIGALRM will interrupt read below */
+       /* SIGINT and SIGALRM will interrupt reads below */
        sa.sa_handler = askpass_timeout;
        sigaction(SIGINT, &sa, &oldsa);
        if (timeout) {
@@ -56,26 +52,32 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
 
        fputs(prompt, stdout);
        fflush_all();
-       ret = NULL;
-       /* On timeout or Ctrl-C, read will hopefully be interrupted,
-        * and we return NULL */
-       if (read(fd, passwd, sizeof_passwd - 1) > 0) {
-               ret = passwd;
-               i = 0;
-               /* Last byte is guaranteed to be 0
-                  (read did not overwrite it) */
-               do {
-                       if (passwd[i] == '\r' || passwd[i] == '\n')
-                               passwd[i] = '\0';
-               } while (passwd[i++]);
+
+       if (!passwd)
+               passwd = xmalloc(sizeof_passwd);
+       ret = passwd;
+       i = 0;
+       while (1) {
+               int r = read(fd, &ret[i], 1);
+               if (r < 0) {
+                       /* read is interrupted by timeout or ^C */
+                       ret = NULL;
+                       break;
+               }
+               if (r == 0 /* EOF */
+                || ret[i] == '\r' || ret[i] == '\n' /* EOL */
+                || ++i == sizeof_passwd-1 /* line limit */
+               ) {
+                       ret[i] = '\0';
+                       break;
+               }
        }
 
        if (timeout) {
                alarm(0);
        }
        sigaction_set(SIGINT, &oldsa);
-
-       tcsetattr_stdin_TCSANOW(&oldtio);
+       tcsetattr(fd, TCSANOW, &oldtio);
        bb_putchar('\n');
        fflush_all();
        return ret;