Thu Apr 16 13:34:14 2015 UTC ()

r1.180 from src: Explain what max is and handle i reaching it again.


(joerg)

diff -r1.14 -r1.15 pkgsrc/devel/bmake/files/job.c

--- pkgsrc/devel/bmake/files/job.c 2015/04/16 11:40:43 1.14
+++ pkgsrc/devel/bmake/files/job.c 2015/04/16 13:34:14 1.15

 @@ -1,14 +1,14 @@
-/*	$NetBSD: job.c,v 1.14 2015/04/16 11:40:43 joerg Exp $	*/
+/*	$NetBSD: job.c,v 1.15 2015/04/16 13:34:14 joerg Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,34 +60,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.14 2015/04/16 11:40:43 joerg Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.15 2015/04/16 13:34:14 joerg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)job.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: job.c,v 1.14 2015/04/16 11:40:43 joerg Exp $");
+__RCSID("$NetBSD: job.c,v 1.15 2015/04/16 13:34:14 joerg Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * job.c --
  *	handle the creation etc. of our child processes.
+ *
  * Interface:
  *	Job_Make  	    	Start the creation of the given target.
+ *
  *	Job_CatchChildren   	Check for and handle the termination of any
  *	    	  	    	children. This must be called reasonably
 @@ -1883,30 +1883,38 @@ end_loop:
 		if (!beSilent && job->node != lastNode) {
 		    MESSAGE(stdout, job->node);
 		    lastNode = job->node;
+		}
 #ifdef USE_META
 		if (useMeta) {
 		    meta_job_output(job, cp, gotNL ? "\n" : "");
+		}
 #endif
 		(void)fprintf(stdout, "%s%s", cp, gotNL ? "\n" : "");
 		(void)fflush(stdout);
+	    }
+	}
-	assert(i < max);
+	/*
-	/* shift the remaining characters down */
+	 * max is the last offset still in the buffer. Move any remaining
-	(void)memmove(job->outBuf, &job->outBuf[i + 1], max - (i + 1));
+	 * characters to the start of the buffer and update the end marker
-	job->curPos = max - (i + 1);
+	 * curPos.
 	 */
 	if (i < max) {
 	    (void)memmove(job->outBuf, &job->outBuf[i + 1], max - (i + 1));
 	    job->curPos = max - (i + 1);
 	} else {
 	    assert(i == max);
 	    job->curPos = 0;
+	}
+    }
     if (finish) {
 	/*
 	 * If the finish flag is true, we must loop until we hit
 	 * end-of-file on the pipe. This is guaranteed to happen
 	 * eventually since the other end of the pipe is now closed
 	 * (we closed it explicitly and the child has exited). When
 	 * we do get an EOF, finish will be set FALSE and we'll fall
 	 * through and out.
 	 */
 	goto end_loop;
+    }
+}