more: make execute() more robust and timely

The wait() is now a little more robust by being more tolerate rogue SIGCHLDs
and unblocked signals.  The repeated fork() and sleep() is removed, if first
try does not success give up without delay to provide user timely feedback.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/text-utils/more.c b/text-utils/more.c
index 4fe20d2ad47bcd7826d065e02f8a40c63cd7c3f5..4a8abed8087ce7b78427cae6838ae9865f186622 100644 (file)
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -1084,16 +1084,14 @@ static void sigwinch_handler(struct more_control *ctl)
 
 static void execute(struct more_control *ctl, char *filename, char *cmd, ...)
 {
-       int id;
-       int n;
+       pid_t id;
        va_list argp;
        char *arg;
        char **args;
        int argcount;
 
        fflush(NULL);
-       for (n = 10; (id = fork()) < 0 && n > 0; n--)
-               sleep(5);
+       id = fork();
        if (id == 0) {
                int errsv;
                if (!isatty(STDIN_FILENO)) {
@@ -1137,8 +1135,11 @@ static void execute(struct more_control *ctl, char *filename, char *cmd, ...)
                exit(errsv == ENOENT ? EX_EXEC_ENOENT : EX_EXEC_FAILED);
        }
        if (id > 0) {
-               while (wait(NULL) > 0)
-                       /* nothing */ ;
+               errno = 0;
+               while (wait(NULL) > 0) {
+                       if (errno == EINTR)
+                               continue;
+               }
        } else
                fputs(_("can't fork\n"), stderr);
        set_tty(ctl);