From 6045cae71a438a752980a395f03717a13cc22179 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Thu, 15 Apr 2004 01:01:56 +0000
Subject: Import cvs-1.11.15

---
 contrib/cvs/diff/util.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'contrib/cvs/diff/util.c')

diff --git a/contrib/cvs/diff/util.c b/contrib/cvs/diff/util.c
index ff9cceb..744cf51 100644
--- a/contrib/cvs/diff/util.c
+++ b/contrib/cvs/diff/util.c
@@ -300,7 +300,7 @@ finish_output ()
   if (paginate_flag && outfile != 0 && outfile != stdout)
     {
 #ifdef PR_PROGRAM
-      int wstatus;
+      int wstatus, w;
       if (ferror (outfile))
 	fatal ("write error");
 # if ! HAVE_FORK
@@ -308,7 +308,9 @@ finish_output ()
 # else /* HAVE_FORK */
       if (fclose (outfile) != 0)
 	pfatal_with_name ("write error");
-      if (waitpid (pr_pid, &wstatus, 0) < 0)
+      while ((w = waitpid (pr_pid, &wstatus, 0)) < 0 && errno == EINTR)
+	;
+      if (w < 0)
 	pfatal_with_name ("waitpid");
 # endif /* HAVE_FORK */
       if (wstatus != 0)
-- 
cgit v1.1