From 3952f20c24ff3eed2ef6f4a9abd2d8a0aaa34a6e Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 13 Aug 2007 14:10:24 +0000 Subject: expand, unexpand: new applets from Tito --- include/applets.h | 2 ++ include/usage.h | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) (limited to 'include') diff --git a/include/applets.h b/include/applets.h index b5b9fc884..f92ce4b13 100644 --- a/include/applets.h +++ b/include/applets.h @@ -134,6 +134,7 @@ USE_ENV(APPLET(env, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_ENVDIR(APPLET_ODDNAME(envdir, chpst, _BB_DIR_USR_BIN, _BB_SUID_NEVER, envdir)) USE_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, _BB_DIR_USR_BIN, _BB_SUID_NEVER, envuidgid)) USE_ETHER_WAKE(APPLET_ODDNAME(ether-wake, ether_wake, _BB_DIR_USR_BIN, _BB_SUID_NEVER, ether_wake)) +USE_EXPAND(APPLET(expand, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_EXPR(APPLET(expr, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_FAKEIDENTD(APPLET(fakeidentd, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) USE_FALSE(APPLET_NOFORK(false, false, _BB_DIR_BIN, _BB_SUID_NEVER, false)) @@ -345,6 +346,7 @@ USE_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_NEVER, ud USE_UMOUNT(APPLET(umount, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_UNAME(APPLET(uname, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_UNCOMPRESS(APPLET(uncompress, _BB_DIR_BIN, _BB_SUID_NEVER)) +USE_UNEXPAND(APPLET_ODDNAME(unexpand, expand, _BB_DIR_USR_BIN, _BB_SUID_NEVER, unexpand)) USE_UNIQ(APPLET(uniq, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_UNIX2DOS(APPLET_ODDNAME(unix2dos, dos2unix, _BB_DIR_USR_BIN, _BB_SUID_NEVER, unix2dos)) USE_UNLZMA(APPLET(unlzma, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) diff --git a/include/usage.h b/include/usage.h index f5025b70a..d01e3e4f3 100644 --- a/include/usage.h +++ b/include/usage.h @@ -844,6 +844,16 @@ " -i iface Use interface ifname instead of the default \"eth0\"\n" \ " -p pass Append the four or six byte password PW to the packet" +#define expand_trivial_usage \ + "[-i] [-t NUM] [FILE|-]" +#define expand_full_usage \ + "Convert tabs to spaces, writing to standard output." \ + "\n\nOptions:" \ + "\n -i" USE_FEATURE_EXPAND_LONG_OPTIONS(",--initial") \ + " Do not convert tabs after non blanks" \ + "\n -t" USE_FEATURE_EXPAND_LONG_OPTIONS(",--tabs=N") \ + " Tabstops every N chars" + #define expr_trivial_usage \ "EXPRESSION" #define expr_full_usage \ @@ -3707,6 +3717,18 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when " -c Extract to stdout\n" \ " -f Force overwrite an existing file" +#define unexpand_trivial_usage \ + "[-f][-a][-t NUM] [FILE|-]" +#define unexpand_full_usage \ + "Convert spaces to tabs, writing to standard output." \ + "\n\nOptions:" \ + "\n -a" USE_FEATURE_UNEXPAND_LONG_OPTIONS(",--all") \ + " Convert all blanks" \ + "\n -f" USE_FEATURE_UNEXPAND_LONG_OPTIONS(",--first-only") \ + " Convert only leading sequences of blanks" \ + "\n -t" USE_FEATURE_UNEXPAND_LONG_OPTIONS(",--tabs=N") \ + " Tabstops every N chars" + #define uniq_trivial_usage \ "[-fscdu]... [INPUT [OUTPUT]]" #define uniq_full_usage \ -- cgit v1.2.3