traceroute: fix help text to not show -6 when traceroute6 is off

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

diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c
index fd12f92dc10b3dd3da7149f4787287fab90f62b1..f9b918cecef643a070d35a33d6d7aec88f25524d 100644 (file)
--- a/libbb/bb_askpass.c
+++ b/libbb/bb_askpass.c
@@ -8,16 +8,18 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <termios.h>
-
 #include "libbb.h"
 
 /* do nothing signal handler */
-static void askpass_timeout(int ATTRIBUTE_UNUSED ignore)
+static void askpass_timeout(int UNUSED_PARAM ignore)
 {
 }
 
-char *bb_askpass(int timeout, const char *prompt)
+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)
 {
        /* Was static char[BIGNUM] */
        enum { sizeof_passwd = 128 };
@@ -32,12 +34,15 @@ char *bb_askpass(int timeout, const char *prompt)
                passwd = xmalloc(sizeof_passwd);
        memset(passwd, 0, sizeof_passwd);
 
-       tcgetattr(STDIN_FILENO, &oldtio);
-       tcflush(STDIN_FILENO, TCIFLUSH);
+       tcgetattr(fd, &oldtio);
+       tcflush(fd, TCIFLUSH);
        tio = oldtio;
+#ifndef IUCLC
+# define IUCLC 0
+#endif
        tio.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
        tio.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP);
-       tcsetattr(STDIN_FILENO, TCSANOW, &tio);
+       tcsetattr_stdin_TCSANOW(&tio);
 
        memset(&sa, 0, sizeof(sa));
        /* sa.sa_flags = 0; - no SA_RESTART! */
@@ -45,16 +50,16 @@ char *bb_askpass(int timeout, const char *prompt)
        sa.sa_handler = askpass_timeout;
        sigaction(SIGINT, &sa, &oldsa);
        if (timeout) {
-               sigaction(SIGALRM, &sa, NULL);
+               sigaction_set(SIGALRM, &sa);
                alarm(timeout);
        }
 
        fputs(prompt, stdout);
-       fflush(stdout);
+       fflush_all();
        ret = NULL;
        /* On timeout or Ctrl-C, read will hopefully be interrupted,
         * and we return NULL */
-       if (read(STDIN_FILENO, passwd, sizeof_passwd - 1) > 0) {
+       if (read(fd, passwd, sizeof_passwd - 1) > 0) {
                ret = passwd;
                i = 0;
                /* Last byte is guaranteed to be 0
@@ -68,10 +73,10 @@ char *bb_askpass(int timeout, const char *prompt)
        if (timeout) {
                alarm(0);
        }
-       sigaction(SIGINT, &oldsa, NULL);
+       sigaction_set(SIGINT, &oldsa);
 
-       tcsetattr(STDIN_FILENO, TCSANOW, &oldtio);
+       tcsetattr_stdin_TCSANOW(&oldtio);
        bb_putchar('\n');
-       fflush(stdout);
+       fflush_all();
        return ret;
 }