aboutsummaryrefslogtreecommitdiff
path: root/toys/posix/od.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/od.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/od.c')
-rw-r--r--toys/posix/od.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/toys/posix/od.c b/toys/posix/od.c
index 3c84cb51..ef420b87 100644
--- a/toys/posix/od.c
+++ b/toys/posix/od.c
@@ -19,20 +19,10 @@ config OD
-t output type(s) a (ascii) c (char) d (decimal) foux
*/
+#define FOR_od
#include "toys.h"
-#define FLAG_t (1 << 0)
-#define FLAG_A (1 << 1)
-#define FLAG_b (1 << 2)
-#define FLAG_c (1 << 3)
-#define FLAG_d (1 << 4)
-#define FLAG_o (1 << 5)
-#define FLAG_s (1 << 6)
-#define FLAG_x (1 << 7)
-#define FLAG_N (1 << 8)
-#define FLAG_v (1 << 9)
-
-DEFINE_GLOBALS(
+GLOBALS(
struct arg_list *output_base;
char *address_base;
long max_count;
@@ -44,8 +34,6 @@ DEFINE_GLOBALS(
off_t pos;
)
-#define TT this.od
-
static char *ascii = "nulsohstxetxeotenqackbel bs ht nl vt ff cr so si"
"dledc1dc2dc3dc4naksynetbcan emsubesc fs gs rs us sp";