Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/loginutils/vlock.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/loginutils/vlock.c (modified) (7 diffs)

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

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
+
 /*
  * vlock implementation for busybox
@@ -16 +17 @@
  * It now works with md5, sha1, etc passwords. */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include "libbb.h"
 #include <sys/vt.h>
-#include <signal.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <termios.h>
-
-#include "busybox.h"
 
 static struct passwd *pw;
@@ -37 +28 @@
 static void release_vt(int signo)
 {
-    if (!o_lock_all)
-        ioctl(vfd, VT_RELDISP, 1);
-    else
-        ioctl(vfd, VT_RELDISP, 0);
+    ioctl(vfd, VT_RELDISP, !o_lock_all);
 }
 
@@ -54 +42 @@
 }
 
+int vlock_main(int argc, char **argv);
 int vlock_main(int argc, char **argv)
 {
@@ -60 +49 @@
     struct vt_mode vtm;
     struct termios term;
+    uid_t uid = getuid();
+
+    pw = getpwuid(uid);
+    if (pw == NULL)
+        bb_error_msg_and_die("unknown uid %d", uid);
 
     if (argc > 2) {
@@ -65 +59 @@
     }
 
-    o_lock_all = bb_getopt_ulflags (argc, argv, "a");
+    o_lock_all = getopt32(argv, "a");
 
-    if((pw = getpwuid(getuid())) == NULL) {
-        bb_error_msg_and_die("Unknown uid %d", getuid());
-    }
+    vfd = xopen(CURRENT_TTY, O_RDWR);
 
-    vfd = bb_xopen(CURRENT_TTY, O_RDWR);
-
-    if (ioctl(vfd, VT_GETMODE, &vtm) < 0) {
-        bb_perror_msg_and_die("VT_GETMODE");
-    }
+    xioctl(vfd, VT_GETMODE, &vtm);
 
     /* mask a bunch of signals */
@@ -118 +106 @@
 
     do {
-        printf("Virtual Console%s locked.\n%s's ", (o_lock_all) ? "s" : "", pw->pw_name);
-        fflush(stdout);
-        if (correct_password (pw)) {
+        printf("Virtual Console%s locked by %s.\n", (o_lock_all) ? "s" : "", pw->pw_name);
+        if (correct_password(pw)) {
             break;
         }
         bb_do_delay(FAIL_DELAY);
-        puts("Password incorrect.");
+        puts("Password incorrect");
     } while (1);
     restore_terminal();
-    return 0;
+    fflush_stdout_and_exit(0);
 }