Do not use getpass(3)

3 files changed, 90 insertions, 3 deletions

diff --git a/libbb/Makefile.in b/libbb/Makefile.in
index 632208184..eff3224b1 100644
--- a/libbb/Makefile.in
+++ b/libbb/Makefile.in
@@ -46,7 +46,7 @@ LIBBB_SRC:= \
         xgethostbyname.c xgethostbyname2.c xreadlink.c xregcomp.c xgetlarg.c \
         get_terminal_width_height.c fclose_nonstdin.c fflush_stdout_and_exit.c \
         getopt_ulflags.c default_error_retval.c wfopen_input.c speed_table.c \
-        perror_nomsg_and_die.c perror_nomsg.c skip_whitespace.c \
+        perror_nomsg_and_die.c perror_nomsg.c skip_whitespace.c bb_askpass.c \
         warn_ignoring_args.c concat_subpath_file.c vfork_daemon_rexec.c
 
 LIBBB_OBJS=$(patsubst %.c,$(LIBBB_DIR)%.o, $(LIBBB_SRC))
diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c
new file mode 100644
index 000000000..1ae1520d9
--- /dev/null
+++ b/libbb/bb_askpass.c
@@ -0,0 +1,87 @@
+/* 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>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <termios.h>
+#include <sys/ioctl.h>
+#define PWD_BUFFER_SIZE 256
+
+
+/* do nothing signal handler */
+static void askpass_timeout(int ignore)
+{
+}
+
+char *bb_askpass(int timeout, const char * prompt)
+{
+        char *ret;
+        int i, size;
+        struct sigaction sa;
+        struct termios old, new;
+        static char passwd[PWD_BUFFER_SIZE];
+
+        tcgetattr(STDIN_FILENO, &old);
+
+        size = sizeof(passwd);
+        ret = passwd;
+        memset(passwd, 0, size);
+
+        fputs(prompt, stdout);
+        fflush(stdout);
+
+        tcgetattr(STDIN_FILENO, &new);
+        new.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
+        new.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP);
+        tcsetattr(STDIN_FILENO, TCSANOW, &new);
+
+        if (timeout) {
+                sa.sa_flags = 0;
+                sa.sa_handler = askpass_timeout;
+                sigaction(SIGALRM, &sa, NULL);
+                alarm(timeout);
+        }
+
+        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;
+                        }
+                }
+        }
+
+        if (timeout) {
+                alarm(0);
+        }
+
+        tcsetattr(STDIN_FILENO, TCSANOW, &old);
+        fputs("\n", stdout);
+        fflush(stdout);
+        return ret;
+}
+
diff --git a/libbb/correct_password.c b/libbb/correct_password.c
index 1da83c441..e3ff44689 100644
--- a/libbb/correct_password.c
+++ b/libbb/correct_password.c
@@ -66,10 +66,10 @@ int correct_password ( const struct passwd *pw )
         if ( correct == 0 || correct[0] == '\0' )
                 return 1;
 
-        unencrypted = getpass ( "Password: " );
+        unencrypted = bb_askpass ( 0, "Password: " );
         if ( !unencrypted )
         {
-                fputs ( "getpass: cannot open /dev/tty\n", stderr );
+                fputs ( "cannot open /dev/tty\n", stderr );
                 return 0;
         }
         encrypted = crypt ( unencrypted, correct );