Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/bb_askpass.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/bb_askpass.c (modified) (4 diffs)

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

@@ -9 +9 @@
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
 #include <termios.h>
-#include <sys/ioctl.h>
 
 #include "libbb.h"
-#define PWD_BUFFER_SIZE 256
-
 
 /* do nothing signal handler */
@@ -28 +20 @@
 char *bb_askpass(int timeout, const char * prompt)
 {
+    /* Was static char[BIGNUM] */
+    enum { sizeof_passwd = 128 };
+    static char *passwd;
+
     char *ret;
-    int i, size;
+    int i;
     struct sigaction sa;
     struct termios old, new;
-    static char passwd[PWD_BUFFER_SIZE];
+
+    if (!passwd)
+        passwd = xmalloc(sizeof_passwd);
+    memset(passwd, 0, sizeof_passwd);
 
     tcgetattr(STDIN_FILENO, &old);
     tcflush(STDIN_FILENO, TCIFLUSH);
-
-    size = sizeof(passwd);
-    ret = passwd;
-    memset(passwd, 0, size);
 
     fputs(prompt, stdout);
@@ -56 +51 @@
     }
 
-    if (read(STDIN_FILENO, passwd, size-1) <= 0) {
-        ret = NULL;
-    } else {
-        for(i = 0; i < size && passwd[i]; i++) {
-            if (passwd[i]== '\r' || passwd[i] == '\n') {
-                passwd[i]= 0;
-                break;
-            }
-        }
+    ret = NULL;
+    /* On timeout, read will hopefully be interrupted by SIGALRM,
+     * 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++]);
     }
 
@@ -72 +70 @@
 
     tcsetattr(STDIN_FILENO, TCSANOW, &old);
-    fputs("\n", stdout);
+    putchar('\n');
     fflush(stdout);
     return ret;
 }
-