Minor, coding style fixes

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2025-02-23 04:05:55 +01:00
1 parent 6552cda605
commit a677b94ad9
2 files changed
+6 -5

No files matched your search

+3 -3
View File
@@ -199,7 +199,6 @@ int run(char *cmd, char *log)
int run_interactive(char *cmd, char *fmt, ...) int run_interactive(char *cmd, char *fmt, ...)
{ {
int status, oldout = 1, olderr = 2; int status, oldout = 1, olderr = 2;
char line[LINE_SIZE];
FILE *fp; FILE *fp;
if (!cmd) { if (!cmd) {
@@ -244,6 +243,7 @@ int run_interactive(char *cmd, char *fmt, ...)
/* Dump any results of cmd on stderr after we've printed [ OK ] or [FAIL] */ /* Dump any results of cmd on stderr after we've printed [ OK ] or [FAIL] */
if (fp && !debug) { if (fp && !debug) {
char line[LINE_SIZE];
size_t len, written; size_t len, written;
rewind(fp); rewind(fp);
@@ -281,7 +281,7 @@ int exec_runtask(char *cmd, char *args[])
return execvp(_PATH_BSHELL, argv); return execvp(_PATH_BSHELL, argv);
} }
static void prepare_tty(char *tty, speed_t speed, char *procname, struct rlimit rlimit[]) static void prepare_tty(char *tty, speed_t speed, const char *procname, struct rlimit rlimit[])
{ {
char name[80]; char name[80];
int fd, dummy; int fd, dummy;
@@ -351,7 +351,7 @@ static int activate_console(int noclear, int nowait)
dprint(STDERR_FILENO, clr, strlen(clr)); dprint(STDERR_FILENO, clr, strlen(clr));
dprint(STDERR_FILENO, msg, strlen(msg)); dprint(STDERR_FILENO, msg, strlen(msg));
while ((rc = read(STDIN_FILENO, &ch, 1)) > 0 && ch != '\r' && ch != '\n') while ((rc = read(STDIN_FILENO, &ch, 1)) > 0 && ch != '\r' && ch != '\n')
continue; ;
/* On any error (likely EINTR), we avoid starting getty */ /* On any error (likely EINTR), we avoid starting getty */
if (rc == -1) if (rc == -1)
+3 -2
View File
@@ -229,8 +229,9 @@ int tty_parse_args(struct tty *tty, char *cmd, char **args)
return errno = EINVAL; return errno = EINVAL;
} }
dbg("Registering %s getty on TTY %s at %s baud with term %s", tty->cmd ? "external" : "built-in", dbg("Registering %s getty on TTY %s at %s baud with term %s",
tty->dev, tty->baud ?: "0", tty->term ?: "N/A"); tty->cmd ? "external" : "built-in",
tty->dev, tty->baud ?: "0", tty->term ?: "N/A");
/* Built-in getty now comes as standalone program */ /* Built-in getty now comes as standalone program */
if (!tty->cmd) { if (!tty->cmd) {