Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/bb_askpass.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/bb_askpass.c (modified) (4 diffs)

branches/3.3/mindi-busybox/libbb/bb_askpass.c

@@ -2 +2 @@
 /*
  * Ask for a password
- * I use a static buffer in this function.  Plan accordingly.
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
@@ -24 +23 @@
     /* Was static char[BIGNUM] */
     enum { sizeof_passwd = 128 };
-    static char *passwd;
 
+    char *passwd;
     char *ret;
     int i;
@@ -31 +30 @@
     struct termios tio, 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();
-    tcflush(fd, TCIFLUSH);
 
     tcgetattr(fd, &oldtio);
@@ -60 +62 @@
     }
 
-    if (!passwd)
-        passwd = xmalloc(sizeof_passwd);
+    passwd = auto_string(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;