wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-08 08:24:43 +07:00
Code Issues Packages Projects Releases Wiki Activity

tty.c: Minor cleanup and check global variable before dereferencing.

Browse Source 
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2013-05-19 19:01:44 +02:00
parent 3bcefd2160
commit 5d6db9f76f
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tty.c
+9 -7
View File
@@ -65,21 +65,23 @@ int tty_add(char *tty, int baud)
static void tty_startstop_one(finit_tty_t *tty, uint32_t mask)
{
char cmd[strlen(GETTY)+FILENAME_MAX];
int is_console = 0;
char cmd[strlen(GETTY) + FILENAME_MAX];
if (console && !strcmp(tty->name, console))
is_console = 1;
if (mask & IN_CREATE) {
_d("Starting %s as %s", tty->name, (strcmp(tty->name, console) == 0) ? "console" : "TTY");
_d("Starting %s as %s", tty->name, is_console ? "console" : "TTY");
snprintf(cmd, sizeof(cmd), GETTY, tty->name);
tty->pid = run_getty(cmd, strcmp(tty->name, console) == 0);
tty->pid = run_getty(cmd, is_console);
}
/* Kill the spawned child, and recollect it. */
if ((mask & IN_DELETE) && tty->pid) {
int status = 0;
_d("Stopping %s", tty->name);
kill(tty->pid, SIGKILL);
waitpid(tty->pid, &status, 0);
waitpid(tty->pid, NULL, 0);
tty->pid = 0;
}
}
@@ -107,7 +109,7 @@ static void tty_watcher(node_t *entry)
}
LIST_FOREACH(entry, &node_list, link) {
if (strcmp(notified->name, entry->data.name) == 0)
if (!strcmp(notified->name, entry->data.name))
tty_startstop_one(&entry->data, notified->mask);
}
}