Refactor, convert struct tty members to static strings

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2018-03-18 19:19:45 +01:00
parent 406339e755
commit e9670b87b3
4 changed files with 8 additions and 14 deletions
+1 -1
View File
@@ -363,7 +363,7 @@ pid_t run_getty(char *tty, char *baud, char *term, int noclear, int nowait, stru
if (!pid) {
speed_t speed = B38400;
if (baud) {
if (baud && baud[0]) {
speed = stty_parse_speed(baud);
if (B0 == speed)
logit(LOG_CRIT, "TTY %s: Invalid speed %s", tty, baud);
+1 -1
View File
@@ -237,7 +237,7 @@ int getty(char *tty, speed_t speed, char *term, char *user)
stty(fd, speed);
close(fd);
if (term)
if (term && term[0])
setenv("TERM", term, 1);
return do_login(name);
+3 -9
View File
@@ -238,9 +238,9 @@ int tty_register(char *line, struct rlimit rlimit[], char *file)
}
}
entry->name = dev;
entry->baud = baud ? strdup(baud) : NULL;
entry->term = term ? strdup(term) : NULL;
strlcpy(entry->name, dev, sizeof(entry->name));
strlcpy(entry->baud, baud ? baud : "", sizeof(entry->baud));
strlcpy(entry->term, term ? term : "", sizeof(entry->term));
entry->noclear = noclear;
entry->nowait = nowait;
entry->nologin = nologin;
@@ -290,12 +290,6 @@ int tty_unregister(struct tty *tty)
LIST_REMOVE(tty, link);
if (tty->name)
free(tty->name);
if (tty->baud)
free(tty->baud);
if (tty->term)
free(tty->term);
if (tty->cmd) {
int i;
+3 -3
View File
@@ -35,9 +35,9 @@
struct tty {
LIST_ENTRY(tty) link;
char *name;
char *baud;
char *term;
char name[42];
char baud[10];
char term[10];
int noclear;
int nowait;
int nologin;