ash: Expand here-documents in the current shell environment

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

diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c
index 9a4188f52f8303430a94a566b2026c15ac46b00c..2dcead35ab2149d47de280f562259f81edf67f4e 100644 (file)
--- a/libbb/bb_askpass.c
+++ b/libbb/bb_askpass.c
@@ -1,13 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
  * Ask for a password
- * I use a static buffer in this function.  Plan accordingly.
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 #include "libbb.h"
 
 /* do nothing signal handler */
@@ -15,29 +13,35 @@ static void askpass_timeout(int UNUSED_PARAM ignore)
 {
 }
 
-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)
+char* FAST_FUNC bb_ask_noecho(int fd, int timeout, const char *prompt)
 {
-       /* Was static char[BIGNUM] */
-       enum { sizeof_passwd = 128 };
-       static char *passwd;
-
+#define MAX_LINE 0xfff
        char *ret;
        int i;
        struct sigaction sa, oldsa;
        struct termios tio, oldtio;
 
-       tcgetattr(fd, &oldtio);
        tcflush(fd, TCIFLUSH);
+       /* Was buggy: was printing prompt *before* flushing input,
+        * which was upsetting "expect" based scripts of some users.
+        */
+       fputs(prompt, stdout);
+       fflush_all();
+
+       tcgetattr(fd, &oldtio);
        tio = oldtio;
-#ifndef IUCLC
-# define IUCLC 0
-#endif
-       tio.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
-       tio.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP);
+       /* 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]
+        */
+       tio.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL);
        tcsetattr(fd, TCSANOW, &tio);
 
        memset(&sa, 0, sizeof(sa));
@@ -50,23 +54,30 @@ 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;
+       ret = NULL;
        i = 0;
        while (1) {
-               int r = read(fd, &ret[i], 1);
-               if (r < 0) {
-                       /* read is interrupted by timeout or ^C */
+               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 /* 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;
@@ -82,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);
+}