hush: fix incorrect PS2 dispaly and trap handling while reading command

[oweals/busybox.git] / loginutils / vlock.c

diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index 42ef447326baca7d951963e924f3ea3442e4e49a..efad63ff38f08ee06bd7b1cf36c6c82e3088cfea 100644 (file)
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2000 by spoon <spoon@ix.netcom.com>
  * Written by spoon <spon@ix.netcom.com>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* Shoutz to Michael K. Johnson <johnsonm@redhat.com>, author of the
@@ -15,9 +15,18 @@
 /* Fixed by Erik Andersen to do passwords the tinylogin way...
  * It now works with md5, sha1, etc passwords. */
 
-#include <sys/vt.h>
+//usage:#define vlock_trivial_usage
+//usage:       "[-a]"
+//usage:#define vlock_full_usage "\n\n"
+//usage:       "Lock a virtual terminal. A password is required to unlock.\n"
+//usage:     "\nOptions:"
+//usage:     "\n       -a      Lock all VTs"
+
 #include "libbb.h"
 
+#ifdef __linux__
+#include <sys/vt.h>
+
 static void release_vt(int signo UNUSED_PARAM)
 {
        /* If -a, param is 0, which means:
@@ -30,22 +39,20 @@ static void acquire_vt(int signo UNUSED_PARAM)
        /* ACK to kernel that switch to console is successful */
        ioctl(STDIN_FILENO, VT_RELDISP, VT_ACKACQ);
 }
+#endif
 
 int vlock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int vlock_main(int argc UNUSED_PARAM, char **argv)
 {
+#ifdef __linux__
        struct vt_mode vtm;
+       struct vt_mode ovtm;
+#endif
        struct termios term;
        struct termios oterm;
-       struct vt_mode ovtm;
-       uid_t uid;
        struct passwd *pw;
-/* XXX: xgetpwuid */
-       uid = getuid();
-       pw = getpwuid(uid);
-       if (pw == NULL)
-               bb_error_msg_and_die("unknown uid %d", (int)uid);
 
+       pw = xgetpwuid(getuid());
        opt_complementary = "=0"; /* no params! */
        getopt32(argv, "a");
 
@@ -60,6 +67,7 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
                + (1 << SIGINT )
                , SIG_IGN);
 
+#ifdef __linux__
        /* We will use SIGUSRx for console switch control: */
        /* 1: set handlers */
        signal_SA_RESTART_empty_mask(SIGUSR1, release_vt);
@@ -67,12 +75,14 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
        /* 2: unmask them */
        sig_unblock(SIGUSR1);
        sig_unblock(SIGUSR2);
+#endif
 
        /* Revert stdin/out to our controlling tty
         * (or die if we have none) */
        xmove_fd(xopen(CURRENT_TTY, O_RDWR), STDIN_FILENO);
        xdup2(STDIN_FILENO, STDOUT_FILENO);
 
+#ifdef __linux__
        xioctl(STDIN_FILENO, VT_GETMODE, &vtm);
        ovtm = vtm;
        /* "console switches are controlled by us, not kernel!" */
@@ -80,6 +90,7 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
        vtm.relsig = SIGUSR1;
        vtm.acqsig = SIGUSR2;
        ioctl(STDIN_FILENO, VT_SETMODE, &vtm);
+#endif
 
        tcgetattr(STDIN_FILENO, &oterm);
        term = oterm;
@@ -87,20 +98,23 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
        term.c_iflag |= IGNBRK;
        term.c_lflag &= ~ISIG;
        term.c_lflag &= ~(ECHO | ECHOCTL);
-       tcsetattr(STDIN_FILENO, TCSANOW, &term);
+       tcsetattr_stdin_TCSANOW(&term);
 
-       do {
+       while (1) {
                printf("Virtual console%s locked by %s.\n",
-                               option_mask32 /*o_lock_all*/ ? "s" : "",
-                               pw->pw_name);
+                               /* "s" if -a, else "": */ "s" + !option_mask32,
+                               pw->pw_name
+               );
                if (correct_password(pw)) {
                        break;
                }
-               bb_do_delay(FAIL_DELAY);
-               puts("Password incorrect");
-       } while (1);
+               bb_do_delay(LOGIN_FAIL_DELAY);
+               puts("Incorrect password");
+       }
 
+#ifdef __linux__
        ioctl(STDIN_FILENO, VT_SETMODE, &ovtm);
-       tcsetattr(STDIN_FILENO, TCSANOW, &oterm);
+#endif
+       tcsetattr_stdin_TCSANOW(&oterm);
        fflush_stdout_and_exit(EXIT_SUCCESS);
 }