Rework some of the -I support so I can't find a way to make xargs(1) core or

corrupt memory.  Simplifies the code in one or two places, also removes some
code that looks like it was bogus or incomplete.

Update strnsubst to have one or two extra conditions which maybe would make
it more efficient, or at least more versatile.  This is likely a no-op.

1 files changed, 5 insertions, 0 deletions

diff --git a/usr.bin/xargs/strnsubst.c b/usr.bin/xargs/strnsubst.c
index a06197ea72cc..bb8b20e193a5 100644
--- a/usr.bin/xargs/strnsubst.c
+++ b/usr.bin/xargs/strnsubst.c
@@ -38,6 +38,11 @@ strnsubst(char **str, const char *match, const char *replstr, size_t maxsize)
 	if (s2 == NULL)
 		err(1, "calloc");
 
+	if (match == NULL || replstr == NULL || maxsize == strlen(*str)) {
+		strlcpy(s2, s1, maxsize);
+		goto done;
+	}
+
 	for (;;) {
 		char *this;