Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/loginutils/vlock.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/loginutils/vlock.c (modified) (5 diffs)

branches/2.2.9/mindi-busybox/loginutils/vlock.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-
 /*
  * vlock implementation for busybox
@@ -7 +6 @@
  * 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.
  */
 
@@ -18 +17 @@
 
 #include "libbb.h"
+
+#ifdef __linux__
 #include <sys/vt.h>
 
-static struct passwd *pw;
-static struct vt_mode ovtm;
-static struct termios oterm;
-static int vfd;
-static unsigned long o_lock_all;
-
-static void release_vt(int signo)
+static void release_vt(int signo UNUSED_PARAM)
 {
-    ioctl(vfd, VT_RELDISP, !o_lock_all);
+    /* If -a, param is 0, which means:
+     * "no, kernel, we don't allow console switch away from us!" */
+    ioctl(STDIN_FILENO, VT_RELDISP, (unsigned long) !option_mask32);
 }
 
-static void acquire_vt(int signo)
+static void acquire_vt(int signo UNUSED_PARAM)
 {
-    ioctl(vfd, VT_RELDISP, VT_ACKACQ);
+    /* ACK to kernel that switch to console is successful */
+    ioctl(STDIN_FILENO, VT_RELDISP, VT_ACKACQ);
 }
+#endif
 
-static void restore_terminal(void)
+int vlock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int vlock_main(int argc UNUSED_PARAM, char **argv)
 {
-    ioctl(vfd, VT_SETMODE, &ovtm);
-    tcsetattr(STDIN_FILENO, TCSANOW, &oterm);
-}
+#ifdef __linux__
+    struct vt_mode vtm;
+    struct vt_mode ovtm;
+#endif
+    struct termios term;
+    struct termios oterm;
+    struct passwd *pw;
 
-int vlock_main(int argc, char **argv);
-int vlock_main(int argc, char **argv)
-{
-    sigset_t sig;
-    struct sigaction sa;
-    struct vt_mode vtm;
-    struct termios term;
-    uid_t uid = getuid();
+    pw = xgetpwuid(getuid());
+    opt_complementary = "=0"; /* no params! */
+    getopt32(argv, "a");
 
-    pw = getpwuid(uid);
-    if (pw == NULL)
-        bb_error_msg_and_die("unknown uid %d", uid);
+    /* Ignore some signals so that we don't get killed by them */
+    bb_signals(0
+        + (1 << SIGTSTP)
+        + (1 << SIGTTIN)
+        + (1 << SIGTTOU)
+        + (1 << SIGHUP )
+        + (1 << SIGCHLD) /* paranoia :) */
+        + (1 << SIGQUIT)
+        + (1 << SIGINT )
+        , SIG_IGN);
 
-    if (argc > 2) {
-        bb_show_usage();
-    }
+#ifdef __linux__
+    /* We will use SIGUSRx for console switch control: */
+    /* 1: set handlers */
+    signal_SA_RESTART_empty_mask(SIGUSR1, release_vt);
+    signal_SA_RESTART_empty_mask(SIGUSR2, acquire_vt);
+    /* 2: unmask them */
+    sig_unblock(SIGUSR1);
+    sig_unblock(SIGUSR2);
+#endif
 
-    o_lock_all = getopt32(argv, "a");
+    /* 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);
 
-    vfd = xopen(CURRENT_TTY, O_RDWR);
-
-    xioctl(vfd, VT_GETMODE, &vtm);
-
-    /* mask a bunch of signals */
-    sigprocmask(SIG_SETMASK, NULL, &sig);
-    sigdelset(&sig, SIGUSR1);
-    sigdelset(&sig, SIGUSR2);
-    sigaddset(&sig, SIGTSTP);
-    sigaddset(&sig, SIGTTIN);
-    sigaddset(&sig, SIGTTOU);
-    sigaddset(&sig, SIGHUP);
-    sigaddset(&sig, SIGCHLD);
-    sigaddset(&sig, SIGQUIT);
-    sigaddset(&sig, SIGINT);
-
-    sigemptyset(&(sa.sa_mask));
-    sa.sa_flags = SA_RESTART;
-    sa.sa_handler = release_vt;
-    sigaction(SIGUSR1, &sa, NULL);
-    sa.sa_handler = acquire_vt;
-    sigaction(SIGUSR2, &sa, NULL);
-
-    /* need to handle some signals so that we don't get killed by them */
-    sa.sa_handler = SIG_IGN;
-    sigaction(SIGHUP, &sa, NULL);
-    sigaction(SIGQUIT, &sa, NULL);
-    sigaction(SIGINT, &sa, NULL);
-    sigaction(SIGTSTP, &sa, NULL);
-
+#ifdef __linux__
+    xioctl(STDIN_FILENO, VT_GETMODE, &vtm);
     ovtm = vtm;
+    /* "console switches are controlled by us, not kernel!" */
     vtm.mode = VT_PROCESS;
     vtm.relsig = SIGUSR1;
     vtm.acqsig = SIGUSR2;
-    ioctl(vfd, VT_SETMODE, &vtm);
+    ioctl(STDIN_FILENO, VT_SETMODE, &vtm);
+#endif
 
     tcgetattr(STDIN_FILENO, &oterm);
@@ -103 +92 @@
     term.c_lflag &= ~ISIG;
     term.c_lflag &= ~(ECHO | ECHOCTL);
-    tcsetattr(STDIN_FILENO, TCSANOW, &term);
+    tcsetattr_stdin_TCSANOW(&term);
 
     do {
-        printf("Virtual Console%s locked by %s.\n", (o_lock_all) ? "s" : "", pw->pw_name);
+        printf("Virtual console%s locked by %s.\n",
+                option_mask32 /*o_lock_all*/ ? "s" : "",
+                pw->pw_name);
         if (correct_password(pw)) {
             break;
@@ -113 +104 @@
         puts("Password incorrect");
     } while (1);
-    restore_terminal();
-    fflush_stdout_and_exit(0);
+
+#ifdef __linux__
+    ioctl(STDIN_FILENO, VT_SETMODE, &ovtm);
+#endif
+    tcsetattr_stdin_TCSANOW(&oterm);
+    fflush_stdout_and_exit(EXIT_SUCCESS);
 }