From: Pavel Roskin Date: Thu, 14 Sep 2000 22:47:29 +0000 (-0000) Subject: For "askfirst" don't just read one char from stdin, X-Git-Tag: 0_47~73 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cbe05e45db168fabf807c3cf943a00ff81ec8279;p=oweals%2Fbusybox.git For "askfirst" don't just read one char from stdin, read the whole line using getc(), so that everything before Enter gets discarded. --- diff --git a/init.c b/init.c index 7af8c4a95..7e821f110 100644 --- a/init.c +++ b/init.c @@ -448,14 +448,13 @@ static pid_t run(char *command, char *terminal, int get_enter) * be allowed to start a shell or whatever an init script * specifies. */ - char c; #ifdef DEBUG_INIT pid_t shell_pgid = getpid(); message(LOG, "Waiting for enter to start '%s' (pid %d, console %s)\r\n", command, shell_pgid, terminal); #endif write(fileno(stdout), press_enter, sizeof(press_enter) - 1); - read(fileno(stdin), &c, 1); + getc(stdin); } #ifdef DEBUG_INIT diff --git a/init/init.c b/init/init.c index 7af8c4a95..7e821f110 100644 --- a/init/init.c +++ b/init/init.c @@ -448,14 +448,13 @@ static pid_t run(char *command, char *terminal, int get_enter) * be allowed to start a shell or whatever an init script * specifies. */ - char c; #ifdef DEBUG_INIT pid_t shell_pgid = getpid(); message(LOG, "Waiting for enter to start '%s' (pid %d, console %s)\r\n", command, shell_pgid, terminal); #endif write(fileno(stdout), press_enter, sizeof(press_enter) - 1); - read(fileno(stdin), &c, 1); + getc(stdin); } #ifdef DEBUG_INIT