diff toys/posix/xargs.c @ 674:7e846e281e38

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.
author Rob Landley <rob@landley.net>
date Mon, 08 Oct 2012 00:02:30 -0500
parents 2986aa63a021
children 786841fdb1e0
line wrap: on
line diff
--- a/toys/posix/xargs.c	Sun Oct 07 23:53:25 2012 -0500
+++ b/toys/posix/xargs.c	Mon Oct 08 00:02:30 2012 -0500
@@ -29,9 +29,10 @@
 	  -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 @@
 	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 @@
 	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) {