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

cttyhack: add missing ';'

Browse Source 
init: remove pointless access() check
This commit is contained in:
Denis Vlasenko 2007-12-10 08:40:29 +00:00
parent 2afabe8b83
commit d7e2e127a9
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
init/init.c
View File

@ -513,11 +513,13 @@ static void run_actions(int action)
for (a = init_action_list; a; a = tmp) {
tmp = a->next;
if (a->action == action) {
/* a->terminal of "" means "init's console" */
if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) {
//message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/);
delete_init_action(a);
} else if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
// Pointless: run() will error out if open of device fails.
///* a->terminal of "" means "init's console" */
//if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) {
// //message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/);
// delete_init_action(a);
//} else
if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
waitfor(run(a));
delete_init_action(a);
} else if (a->action & ONCE) {

2
shell/cttyhack.c
View File

@ -69,7 +69,7 @@ int cttyhack_main(int argc, char **argv)
dup2(fd, 2);
while (fd > 2) close(fd--);
/* Some other session may have it as ctty. Steal it from them */
ioctl(0, TIOCSCTTY, 1)
ioctl(0, TIOCSCTTY, 1);
}
BB_EXECVP(argv[0], argv);