[pkgsrc/trunk]: pkgsrc/devel/bmake/files r1.180 from src: Explain what max is...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/deb511bad264
branches:  trunk
changeset: 650001:deb511bad264
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Apr 16 13:34:14 2015 +0000

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

diffstat:

 devel/bmake/files/job.c |  22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r b9c5c8994c64 -r deb511bad264 devel/bmake/files/job.c
--- a/devel/bmake/files/job.c   Thu Apr 16 11:40:43 2015 +0000
+++ b/devel/bmake/files/job.c   Thu Apr 16 13:34:14 2015 +0000
@@ -1,4 +1,4 @@
-/*     $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.
@@ -70,14 +70,14 @@
  */
 
 #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
@@ -1893,10 +1893,18 @@
                (void)fflush(stdout);
            }
        }
-       assert(i < max);
-       /* shift the remaining characters down */
-       (void)memmove(job->outBuf, &job->outBuf[i + 1], max - (i + 1));
-       job->curPos = max - (i + 1);
+       /*
+        * max is the last offset still in the buffer. Move any remaining
+        * characters to the start of the buffer and update the end marker
+        * 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) {
        /*