From 8e486d5282ebca8583e427d168030ca6b2d5815e Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Fri, 27 Mar 2015 22:45:03 +0100
Subject: [PATCH] xargs: minor optimizations

---
 xargs.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/xargs.c b/xargs.c
index d39679e..de09ae9 100644
--- a/xargs.c
+++ b/xargs.c
@@ -234,12 +234,13 @@ main(int argc, char *argv[])
 			}
 		} else {
 			cmd[i] = estrdup("/bin/echo");
-			argsz += strlen(cmd[i]) + 1;
+			argsz += strlen("/bin/echo") + 1;
 			i++;
 		}
 		while (leftover || (arg = poparg())) {
-			if (argsz + strlen(arg) + 1 > argmaxsz || i >= NARGS - 1) {
-				if (strlen(arg) + 1 > argmaxsz) {
+			arglen = strlen(arg);
+			if (argsz + arglen >= argmaxsz || i >= NARGS - 1) {
+				if (arglen >= argmaxsz) {
 					weprintf("insufficient argument space\n");
 					if (xflag)
 						exit(1);
@@ -248,7 +249,7 @@ main(int argc, char *argv[])
 				break;
 			}
 			cmd[i] = estrdup(arg);
-			argsz += strlen(cmd[i]) + 1;
+			argsz += arglen + 1;
 			i++;
 			a++;
 			leftover = 0;