Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-30 20:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Tito sent more size tweaks.

Browse Source
This commit is contained in:
Rob Landley 2005-09-08 03:27:06 +00:00
parent 230b411de8
commit 9f0e00fc61
4 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
console-tools/chvt.c
View File

@ -42,11 +42,9 @@ int chvt_main(int argc, char **argv)
fd = get_console_fd();
num = bb_xgetlarg(argv[1], 10, 0, INT_MAX);
if (ioctl(fd, VT_ACTIVATE, num)) {
bb_perror_msg_and_die("VT_ACTIVATE");
}
if (ioctl(fd, VT_WAITACTIVE, num)) {
bb_perror_msg_and_die("VT_WAITACTIVE");
if((-1 == ioctl(fd, VT_ACTIVATE, num)) ||
(-1 == ioctl(fd, VT_WAITACTIVE, num))) {
bb_perror_msg_and_die("ioctl");
}
return EXIT_SUCCESS;
}

4
console-tools/deallocvt.c
View File

@ -42,14 +42,14 @@ int deallocvt_main(int argc, char *argv[])
case 2:
if((num = bb_xgetlarg(argv[1], 10, 0, INT_MAX)) == 0)
bb_error_msg_and_die("0: illegal VT number");
/* Falltrough */
/* Fallthrough */
case 1:
break;
default:
bb_show_usage();
}
if (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;

6
console-tools/openvt.c
View File

@ -64,10 +64,8 @@ int openvt_main(int argc, char **argv)
fd = bb_xopen(vtname, O_RDWR);
/* Reassign stdout and sterr */
close(1);
close(2);
dup(fd);
dup(fd);
dup2(fd, STDOUT_FILENO);
dup2(fd, STDERR_FILENO);
execvp(argv[0], argv);
_exit(1);

12
console-tools/setconsole.c
View File

@ -37,9 +37,8 @@ static const struct option setconsole_long_options[] = {
int setconsole_main(int argc, char **argv)
{
int con;
unsigned long flags;
const char *device = "/dev/tty";
const char *device = CURRENT_TTY;
bb_applet_long_options = setconsole_long_options;
flags = bb_getopt_ulflags(argc, argv, "r");
@ -53,14 +52,11 @@ int setconsole_main(int argc, char **argv)
device = argv[optind];
} else {
if (flags & OPT_SETCONS_RESET)
device = "/dev/console";
device = CONSOLE_DEV;
}
if (-1 == (con = open(device, O_RDONLY))) {
bb_perror_msg_and_die("open %s", device);
}
if (-1 == ioctl(con, TIOCCONS)) {
bb_perror_msg_and_die("ioctl TIOCCONS");
if (-1 == ioctl(bb_xopen(device, O_RDONLY), TIOCCONS)) {
bb_perror_msg_and_die("TIOCCONS");
}
return EXIT_SUCCESS;
}