From 9ddb45b12d140de263e53df5adef5b4bb352e418 Mon Sep 17 00:00:00 2001 From: Martijn Dekker Date: Wed, 3 Feb 2021 20:05:12 +0000 Subject: [PATCH] command -x: fix 'args list too long' on Linux, again (re: 8f5235a5) This time it was failing on a 64-bit Debian Linux system with very few and short environment variables. Sigh. src/cmd/ksh93/sh/path.c: - Combine the strategy from 63979488 with that of 8f5235a5. --- src/cmd/ksh93/sh/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/ksh93/sh/path.c b/src/cmd/ksh93/sh/path.c index b757dda37..675e474ac 100644 --- a/src/cmd/ksh93/sh/path.c +++ b/src/cmd/ksh93/sh/path.c @@ -162,7 +162,7 @@ static pid_t path_xargs(Shell_t *shp,const char *path, char *argv[],char *const pid_t pid; if(shp->xargmin < 0) return((pid_t)-1); - size = shp->gd->lim.arg_max - 2048; + size = shp->gd->lim.arg_max - (ARG_EXTRA_BYTES > 2 ? 1024*ARG_EXTRA_BYTES : 2048); for(ev=envp; cp= *ev; ev++) size -= 2 * (strlen(cp) + 1 + ARG_EXTRA_BYTES); for(av=argv; (cp= *av) && av< &argv[shp->xargmin]; av++)