diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-18 10:35:06 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-18 10:35:06 +0000 |
| commit | 91e149a3736ddc357950252c02d758515074447f (patch) | |
| tree | 3f91621bb8958873a71699d8eb018838251e8c17 /libbb/bb_askpass.c | |
| parent | 2c91efb7c24da6370810991459ae360029022250 (diff) | |
| download | busybox-91e149a3736ddc357950252c02d758515074447f.tar.gz | |
libbb: random hunt for statics
function old new delta
bb_askpass 306 321 +15
pw_encrypt 38 39 +1
static.passwd 64 4 -60
static.cipher 128 4 -124
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/2 up/down: 16/-184) Total: -168 bytes
# size busybox_old busybox_unstripped
text data bss dec hex filename
683705 2704 14240 700649 ab0e9 busybox_old
683721 2704 14064 700489 ab049 busybox_unstripped
Diffstat (limited to 'libbb/bb_askpass.c')
| -rw-r--r-- | libbb/bb_askpass.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c index 0f1f68687..5ad234921 100644 --- a/libbb/bb_askpass.c +++ b/libbb/bb_askpass.c @@ -9,7 +9,6 @@ */ #include <termios.h> -//#include <sys/ioctl.h> #include "libbb.h" @@ -20,18 +19,22 @@ static void askpass_timeout(int ATTRIBUTE_UNUSED ignore) char *bb_askpass(int timeout, const char * prompt) { - static char passwd[64]; + /* Was static char[BIGNUM] */ + enum { sizeof_passwd = 128 }; + static char *passwd; char *ret; int i; struct sigaction sa; struct termios old, new; + if (!passwd) + passwd = xmalloc(sizeof_passwd); + memset(passwd, 0, sizeof_passwd); + tcgetattr(STDIN_FILENO, &old); tcflush(STDIN_FILENO, TCIFLUSH); - memset(passwd, 0, sizeof(passwd)); - fputs(prompt, stdout); fflush(stdout); @@ -48,7 +51,9 @@ char *bb_askpass(int timeout, const char * prompt) } ret = NULL; - if (read(STDIN_FILENO, passwd, sizeof(passwd)-1) > 0) { + /* 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 @@ -64,7 +69,7 @@ char *bb_askpass(int timeout, const char * prompt) } tcsetattr(STDIN_FILENO, TCSANOW, &old); - puts(""); + putchar('\n'); fflush(stdout); return ret; } |