Add/improve comment, shorten some usage texts. No code changes.

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

diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index 141767c93fba83c166d8a3a57884ae22e3be2ec5..06a7169d9b5e444c7b790cfd6e1bb77b2cb60e4d 100644 (file)
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -1,24 +1,12 @@
 /* vi: set sw=4 ts=4: */
+
 /*
  * vlock implementation for busybox
  *
  * Copyright (C) 2000 by spoon <spoon@ix.netcom.com>
  * Written by spoon <spon@ix.netcom.com>
  *
- * 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
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* Shoutz to Michael K. Johnson <johnsonm@redhat.com>, author of the
@@ -28,18 +16,8 @@
 /* Fixed by Erik Andersen to do passwords the tinylogin way...
  * It now works with md5, sha1, etc passwords. */
 
-#include <stdio.h>
-#include <stdlib.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"
+#include <sys/vt.h>
 
 static struct passwd *pw;
 static struct vt_mode ovtm;
@@ -49,10 +27,7 @@ static unsigned long o_lock_all;
 
 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);
 }
 
 static void acquire_vt(int signo)
@@ -66,24 +41,26 @@ static void restore_terminal(void)
        tcsetattr(STDIN_FILENO, TCSANOW, &oterm);
 }
 
-extern int vlock_main(int argc, char **argv)
+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 = getpwuid(uid);
+       if (pw == NULL)
+               bb_error_msg_and_die("unknown uid %d", uid);
 
        if (argc > 2) {
                bb_show_usage();
        }
 
-       o_lock_all = bb_getopt_ulflags (argc, argv, "a");
-
-       if((pw = getpwuid(getuid())) == NULL) {
-               bb_error_msg_and_die("Unknown uid %d", getuid());
-       }
+       o_lock_all = getopt32(argc, argv, "a");
 
-       vfd = bb_xopen(CURRENT_TTY, O_RDWR);
+       vfd = xopen(CURRENT_TTY, O_RDWR);
 
        if (ioctl(vfd, VT_GETMODE, &vtm) < 0) {
                bb_perror_msg_and_die("VT_GETMODE");
@@ -130,22 +107,13 @@ extern int vlock_main(int argc, char **argv)
        tcsetattr(STDIN_FILENO, TCSANOW, &term);
 
        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;
                }
-               sleep(10);
-               puts("Password incorrect.");
+               bb_do_delay(FAIL_DELAY);
+               puts("Password incorrect");
        } while (1);
        restore_terminal();
-       return 0;
+       fflush_stdout_and_exit(0);
 }
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/