From e2d874fb89ba980663a6248b867b7668512ea8a3 Mon Sep 17 00:00:00 2001
From: joerg <joerg@NetBSD.org>
Date: Thu, 16 Apr 2015 11:39:23 +0000
Subject: [PATCH] Don't use memcpy for overlapping ranges. Simplify, memmove is
 good enough to skip empty ranges.

---
 usr.bin/make/job.c | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 8a8f6ef9234f..6a0052229362 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: job.c,v 1.178 2015/04/09 18:21:01 sjg Exp $	*/
+/*	$NetBSD: job.c,v 1.179 2015/04/16 11:39:23 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.178 2015/04/09 18:21:01 sjg Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.179 2015/04/16 11:39:23 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.178 2015/04/09 18:21:01 sjg Exp $");
+__RCSID("$NetBSD: job.c,v 1.179 2015/04/16 11:39:23 joerg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1878,18 +1878,10 @@ end_loop:
 		(void)fflush(stdout);
 	    }
 	}
-	if (i < max - 1) {
-	    /* shift the remaining characters down */
-	    (void)memcpy(job->outBuf, &job->outBuf[i + 1], max - (i + 1));
-	    job->curPos = max - (i + 1);
-
-	} else {
-	    /*
-	     * We have written everything out, so we just start over
-	     * from the start of the buffer. No copying. No nothing.
-	     */
-	    job->curPos = 0;
-	}
+	assert(i < max);
+	/* shift the remaining characters down */
+	(void)memmove(job->outBuf, &job->outBuf[i + 1], max - (i + 1));
+	job->curPos = max - (i + 1);
     }
     if (finish) {
 	/*