From ab1a2529f3cdc4675d44e7e2805a3919c3105ac4 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Tue, 7 Oct 2025 12:46:06 -0500 Subject: [PATCH] Update scripts/prereq prebuilt headers for xargs -a --- scripts/prereq/generated/config.h | 3 --- scripts/prereq/generated/flags.h | 6 ++++-- scripts/prereq/generated/globals.h | 2 +- scripts/prereq/generated/newtoys.h | 5 ++--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/prereq/generated/config.h b/scripts/prereq/generated/config.h index 0da29fc5..51262376 100644 --- a/scripts/prereq/generated/config.h +++ b/scripts/prereq/generated/config.h @@ -922,9 +922,6 @@ #define CFG_SHA512SUM 0 #define USE_SHA512SUM(...) #define SKIP_SHA512SUM(...) __VA_ARGS__ -#define CFG_B3SUM 0 -#define USE_B3SUM(...) -#define SKIP_B3SUM(...) __VA_ARGS__ #define CFG_MKNOD 0 #define USE_MKNOD(...) #define SKIP_MKNOD(...) __VA_ARGS__ diff --git a/scripts/prereq/generated/flags.h b/scripts/prereq/generated/flags.h index e9d761f9..76ed5935 100644 --- a/scripts/prereq/generated/flags.h +++ b/scripts/prereq/generated/flags.h @@ -401,9 +401,9 @@ #undef FLAG_L #endif -// xargs ^E:P#<0(null)=1optr(no-run-if-empty)n#<1(max-args)s#0[!0E] ^E:P#<0(null)=1optr(no-run-if-empty)n#<1(max-args)s#0[!0E] +// xargs ^a:E:P#<0(null)=1optr(no-run-if-empty)n#<1(max-args)s#0[!0E] ^a:E:P#<0(null)=1optr(no-run-if-empty)n#<1(max-args)s#0[!0E] #undef OPTSTR_xargs -#define OPTSTR_xargs "^E:P#<0(null)=1optr(no-run-if-empty)n#<1(max-args)s#0[!0E]" +#define OPTSTR_xargs "^a:E:P#<0(null)=1optr(no-run-if-empty)n#<1(max-args)s#0[!0E]" #ifdef CLEANUP_xargs #undef CLEANUP_xargs #undef FOR_xargs @@ -416,6 +416,7 @@ #undef FLAG_o #undef FLAG_P #undef FLAG_E +#undef FLAG_a #endif #ifdef FOR_basename @@ -805,6 +806,7 @@ #define FLAG_o (1LL<<6) #define FLAG_P (1LL<<7) #define FLAG_E (1LL<<8) +#define FLAG_a (1LL<<9) #endif #undef OPTSTR_ascii diff --git a/scripts/prereq/generated/globals.h b/scripts/prereq/generated/globals.h index 464bfd70..82ae5c3c 100644 --- a/scripts/prereq/generated/globals.h +++ b/scripts/prereq/generated/globals.h @@ -126,7 +126,7 @@ struct wc_data { struct xargs_data { long s, n, P; - char *E; + char *E, *a; long entries, bytes, np; char delim; diff --git a/scripts/prereq/generated/newtoys.h b/scripts/prereq/generated/newtoys.h index 43fbc3cf..ebe49dc1 100644 --- a/scripts/prereq/generated/newtoys.h +++ b/scripts/prereq/generated/newtoys.h @@ -9,7 +9,6 @@ USE_SH(OLDTOY([[, test, TOYFLAG_NOFORK|TOYFLAG_NOHELP)) USE_GROUPADD(OLDTOY(addgroup, groupadd, TOYFLAG_NEEDROOT|TOYFLAG_SBIN)) USE_USERADD(OLDTOY(adduser, useradd, TOYFLAG_NEEDROOT|TOYFLAG_UMASK|TOYFLAG_SBIN)) USE_ASCII(NEWTOY(ascii, 0, TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LINEBUF)) -USE_B3SUM(OLDTOY(b3sum, md5sum, TOYFLAG_USR|TOYFLAG_BIN)) USE_BASE32(NEWTOY(base32, "diw#<0=76[!dw]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LINEBUF)) USE_BASE64(NEWTOY(base64, "diw#<0=76[!dw]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LINEBUF)) USE_BASENAME(NEWTOY(basename, "^<1as:", TOYFLAG_USR|TOYFLAG_BIN)) @@ -27,7 +26,7 @@ USE_USERDEL(OLDTOY(deluser, userdel, TOYFLAG_NEEDROOT|TOYFLAG_SBIN)) USE_DEMO_UTF8TOWC(NEWTOY(demo_utf8towc, 0, TOYFLAG_USR|TOYFLAG_BIN)) USE_DIRNAME(NEWTOY(dirname, "<1", TOYFLAG_USR|TOYFLAG_BIN)) USE_DUMPLEASES(NEWTOY(dumpleases, ">0arf:[!ar]", TOYFLAG_USR|TOYFLAG_BIN)) -USE_ECHO(NEWTOY(echo, "^?Een[-eE]", TOYFLAG_BIN|TOYFLAG_MAYFORK|TOYFLAG_LINEBUF|TOYFLAG_NOHELP)) +USE_ECHO(NEWTOY(echo, "^?Een[-eE]", TOYFLAG_BIN|TOYFLAG_MAYFORK|TOYFLAG_LINEBUF)) USE_EGREP(OLDTOY(egrep, grep, TOYFLAG_BIN|TOYFLAG_ARGFAIL(2)|TOYFLAG_LINEBUF|TOYFLAG_AUTOCONF)) USE_FALLOCATE(NEWTOY(fallocate, ">1l#|o#", TOYFLAG_USR|TOYFLAG_BIN)) USE_FALSE(NEWTOY(false, NULL, TOYFLAG_BIN|TOYFLAG_NOHELP|TOYFLAG_MAYFORK)) @@ -122,6 +121,6 @@ USE_WC(NEWTOY(wc, "Lcmwl", TOYFLAG_USR|TOYFLAG_BIN)) USE_WGET(NEWTOY(wget, "<1>1(max-redirect)#<0=20d(debug)O(output-document):p(post-data):", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_MOREHELP(CFG_WGET_LIBTLS|CFG_TOYBOX_LIBCRYPTO))) USE_WHICH(NEWTOY(which, "<1a", TOYFLAG_USR|TOYFLAG_BIN)) USE_WHOAMI(OLDTOY(whoami, logname, TOYFLAG_USR|TOYFLAG_BIN)) -USE_XARGS(NEWTOY(xargs, "^E:P#<0(null)=1optr(no-run-if-empty)n#<1(max-args)s#0[!0E]", TOYFLAG_USR|TOYFLAG_BIN)) +USE_XARGS(NEWTOY(xargs, "^a:E:P#<0(null)=1optr(no-run-if-empty)n#<1(max-args)s#0[!0E]", TOYFLAG_USR|TOYFLAG_BIN)) USE_XZCAT(NEWTOY(xzcat, NULL, TOYFLAG_USR|TOYFLAG_BIN)) USE_ZCAT(NEWTOY(zcat, "cdfkt123456789[-123456789]", TOYFLAG_USR|TOYFLAG_BIN)) -- 2.39.5