oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init: handle getty string of "" (default)

Browse Source 
. the default entry for disabled ttys for getty
	  in /etc/ttys is "", but init crashed on handling that
	  string.

Change-Id: Ib7cd6c6869e338f47df0aa5abed36f15eda4f6ff
This commit is contained in:
Ben Gras 2013-06-11 14:30:31 +00:00
parent 93d9caa2d6
commit 63306d0ad5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
servers/init/init.c
View File

@ -263,15 +263,16 @@ void startup(int linenr, struct ttyent *ttyp)
/* Construct argv for execute() */ /* Construct argv for execute() */
ty_getty_argv = construct_argv(ttyp->ty_getty); ty_getty_argv = construct_argv(ttyp->ty_getty);
if (ty_getty_argv == NULL) if (ty_getty_argv == NULL) {
report(2, "construct_argv"); report(2, "construct_argv");
} else {
/* Execute the getty process. */ /* Execute the getty process. */
execute(ty_getty_argv); execute(ty_getty_argv);
}
/* Oops, disaster strikes. */ /* Oops, disaster strikes. */
fcntl(2, F_SETFL, fcntl(2, F_GETFL) | O_NONBLOCK); fcntl(2, F_SETFL, fcntl(2, F_GETFL) | O_NONBLOCK);
if (linenr != 0) report(2, ty_getty_argv[0]); if (linenr != 0 && ty_getty_argv) report(2, ty_getty_argv[0]);
write(err[1], &errno, sizeof(errno)); write(err[1], &errno, sizeof(errno));
_exit(1); _exit(1);
} }