8a0a83d50
Bernhard Reutner-Fischer
2006-11-27
Subject
- minor shrinkage text data bss dec hex filename 773 0 80 853 355 vlock.o.orig 766 0 80 846 34e vlock.o
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
loginutils/vlock.c+6 -8
| @@ -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) { | |