syslog() is a blocking call on eglibc. as procd provides the actual syslog, weneed...

[project/procd.git] / askfirst.c

diff --git a/askfirst.c b/askfirst.c
index 2f948f8..6ad77aa 100644 (file)
--- a/askfirst.c
+++ b/askfirst.c
@@ -31,10 +31,6 @@ static int redirect_output(const char *dev)
        if (fd < 0)
                return -1;
 
-       close(STDIN_FILENO);
-       close(STDOUT_FILENO);
-       close(STDERR_FILENO);
-
        dup2(fd, STDIN_FILENO);
        dup2(fd, STDOUT_FILENO);
        dup2(fd, STDERR_FILENO);
@@ -46,12 +42,19 @@ static int redirect_output(const char *dev)
 
 int main(int argc, char **argv)
 {
+       int c;
+
        if (redirect_output(argv[1]))
                fprintf(stderr, "%s: Failed to open %s\n", argv[0], argv[1]);
 
        printf("Please press Enter to activate this console.\n");
-       while (getchar() != 0xA)
-               ;
+       do {
+               c = getchar();
+               if (c == EOF)
+                       return -1;
+       }
+       while (c != 0xA);
+
        execvp(argv[2], &argv[2]);
        printf("%s: Failed to execute %s\n", argv[0], argv[2]);