From 8a0a83d503a7971895254efa9e79cf15ba1850d4 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 27 Nov 2006 13:58:18 +0000 Subject: - minor shrinkage text data bss dec hex filename 773 0 80 853 355 vlock.o.orig 766 0 80 846 34e vlock.o --- loginutils/vlock.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/loginutils/vlock.c b/loginutils/vlock.c index 7a44d9405..1414613de 100644 --- a/loginutils/vlock.c +++ b/loginutils/vlock.c @@ -27,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) @@ -50,6 +47,11 @@ int vlock_main(int argc, char **argv) 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(); @@ -57,10 +59,6 @@ int vlock_main(int argc, char **argv) o_lock_all = getopt32(argc, argv, "a"); - if((pw = getpwuid(getuid())) == NULL) { - bb_error_msg_and_die("unknown uid %d", getuid()); - } - vfd = xopen(CURRENT_TTY, O_RDWR); if (ioctl(vfd, VT_GETMODE, &vtm) < 0) { -- cgit v1.2.3