ead19306f
Rob Landley
2006-03-10
Subject
Cleanup patches from tito.
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
console-tools/chvt.c+2 -2
| @@ -44,8 +44,8 @@ int chvt_main(int argc, char **argv) | |
| fd = get_console_fd(); | |
| num = bb_xgetlarg(argv[1], 10, 0, INT_MAX); | |
| - | if((-1 == ioctl(fd, VT_ACTIVATE, num)) || |
| - | (-1 == ioctl(fd, VT_WAITACTIVE, num))) { |
| + | if ((-1 == ioctl(fd, VT_ACTIVATE, num)) |
| + | || (-1 == ioctl(fd, VT_WAITACTIVE, num))) { |
| bb_perror_msg_and_die("ioctl"); | |
| } | |
| return EXIT_SUCCESS; | |
console-tools/deallocvt.c+4 -4
| @@ -37,11 +37,11 @@ int deallocvt_main(int argc, char *argv[]) | |
| /* num = 0 deallocate all unused consoles */ | |
| int num = 0; | |
| - | switch(argc) |
| - | { |
| + | switch (argc) { |
| case 2: | |
| - | if((num = bb_xgetlarg(argv[1], 10, 0, INT_MAX)) == 0) |
| + | if ((num = bb_xgetlarg(argv[1], 10, 0, INT_MAX)) == 0) { |
| bb_error_msg_and_die("0: illegal VT number"); | |
| + | } |
| /* Fallthrough */ | |
| case 1: | |
| break; | |
| @@ -49,7 +49,7 @@ int deallocvt_main(int argc, char *argv[]) | |
| bb_show_usage(); | |
| } | |
| - | if (-1 == ioctl( get_console_fd(), VT_DISALLOCATE, num )) { |
| + | if (-1 == ioctl(get_console_fd(), VT_DISALLOCATE, num)) { |
| bb_perror_msg_and_die("VT_DISALLOCATE"); | |
| } | |
| return EXIT_SUCCESS; | |
console-tools/openvt.c+8 -17
| @@ -35,28 +35,19 @@ | |
| int openvt_main(int argc, char **argv) | |
| { | |
| int fd; | |
| - | char vtname[sizeof VC_FORMAT + 2]; |
| + | char vtname[sizeof(VC_FORMAT) + 2]; |
| - | if (argc < 3) |
| - | bb_show_usage(); |
| - | |
| + | if (argc < 3) { |
| + | bb_show_usage(); |
| + | } |
| /* check for Illegal vt number: < 1 or > 12 */ | |
| - | sprintf(vtname, VC_FORMAT,(int)bb_xgetlarg(argv[1], 10, 1, 12)); |
| - | |
| - | argv+=2; |
| - | argc-=2; |
| + | sprintf(vtname, VC_FORMAT, (int)bb_xgetlarg(argv[1], 10, 1, 12)); |
| - | if(fork() == 0) { |
| + | if (fork() == 0) { |
| /* leave current vt */ | |
| - | |
| - | #ifdef ESIX_5_3_2_D |
| - | if (setpgrp() < 0) { |
| - | #else |
| if (setsid() < 0) { | |
| - | #endif |
| - | |
| - | bb_perror_msg_and_die("Unable to set new session"); |
| + | bb_perror_msg_and_die("setsid"); |
| } | |
| close(0); /* so that new vt becomes stdin */ | |
| @@ -67,7 +58,7 @@ int openvt_main(int argc, char **argv) | |
| dup2(fd, STDOUT_FILENO); | |
| dup2(fd, STDERR_FILENO); | |
| - | execvp(argv[0], argv); |
| + | execvp(argv[2], &argv[2]); |
| _exit(1); | |
| } | |
| return EXIT_SUCCESS; | |