Bump to version 1.22.1

[platform/upstream/busybox.git] / libbb / bb_askpass.c

diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c
index 3ad0e97..77c1bcd 100644 (file)
--- a/libbb/bb_askpass.c
+++ b/libbb/bb_askpass.c
@@ -5,19 +5,21 @@
  *
  * 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 <termios.h>
-
 #include "libbb.h"
 
 /* do nothing signal handler */
-static void askpass_timeout(int ATTRIBUTE_UNUSED ignore)
+static void askpass_timeout(int UNUSED_PARAM ignore)
 {
 }
 
-char *bb_askpass(int timeout, const char *prompt)
+char* FAST_FUNC bb_ask_stdin(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 };
@@ -28,20 +30,28 @@ char *bb_askpass(int timeout, const char *prompt)
        struct sigaction sa, oldsa;
        struct termios tio, oldtio;
 
-       if (!passwd)
-               passwd = xmalloc(sizeof_passwd);
-       memset(passwd, 0, sizeof_passwd);
+       fputs(prompt, stdout);
+       fflush_all();
+       tcflush(fd, TCIFLUSH);
 
-       tcgetattr(STDIN_FILENO, &oldtio);
-       tcflush(STDIN_FILENO, TCIFLUSH);
+       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??)
+        */
+# ifndef IUCLC
+#  define IUCLC 0
+# endif
        tio.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
-       tio.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP);
-       tcsetattr(STDIN_FILENO, TCSANOW, &tio);
+#endif
+       /* Switch off echo */
+       tio.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL);
+       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) {
@@ -49,29 +59,34 @@ char *bb_askpass(int timeout, const char *prompt)
                alarm(timeout);
        }
 
-       fputs(prompt, stdout);
-       fflush(stdout);
-       ret = NULL;
-       /* On timeout or Ctrl-C, read will hopefully be interrupted,
-        * and we return NULL */
-       if (read(STDIN_FILENO, 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 ((i == 0 && r == 0) /* EOF (^D) with no password */
+                || 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_FILENO, TCSANOW, &oldtio);
+       tcsetattr(fd, TCSANOW, &oldtio);
        bb_putchar('\n');
-       fflush(stdout);
+       fflush_all();
        return ret;
 }