emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- use the defines CURRENT_TTY and VC_1; also shrink xargs a tiny bit:

Browse Source 
add/remove: 0/0 grow/shrink: 2/6 up/down: 5/-37 (-32)
function                                     old     new   delta
static.add_interface                         271     274      +3
static.glob3                                  36      38      +2
static.renice_main                           409     408      -1
static.readcmd                              1083    1081      -2
static.changepath                            176     174      -2
static.parse_opts                             56      51      -5
static.rx_main                              1095    1088      -7
static.xargs_main                            759     739     -20
----------------------------------------------------------------
Result                                                :-)    -32
This commit is contained in:
Bernhard Reutner-Fischer 2006-05-27 09:36:43 +00:00
parent 8bb50782a5
commit 95a040fac8
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
console-tools/setlogcons.c
View File

@ -27,7 +27,7 @@ extern int setlogcons_main(int argc, char **argv)
if (argc == 2)
arg.subarg = atoi(argv[1]);
if (ioctl(bb_xopen("/dev/tty1", O_RDONLY), TIOCLINUX, &arg))
if (ioctl(bb_xopen(VC_1, O_RDONLY), TIOCLINUX, &arg))
bb_perror_msg_and_die("TIOCLINUX");;
return 0;

4
findutils/xargs.c
View File

@ -311,9 +311,7 @@ static int xargs_ask_confirmation(void)
int c, savec;
if (!tty_stream) {
tty_stream = fopen("/dev/tty", "r");
if (!tty_stream)
bb_perror_msg_and_die("/dev/tty");
tty_stream = bb_xfopen(CURRENT_TTY, "r");
/* pranoidal security by vodz */
fcntl(fileno(tty_stream), F_SETFD, FD_CLOEXEC);
}

2
miscutils/rx.c
View File

@ -290,7 +290,7 @@ int rx_main(int argc, char **argv)
bb_show_usage();
fn = argv[1];
ttyfd = bb_xopen3("/dev/tty", O_RDWR, 0);
ttyfd = bb_xopen3(CURRENT_TTY, O_RDWR, 0);
filefd = bb_xopen3(fn, O_RDWR|O_CREAT|O_TRUNC, 0666);
if (tcgetattr(ttyfd, &tty) < 0)