diff toys/posix/tee.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 6df4ccc0acbe
children 786841fdb1e0
line wrap: on
line diff
--- a/toys/posix/tee.c	Sun Oct 07 23:53:25 2012 -0500
+++ b/toys/posix/tee.c	Mon Oct 08 00:02:30 2012 -0500
@@ -21,14 +21,13 @@
       -i	ignore SIGINT.
 */
 
+#define FOR_tee
 #include "toys.h"
 
-DEFINE_GLOBALS(
+GLOBALS(
     void *outputs;
 )
 
-#define TT this.tee
-
 struct fd_list {
     struct fd_list *next;
     int fd;
@@ -48,12 +47,12 @@
 
 void tee_main(void)
 {
-    if (toys.optflags&2) signal(SIGINT, SIG_IGN);
+    if (toys.optflags & FLAG_i) signal(SIGINT, SIG_IGN);
 
     // Open output files
     loopfiles_rw(toys.optargs,
-		O_RDWR|O_CREAT|((toys.optflags&1)?O_APPEND:O_TRUNC), 0666, 0,
-		do_tee_open);
+		O_RDWR|O_CREAT|((toys.optflags & FLAG_a)?O_APPEND:O_TRUNC),
+		0666, 0, do_tee_open);
 
     for (;;) {
         struct fd_list *fdl;