From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Wed, 26 Feb 2014 14:27:10 +0000 (+0100)
Subject: find: code shrink
X-Git-Tag: 1_23_0~174
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6885e49ba596239a0b0d3631fd72fc2692fbb65c;p=oweals%2Fbusybox.git

find: code shrink

function                                             old     new   delta
func_exec                                            306     285     -21

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/findutils/find.c b/findutils/find.c
index 5d5e24bfb..044f010b0 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -420,12 +420,10 @@ static char* subst(const char *src, unsigned count, const char* filename)
 	size_t flen = strlen(filename);
 	/* we replace each '{}' with filename: growth by strlen-2 */
 	buf = dst = xmalloc(strlen(src) + count*(flen-2) + 1);
-	while ((end = strstr(src, "{}"))) {
-		memcpy(dst, src, end - src);
-		dst += end - src;
+	while ((end = strstr(src, "{}")) != NULL) {
+		dst = mempcpy(dst, src, end - src);
+		dst = mempcpy(dst, filename, flen);
 		src = end + 2;
-		memcpy(dst, filename, flen);
-		dst += flen;
 	}
 	strcpy(dst, src);
 	return buf;