Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/loginutils/vlock.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/loginutils/vlock.c (modified) (2 diffs)

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

@@ -15 +15 @@
 /* Fixed by Erik Andersen to do passwords the tinylogin way...
  * It now works with md5, sha1, etc passwords. */
+
+//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:     "\n    -a  Lock all VTs"
 
 #include "libbb.h"
@@ -94 +100 @@
     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__