aboutsummaryrefslogtreecommitdiff
path: root/toys/posix/xargs.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2012-10-08 00:02:30 -0500
committerRob Landley <rob@landley.net>2012-10-08 00:02:30 -0500
commitc0e56edaf256adb6c60c5a052525a1ffbb927901 (patch)
treed6bcc5c181ca46910a12d4dece4b26d6c71be3e1 /toys/posix/xargs.c
parentdc7a77d1940858495f76998f4d13cac9f73e0226 (diff)
downloadtoybox-c0e56edaf256adb6c60c5a052525a1ffbb927901.tar.gz
New build infrastructure to generate FLAG_ macros and TT alias, #define FOR_commandname before #including toys.h to trigger it. Rename DEFINE_GLOBALS() to just GLOBALS() (because I could never remember if it was DECLARE_GLOBALS). Convert existing commands to use new infrastructure, and replace optflag constants with FLAG_ macros where appropriate.
Diffstat (limited to 'toys/posix/xargs.c')
-rw-r--r--toys/posix/xargs.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/toys/posix/xargs.c b/toys/posix/xargs.c
index 0d513253..8f19d07f 100644
--- a/toys/posix/xargs.c
+++ b/toys/posix/xargs.c
@@ -29,9 +29,10 @@ config XARGS
-E stop at line matching string
*/
+#define FOR_xargs
#include "toys.h"
-DEFINE_GLOBALS(
+GLOBALS(
long max_bytes;
long max_entries;
long L;
@@ -42,8 +43,6 @@ DEFINE_GLOBALS(
char delim;
)
-#define TT this.xargs
-
// If out==NULL count TT.bytes and TT.entries, stopping at max.
// Otherwise, fill out out[]
@@ -105,7 +104,7 @@ void xargs_main(void)
int entries, bytes, done = 0, status;
char *data = NULL;
- if (!(toys.optflags&1)) TT.delim = '\n';
+ if (!(toys.optflags & FLAG_0)) TT.delim = '\n';
// If no optargs, call echo.
if (!toys.optc) {