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

Add support for @console to external getty in tty_register()

Browse Source 
- Refactor code to figure out device so it works for both the built-in
  and external getty code paths
- Fix memory leak when user edits an existing tty device
- Replace @console in argument list to external getty

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2020-01-06 19:05:20 +01:00
parent 00a2840853
commit c19489d6c3
1 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tty.c
+27 -17
View File
@@ -153,8 +153,12 @@ int tty_register(char *line, struct rlimit rlimit[], char *file)
/* Iterate over all args */
for (i = 0; i < num; i++) {
/* First, figure out if built-in or external */
if (!dev && !cmd) {
/*
* First, figure out if built-in or external getty
* tty [12345] /dev/ttyAMA0 115200 noclear vt220 # built-in
* tty [12345] /sbin/getty -L 115200 @console vt100 noclear # external
*/
if ((!cmd && !dev) || (cmd && !dev)) {
if (args[i][0] == '[')
runlevels = line;
if (!strcmp(args[i], "@console"))
@@ -171,7 +175,7 @@ int tty_register(char *line, struct rlimit rlimit[], char *file)
}
/* Built-in getty args */
if (dev) {
if (!cmd && dev) {
if (isdigit(args[i][0])) {
baud = args[i];
continue;
@@ -184,15 +188,6 @@ int tty_register(char *line, struct rlimit rlimit[], char *file)
if (i + 1 == num)
term = args[i];
}
/* External getty, figure out the device */
if (cmd) {
if (!strncmp(args[i], "/dev", 4))
dev = args[i];
if (!strncmp(args[i], "tty", 3))
dev = args[i];
}
}
if (!dev) {
@@ -226,18 +221,27 @@ again:
dev = canonicalize(dev);
if (!dev)
goto error;
dev = strdup(dev);
entry = tty_find(dev);
if (!entry) {
insert = 1;
entry = calloc(1, sizeof(*entry));
if (!entry) {
free(dev);
if (cmd)
free(cmd);
return errno = ENOMEM;
}
insert = 1;
} else {
if (entry->cmd) {
free(entry->cmd);
entry->cmd = NULL;
for (i = 0; i < TTY_MAX_ARGS; i++) {
if (entry->args[i])
free(entry->args[i]);
entry->args[i] = NULL;
}
}
insert = 0;
}
strlcpy(entry->name, dev, sizeof(entry->name));
@@ -260,8 +264,14 @@ again:
entry->cmd = cmd;
args[1] = strdup(tok);
for (i = 1; i < num; i++)
entry->args[j++] = strdup(args[i]);
for (i = 1; i < num; i++) {
char *arg = args[i];
/* Replace @console with actual device */
if (arg && !strcmp(arg, "@console"))
arg = dev;
entry->args[j++] = strdup(arg);
}
entry->args[++j] = NULL;
}