From: Cristian Rodríguez <crrodriguez@opensuse.org>
Date: Thu, 19 Jan 2023 18:25:08 +0000 (+0000)
Subject: replace open-coded instances of mempcpy
X-Git-Tag: v2.39-rc1~148
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cba3345215b62d9cf0d7a03816fb8f006dd47d21;p=thirdparty%2Futil-linux.git

replace open-coded instances of mempcpy
---

diff --git a/lib/buffer.c b/lib/buffer.c
index 4bab52c043..fda2fc8aa5 100644
--- a/lib/buffer.c
+++ b/lib/buffer.c
@@ -6,6 +6,7 @@
  */
 #include "buffer.h"
 #include "mbsalign.h"
+#include "strutils.h"
 
 void ul_buffer_reset_data(struct ul_buffer *buf)
 {
@@ -147,8 +148,7 @@ int ul_buffer_append_data(struct ul_buffer *buf, const char *data, size_t sz)
 	if (!buf->end)
 		return -EINVAL;	/* make static analyzers happy */
 
-	memcpy(buf->end, data, sz);
-	buf->end += sz;
+	buf->end = mempcpy(buf->end, data, sz);
 	*buf->end = '\0';	/* make sure it's terminated */
 	return 0;
 }
diff --git a/lib/canonicalize.c b/lib/canonicalize.c
index ccf52558f7..d181a14e9d 100644
--- a/lib/canonicalize.c
+++ b/lib/canonicalize.c
@@ -19,6 +19,7 @@
 #include "canonicalize.h"
 #include "pathnames.h"
 #include "all-io.h"
+#include "strutils.h"
 
 /*
  * Converts private "dm-N" names to "/dev/mapper/<name>"
@@ -110,8 +111,7 @@ char *absolute_path(const char *path)
 	if (!res)
 		return NULL;
 
-	memcpy(p, cwd, csz);
-	p += csz;
+	p = mempcpy(p, cwd, csz);
 	*p++ = '/';
 	memcpy(p, path, psz + 1);
 
diff --git a/lib/mbsalign.c b/lib/mbsalign.c
index e251202afb..fbb6f157e2 100644
--- a/lib/mbsalign.c
+++ b/lib/mbsalign.c
@@ -305,8 +305,7 @@ char *mbs_invalid_encode_to_buffer(const char *s, size_t *width, char *buf)
 			r += 4;
 			*width += 4;
 		} else {
-			memcpy(r, p, len);
-			r += len;
+			r = mempcpy(r, p, len);
 			*width += wcwidth(wc);
 		}
 		p += len;
diff --git a/libblkid/src/devno.c b/libblkid/src/devno.c
index 74a0d982e2..d35c807da2 100644
--- a/libblkid/src/devno.c
+++ b/libblkid/src/devno.c
@@ -35,6 +35,7 @@
 #include "blkidP.h"
 #include "pathnames.h"
 #include "sysfs.h"
+#include "strutils.h"
 
 static char *blkid_strconcat(const char *a, const char *b, const char *c)
 {
@@ -52,16 +53,13 @@ static char *blkid_strconcat(const char *a, const char *b, const char *c)
 	if (!res)
 		return NULL;
 	if (al) {
-		memcpy(p, a, al);
-		p += al;
+		p = mempcpy(p, a, al);
 	}
 	if (bl) {
-		memcpy(p, b, bl);
-		p += bl;
+		p = mempcpy(p, b, bl);
 	}
 	if (cl) {
-		memcpy(p, c, cl);
-		p += cl;
+		p = mempcpy(p, c, cl);
 	}
 	*p = '\0';
 	return res;
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index dae2361389..ef089a8ca3 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -403,12 +403,10 @@ static int append_str(char **res, size_t *sz, const char *a, const char *b)
 	str += *sz;
 
 	if (a) {
-		memcpy(str, a, asz);
-		str += asz;
+		str = mempcpy(str, a, asz);
 	}
 	if (b) {
-		memcpy(str, b, bsz);
-		str += bsz;
+		str = mempcpy(str, b, bsz);
 	}
 	*str = '\0';
 	*sz = len;
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index f7a88a3093..d840475312 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -618,13 +618,11 @@ static char *replace_u(char *str, char *username)
 
 		if (p != str) {
 			/* copy chars before \u */
-			memcpy(tp, str, p - str);
-			tp += p - str;
+			tp = mempcpy(tp, str, p - str);
 		}
 		if (usz) {
 			/* copy username */
-			memcpy(tp, username, usz);
-			tp += usz;
+			tp = mempcpy(tp, username, usz);
 		}
 		if (*(p + 2))
 			/* copy chars after \u + \0 */
@@ -2972,8 +2970,7 @@ static ssize_t append(char *dest, size_t len, const char  *sep, const char *src)
 
 	p = dest + dsz;
 	if (ssz) {
-		memcpy(p, sep, ssz);
-		p += ssz;
+		p = mempcpy(p, sep, ssz);
 	}
 	memcpy(p, src, sz);
 	*(p + sz) = '\0';