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 bf45780..77c1bcd 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,15 +30,24 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
        struct sigaction sa, oldsa;
        struct termios tio, oldtio;
 
-       tcgetattr(fd, &oldtio);
+       fputs(prompt, stdout);
+       fflush_all();
        tcflush(fd, TCIFLUSH);
+
+       tcgetattr(fd, &oldtio);
        tio = oldtio;
-#ifndef IUCLC
-# define IUCLC 0
-#endif
+#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_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! */
@@ -50,16 +59,15 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
                alarm(timeout);
        }
 
-       fputs(prompt, stdout);
-       fflush_all();
-
        if (!passwd)
                passwd = xmalloc(sizeof_passwd);
        ret = passwd;
        i = 0;
        while (1) {
                int r = read(fd, &ret[i], 1);
-               if (r < 0) {
+               if ((i == 0 && r == 0) /* EOF (^D) with no password */
+                || r < 0
+               ) {
                        /* read is interrupted by timeout or ^C */
                        ret = NULL;
                        break;
@@ -77,8 +85,7 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
                alarm(0);
        }
        sigaction_set(SIGINT, &oldsa);
-
-       tcsetattr_stdin_TCSANOW(&oldtio);
+       tcsetattr(fd, TCSANOW, &oldtio);
        bb_putchar('\n');
        fflush_all();
        return ret;