X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fpidwait.c;h=d7dd1d79ac79362d65667b6f4e3dbb61e62b2b61;hp=ef42e1aa3d881523013fcc5d3776cbcb9cdb516e;hb=a485ed478abbd599d8c9aab48934e7a26733ecb1;hpb=f480c03187724e54e5391ee61b810827da319a6c diff --git a/sbr/pidwait.c b/sbr/pidwait.c index ef42e1a..d7dd1d7 100644 --- a/sbr/pidwait.c +++ b/sbr/pidwait.c @@ -1,4 +1,3 @@ - /* * pidwait.c -- wait for child to exit * @@ -19,38 +18,38 @@ int pidwait (pid_t id, int sigsok) { - pid_t pid; - SIGNAL_HANDLER istat = NULL, qstat = NULL; + pid_t pid; + SIGNAL_HANDLER istat = NULL, qstat = NULL; #ifdef HAVE_UNION_WAIT - union wait status; + union wait status; #else - int status; + int status; #endif - if (sigsok == -1) { - /* ignore a couple of signals */ - istat = SIGNAL (SIGINT, SIG_IGN); - qstat = SIGNAL (SIGQUIT, SIG_IGN); - } + if (sigsok == -1) { + /* ignore a couple of signals */ + istat = SIGNAL (SIGINT, SIG_IGN); + qstat = SIGNAL (SIGQUIT, SIG_IGN); + } #ifdef HAVE_WAITPID - while ((pid = waitpid(id, &status, 0)) == -1 && errno == EINTR) - ; + while ((pid = waitpid(id, &status, 0)) == -1 && errno == EINTR) + ; #else - while ((pid = wait(&status)) != -1 && pid != id) - continue; + while ((pid = wait(&status)) != -1 && pid != id) + continue; #endif - if (sigsok == -1) { - /* reset the signal handlers */ - SIGNAL (SIGINT, istat); - SIGNAL (SIGQUIT, qstat); - } + if (sigsok == -1) { + /* reset the signal handlers */ + SIGNAL (SIGINT, istat); + SIGNAL (SIGQUIT, qstat); + } #ifdef HAVE_UNION_WAIT - return (pid == -1 ? -1 : status.w_status); + return (pid == -1 ? -1 : status.w_status); #else - return (pid == -1 ? -1 : status); + return (pid == -1 ? -1 : status); #endif }