Merge remote-tracking branch 'toybox/master' into HEADandroid-o-mr1-iot-preview-8o-mr1-iot-preview-8

Change-Id: I0eb171f19d30d818f4b856f164257c993a871ae7

5 files changed, 187 insertions, 187 deletions

diff --git a/generated/config.h b/generated/config.h
index 089b02ef..b666eb2a 100644
--- a/generated/config.h
+++ b/generated/config.h
@@ -138,6 +138,14 @@
 #define USE_DEBUG_DHCP(...)
 #define CFG_DECOMPRESS 0
 #define USE_DECOMPRESS(...)
+#define CFG_DEMO_MANY_OPTIONS 0
+#define USE_DEMO_MANY_OPTIONS(...)
+#define CFG_DEMO_NUMBER 0
+#define USE_DEMO_NUMBER(...)
+#define CFG_DEMO_SCANKEY 0
+#define USE_DEMO_SCANKEY(...)
+#define CFG_DEMO_UTF8TOWC 0
+#define USE_DEMO_UTF8TOWC(...)
 #define CFG_DF 1
 #define USE_DF(...) __VA_ARGS__
 #define CFG_DHCP6 0
@@ -548,16 +556,8 @@
 #define USE_TELNETD(...)
 #define CFG_TELNET 0
 #define USE_TELNET(...)
-#define CFG_TEST_HUMAN_READABLE 0
-#define USE_TEST_HUMAN_READABLE(...)
 #define CFG_TEST 0
 #define USE_TEST(...)
-#define CFG_TEST_MANY_OPTIONS 0
-#define USE_TEST_MANY_OPTIONS(...)
-#define CFG_TEST_SCANKEY 0
-#define USE_TEST_SCANKEY(...)
-#define CFG_TEST_UTF8TOWC 0
-#define USE_TEST_UTF8TOWC(...)
 #define CFG_TFTPD 0
 #define USE_TFTPD(...)
 #define CFG_TFTP 0
diff --git a/generated/flags.h b/generated/flags.h
index 8aaef1c4..7898c6d1 100644
--- a/generated/flags.h
+++ b/generated/flags.h
@@ -460,6 +460,94 @@
 #undef FOR_deallocvt
 #endif
 
+// demo_many_options   ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba
+#undef OPTSTR_demo_many_options
+#define OPTSTR_demo_many_options "ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba"
+#ifdef CLEANUP_demo_many_options
+#undef CLEANUP_demo_many_options
+#undef FOR_demo_many_options
+#undef FLAG_a
+#undef FLAG_b
+#undef FLAG_c
+#undef FLAG_d
+#undef FLAG_e
+#undef FLAG_f
+#undef FLAG_g
+#undef FLAG_h
+#undef FLAG_i
+#undef FLAG_j
+#undef FLAG_k
+#undef FLAG_l
+#undef FLAG_m
+#undef FLAG_n
+#undef FLAG_o
+#undef FLAG_p
+#undef FLAG_q
+#undef FLAG_r
+#undef FLAG_s
+#undef FLAG_t
+#undef FLAG_u
+#undef FLAG_v
+#undef FLAG_w
+#undef FLAG_x
+#undef FLAG_y
+#undef FLAG_z
+#undef FLAG_A
+#undef FLAG_B
+#undef FLAG_C
+#undef FLAG_D
+#undef FLAG_E
+#undef FLAG_F
+#undef FLAG_G
+#undef FLAG_H
+#undef FLAG_I
+#undef FLAG_J
+#undef FLAG_K
+#undef FLAG_L
+#undef FLAG_M
+#undef FLAG_N
+#undef FLAG_O
+#undef FLAG_P
+#undef FLAG_Q
+#undef FLAG_R
+#undef FLAG_S
+#undef FLAG_T
+#undef FLAG_U
+#undef FLAG_V
+#undef FLAG_W
+#undef FLAG_X
+#undef FLAG_Y
+#undef FLAG_Z
+#endif
+
+// demo_number   hdbs
+#undef OPTSTR_demo_number
+#define OPTSTR_demo_number "hdbs"
+#ifdef CLEANUP_demo_number
+#undef CLEANUP_demo_number
+#undef FOR_demo_number
+#undef FLAG_s
+#undef FLAG_b
+#undef FLAG_d
+#undef FLAG_h
+#endif
+
+// demo_scankey    
+#undef OPTSTR_demo_scankey
+#define OPTSTR_demo_scankey 0
+#ifdef CLEANUP_demo_scankey
+#undef CLEANUP_demo_scankey
+#undef FOR_demo_scankey
+#endif
+
+// demo_utf8towc    
+#undef OPTSTR_demo_utf8towc
+#define OPTSTR_demo_utf8towc 0
+#ifdef CLEANUP_demo_utf8towc
+#undef CLEANUP_demo_utf8towc
+#undef FOR_demo_utf8towc
+#endif
+
 // df HPkhit*a[-HPkh] HPkhit*a[-HPkh]
 #undef OPTSTR_df
 #define OPTSTR_df "HPkhit*a[-HPkh]"
@@ -1741,9 +1829,9 @@
 #undef FLAG_n
 #endif
 
-// netcat ^tlLw#W#p#s:q#f:[!tlL][!Lw] ^tlLw#W#p#s:q#f:[!tlL][!Lw]
+// netcat ^tlLw#<1W#<1p#<1>65535s:q#<1f:[!tlL][!Lw] ^tlLw#<1W#<1p#<1>65535s:q#<1f:[!tlL][!Lw]
 #undef OPTSTR_netcat
-#define OPTSTR_netcat "^tlLw#W#p#s:q#f:[!tlL][!Lw]"
+#define OPTSTR_netcat "^tlLw#<1W#<1p#<1>65535s:q#<1f:[!tlL][!Lw]"
 #ifdef CLEANUP_netcat
 #undef CLEANUP_netcat
 #undef FOR_netcat
@@ -2694,93 +2782,6 @@
 #undef FOR_test
 #endif
 
-// test_human_readable   <1>1ibs
-#undef OPTSTR_test_human_readable
-#define OPTSTR_test_human_readable "<1>1ibs"
-#ifdef CLEANUP_test_human_readable
-#undef CLEANUP_test_human_readable
-#undef FOR_test_human_readable
-#undef FLAG_s
-#undef FLAG_b
-#undef FLAG_i
-#endif
-
-// test_many_options   ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba
-#undef OPTSTR_test_many_options
-#define OPTSTR_test_many_options "ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba"
-#ifdef CLEANUP_test_many_options
-#undef CLEANUP_test_many_options
-#undef FOR_test_many_options
-#undef FLAG_a
-#undef FLAG_b
-#undef FLAG_c
-#undef FLAG_d
-#undef FLAG_e
-#undef FLAG_f
-#undef FLAG_g
-#undef FLAG_h
-#undef FLAG_i
-#undef FLAG_j
-#undef FLAG_k
-#undef FLAG_l
-#undef FLAG_m
-#undef FLAG_n
-#undef FLAG_o
-#undef FLAG_p
-#undef FLAG_q
-#undef FLAG_r
-#undef FLAG_s
-#undef FLAG_t
-#undef FLAG_u
-#undef FLAG_v
-#undef FLAG_w
-#undef FLAG_x
-#undef FLAG_y
-#undef FLAG_z
-#undef FLAG_A
-#undef FLAG_B
-#undef FLAG_C
-#undef FLAG_D
-#undef FLAG_E
-#undef FLAG_F
-#undef FLAG_G
-#undef FLAG_H
-#undef FLAG_I
-#undef FLAG_J
-#undef FLAG_K
-#undef FLAG_L
-#undef FLAG_M
-#undef FLAG_N
-#undef FLAG_O
-#undef FLAG_P
-#undef FLAG_Q
-#undef FLAG_R
-#undef FLAG_S
-#undef FLAG_T
-#undef FLAG_U
-#undef FLAG_V
-#undef FLAG_W
-#undef FLAG_X
-#undef FLAG_Y
-#undef FLAG_Z
-#endif
-
-// test_scankey    
-#undef OPTSTR_test_scankey
-#define OPTSTR_test_scankey 0
-#ifdef CLEANUP_test_scankey
-#undef CLEANUP_test_scankey
-#undef FOR_test_scankey
-#endif
-
-// test_utf8towc    
-#undef OPTSTR_test_utf8towc
-#define OPTSTR_test_utf8towc 0
-#ifdef CLEANUP_test_utf8towc
-#undef CLEANUP_test_utf8towc
-#undef FOR_test_utf8towc
-#endif
-
 // tftp   <1b#<8>65464r:l:g|p|[!gp]
 #undef OPTSTR_tftp
 #define OPTSTR_tftp "<1b#<8>65464r:l:g|p|[!gp]"
@@ -3657,6 +3658,86 @@
 #endif
 #endif
 
+#ifdef FOR_demo_many_options
+#ifndef TT
+#define TT this.demo_many_options
+#endif
+#define FLAG_a (FORCED_FLAG<<0)
+#define FLAG_b (FORCED_FLAG<<1)
+#define FLAG_c (FORCED_FLAG<<2)
+#define FLAG_d (FORCED_FLAG<<3)
+#define FLAG_e (FORCED_FLAG<<4)
+#define FLAG_f (FORCED_FLAG<<5)
+#define FLAG_g (FORCED_FLAG<<6)
+#define FLAG_h (FORCED_FLAG<<7)
+#define FLAG_i (FORCED_FLAG<<8)
+#define FLAG_j (FORCED_FLAG<<9)
+#define FLAG_k (FORCED_FLAG<<10)
+#define FLAG_l (FORCED_FLAG<<11)
+#define FLAG_m (FORCED_FLAG<<12)
+#define FLAG_n (FORCED_FLAG<<13)
+#define FLAG_o (FORCED_FLAG<<14)
+#define FLAG_p (FORCED_FLAG<<15)
+#define FLAG_q (FORCED_FLAG<<16)
+#define FLAG_r (FORCED_FLAG<<17)
+#define FLAG_s (FORCED_FLAG<<18)
+#define FLAG_t (FORCED_FLAG<<19)
+#define FLAG_u (FORCED_FLAG<<20)
+#define FLAG_v (FORCED_FLAG<<21)
+#define FLAG_w (FORCED_FLAG<<22)
+#define FLAG_x (FORCED_FLAG<<23)
+#define FLAG_y (FORCED_FLAG<<24)
+#define FLAG_z (FORCED_FLAG<<25)
+#define FLAG_A (FORCED_FLAG<<26)
+#define FLAG_B (FORCED_FLAG<<27)
+#define FLAG_C (FORCED_FLAG<<28)
+#define FLAG_D (FORCED_FLAG<<29)
+#define FLAG_E (FORCED_FLAG<<30)
+#define FLAG_F (FORCED_FLAG<<31)
+#define FLAG_G (FORCED_FLAGLL<<32)
+#define FLAG_H (FORCED_FLAGLL<<33)
+#define FLAG_I (FORCED_FLAGLL<<34)
+#define FLAG_J (FORCED_FLAGLL<<35)
+#define FLAG_K (FORCED_FLAGLL<<36)
+#define FLAG_L (FORCED_FLAGLL<<37)
+#define FLAG_M (FORCED_FLAGLL<<38)
+#define FLAG_N (FORCED_FLAGLL<<39)
+#define FLAG_O (FORCED_FLAGLL<<40)
+#define FLAG_P (FORCED_FLAGLL<<41)
+#define FLAG_Q (FORCED_FLAGLL<<42)
+#define FLAG_R (FORCED_FLAGLL<<43)
+#define FLAG_S (FORCED_FLAGLL<<44)
+#define FLAG_T (FORCED_FLAGLL<<45)
+#define FLAG_U (FORCED_FLAGLL<<46)
+#define FLAG_V (FORCED_FLAGLL<<47)
+#define FLAG_W (FORCED_FLAGLL<<48)
+#define FLAG_X (FORCED_FLAGLL<<49)
+#define FLAG_Y (FORCED_FLAGLL<<50)
+#define FLAG_Z (FORCED_FLAGLL<<51)
+#endif
+
+#ifdef FOR_demo_number
+#ifndef TT
+#define TT this.demo_number
+#endif
+#define FLAG_s (FORCED_FLAG<<0)
+#define FLAG_b (FORCED_FLAG<<1)
+#define FLAG_d (FORCED_FLAG<<2)
+#define FLAG_h (FORCED_FLAG<<3)
+#endif
+
+#ifdef FOR_demo_scankey
+#ifndef TT
+#define TT this.demo_scankey
+#endif
+#endif
+
+#ifdef FOR_demo_utf8towc
+#ifndef TT
+#define TT this.demo_utf8towc
+#endif
+#endif
+
 #ifdef FOR_df
 #ifndef TT
 #define TT this.df
@@ -5537,85 +5618,6 @@
 #endif
 #endif
 
-#ifdef FOR_test_human_readable
-#ifndef TT
-#define TT this.test_human_readable
-#endif
-#define FLAG_s (FORCED_FLAG<<0)
-#define FLAG_b (FORCED_FLAG<<1)
-#define FLAG_i (FORCED_FLAG<<2)
-#endif
-
-#ifdef FOR_test_many_options
-#ifndef TT
-#define TT this.test_many_options
-#endif
-#define FLAG_a (FORCED_FLAG<<0)
-#define FLAG_b (FORCED_FLAG<<1)
-#define FLAG_c (FORCED_FLAG<<2)
-#define FLAG_d (FORCED_FLAG<<3)
-#define FLAG_e (FORCED_FLAG<<4)
-#define FLAG_f (FORCED_FLAG<<5)
-#define FLAG_g (FORCED_FLAG<<6)
-#define FLAG_h (FORCED_FLAG<<7)
-#define FLAG_i (FORCED_FLAG<<8)
-#define FLAG_j (FORCED_FLAG<<9)
-#define FLAG_k (FORCED_FLAG<<10)
-#define FLAG_l (FORCED_FLAG<<11)
-#define FLAG_m (FORCED_FLAG<<12)
-#define FLAG_n (FORCED_FLAG<<13)
-#define FLAG_o (FORCED_FLAG<<14)
-#define FLAG_p (FORCED_FLAG<<15)
-#define FLAG_q (FORCED_FLAG<<16)
-#define FLAG_r (FORCED_FLAG<<17)
-#define FLAG_s (FORCED_FLAG<<18)
-#define FLAG_t (FORCED_FLAG<<19)
-#define FLAG_u (FORCED_FLAG<<20)
-#define FLAG_v (FORCED_FLAG<<21)
-#define FLAG_w (FORCED_FLAG<<22)
-#define FLAG_x (FORCED_FLAG<<23)
-#define FLAG_y (FORCED_FLAG<<24)
-#define FLAG_z (FORCED_FLAG<<25)
-#define FLAG_A (FORCED_FLAG<<26)
-#define FLAG_B (FORCED_FLAG<<27)
-#define FLAG_C (FORCED_FLAG<<28)
-#define FLAG_D (FORCED_FLAG<<29)
-#define FLAG_E (FORCED_FLAG<<30)
-#define FLAG_F (FORCED_FLAG<<31)
-#define FLAG_G (FORCED_FLAGLL<<32)
-#define FLAG_H (FORCED_FLAGLL<<33)
-#define FLAG_I (FORCED_FLAGLL<<34)
-#define FLAG_J (FORCED_FLAGLL<<35)
-#define FLAG_K (FORCED_FLAGLL<<36)
-#define FLAG_L (FORCED_FLAGLL<<37)
-#define FLAG_M (FORCED_FLAGLL<<38)
-#define FLAG_N (FORCED_FLAGLL<<39)
-#define FLAG_O (FORCED_FLAGLL<<40)
-#define FLAG_P (FORCED_FLAGLL<<41)
-#define FLAG_Q (FORCED_FLAGLL<<42)
-#define FLAG_R (FORCED_FLAGLL<<43)
-#define FLAG_S (FORCED_FLAGLL<<44)
-#define FLAG_T (FORCED_FLAGLL<<45)
-#define FLAG_U (FORCED_FLAGLL<<46)
-#define FLAG_V (FORCED_FLAGLL<<47)
-#define FLAG_W (FORCED_FLAGLL<<48)
-#define FLAG_X (FORCED_FLAGLL<<49)
-#define FLAG_Y (FORCED_FLAGLL<<50)
-#define FLAG_Z (FORCED_FLAGLL<<51)
-#endif
-
-#ifdef FOR_test_scankey
-#ifndef TT
-#define TT this.test_scankey
-#endif
-#endif
-
-#ifdef FOR_test_utf8towc
-#ifndef TT
-#define TT this.test_utf8towc
-#endif
-#endif
-
 #ifdef FOR_tftp
 #ifndef TT
 #define TT this.tftp
diff --git a/generated/globals.h b/generated/globals.h
index 7e265db1..1edc2f02 100644
--- a/generated/globals.h
+++ b/generated/globals.h
@@ -735,8 +735,6 @@ struct mke2fs_data {
   unsigned nextblock;    // Next data block to allocate
   unsigned nextgroup;    // Next group we'll be allocating from
   int fsfd;              // File descriptor of filesystem (to output to).
-
-  struct ext2_superblock sb;
 };
 
 // toys/pending/modprobe.c
diff --git a/generated/help.h b/generated/help.h
index b13d1151..c3f5bb40 100644
--- a/generated/help.h
+++ b/generated/help.h
@@ -64,13 +64,13 @@
 
 #define HELP_hello "usage: hello\n\nA hello world program.\n\nMostly used as a simple template for adding new commands.\nOccasionally nice to smoketest kernel booting via \"init=/usr/bin/hello\".\n\n"
 
-#define HELP_test_utf8towc "usage: test_utf8towc\n\nPrint differences between toybox's utf8 conversion routines vs libc du jour.\n\n"
+#define HELP_demo_utf8towc "usage: demo_utf8towc\n\nPrint differences between toybox's utf8 conversion routines vs libc du jour.\n\n"
 
-#define HELP_test_scankey "usage: test_scankey\n\nMove a letter around the screen. Hit ESC to exit.\n\n"
+#define HELP_demo_scankey "usage: demo_scankey\n\nMove a letter around the screen. Hit ESC to exit.\n\n"
 
-#define HELP_test_many_options "usage: test_many_options -[a-zA-Z]\n\nPrint the optflags value of the command arguments, in hex.\n\n"
+#define HELP_demo_number "usage: demo_number [-hsbi] NUMBER...\n\n-b	Use \"B\" for single byte units (HR_B)\n-d	Decimal units\n-h	human readable\n-s	Space between number and units (HR_SPACE)\n\n"
 
-#define HELP_test_human_readable "usage: test_human_readable [-sbi] NUMBER\n\n"
+#define HELP_demo_many_options "usage: demo_many_options -[a-zA-Z]\n\nPrint the optflags value of the command arguments, in hex.\n\n"
 
 #define HELP_umount "usage: umount [-a [-t TYPE[,TYPE...]]] [-vrfD] [DIR...]\n\nUnmount the listed filesystems.\n\n-a	Unmount all mounts in /proc/mounts instead of command line list\n-D  Don't free loopback device(s)\n-f  Force unmount\n-l  Lazy unmount (detach from filesystem now, close when last user does)\n-n	Don't use /proc/mounts\n-r  Remount read only if unmounting fails\n-t	Restrict \"all\" to mounts of TYPE (or use \"noTYPE\" to skip)\n-v	Verbose\n\n\n"
 
diff --git a/generated/newtoys.h b/generated/newtoys.h
index 0f7b3a0e..3d0b9a44 100644
--- a/generated/newtoys.h
+++ b/generated/newtoys.h
@@ -45,6 +45,10 @@ USE_DD(NEWTOY(dd, 0, TOYFLAG_USR|TOYFLAG_BIN))
 USE_DEALLOCVT(NEWTOY(deallocvt, ">1", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_NEEDROOT))
 USE_GROUPDEL(OLDTOY(delgroup, groupdel, TOYFLAG_NEEDROOT|TOYFLAG_SBIN))
 USE_USERDEL(OLDTOY(deluser, userdel, TOYFLAG_NEEDROOT|TOYFLAG_SBIN))
+USE_DEMO_MANY_OPTIONS(NEWTOY(demo_many_options, "ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba", TOYFLAG_BIN))
+USE_DEMO_NUMBER(NEWTOY(demo_number, "hdbs", TOYFLAG_BIN))
+USE_DEMO_SCANKEY(NEWTOY(demo_scankey, 0, TOYFLAG_BIN))
+USE_DEMO_UTF8TOWC(NEWTOY(demo_utf8towc, 0, TOYFLAG_USR|TOYFLAG_BIN))
 USE_DF(NEWTOY(df, "HPkhit*a[-HPkh]", TOYFLAG_SBIN))
 USE_DHCP(NEWTOY(dhcp, "V:H:F:x*r:O*A#<0=20T#<0=3t#<0=3s:p:i:SBRCaovqnbf", TOYFLAG_SBIN|TOYFLAG_ROOTONLY))
 USE_DHCP6(NEWTOY(dhcp6, "r:A#<0T#<0t#<0s:p:i:SRvqnbf", TOYFLAG_SBIN|TOYFLAG_ROOTONLY))
@@ -157,7 +161,7 @@ USE_MV(NEWTOY(mv, "<2vnF(remove-destination)fi[-ni]", TOYFLAG_BIN))
 USE_NBD_CLIENT(OLDTOY(nbd-client, nbd_client, TOYFLAG_USR|TOYFLAG_BIN))
 USE_NBD_CLIENT(NEWTOY(nbd_client, "<3>3ns", 0))
 USE_NETCAT(OLDTOY(nc, netcat, TOYFLAG_USR|TOYFLAG_BIN))
-USE_NETCAT(NEWTOY(netcat, USE_NETCAT_LISTEN("^tlL")"w#W#p#s:q#f:"USE_NETCAT_LISTEN("[!tlL][!Lw]"), TOYFLAG_BIN))
+USE_NETCAT(NEWTOY(netcat, USE_NETCAT_LISTEN("^tlL")"w#<1W#<1p#<1>65535s:q#<1f:"USE_NETCAT_LISTEN("[!tlL][!Lw]"), TOYFLAG_BIN))
 USE_NETSTAT(NEWTOY(netstat, "pWrxwutneal", TOYFLAG_BIN))
 USE_NICE(NEWTOY(nice, "^<1n#", TOYFLAG_USR|TOYFLAG_BIN))
 USE_NL(NEWTOY(nl, "v#<1=1l#b:n:s:w#<0=6E", TOYFLAG_BIN))
@@ -238,10 +242,6 @@ USE_TEE(NEWTOY(tee, "ia", TOYFLAG_USR|TOYFLAG_BIN))
 USE_TELNET(NEWTOY(telnet, "<1>2", TOYFLAG_BIN))
 USE_TELNETD(NEWTOY(telnetd, "w#<0b:p#<0>65535=23f:l:FSKi[!wi]", TOYFLAG_USR|TOYFLAG_BIN))
 USE_TEST(NEWTOY(test, NULL, TOYFLAG_USR|TOYFLAG_BIN))
-USE_TEST_HUMAN_READABLE(NEWTOY(test_human_readable, "<1>1ibs", TOYFLAG_BIN))
-USE_TEST_MANY_OPTIONS(NEWTOY(test_many_options, "ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba", TOYFLAG_BIN))
-USE_TEST_SCANKEY(NEWTOY(test_scankey, 0, TOYFLAG_BIN))
-USE_TEST_UTF8TOWC(NEWTOY(test_utf8towc, 0, TOYFLAG_USR|TOYFLAG_BIN))
 USE_TFTP(NEWTOY(tftp, "<1b#<8>65464r:l:g|p|[!gp]", TOYFLAG_USR|TOYFLAG_BIN))
 USE_TFTPD(NEWTOY(tftpd, "rcu:l", TOYFLAG_BIN))
 USE_TIME(NEWTOY(time, "<1^pv", TOYFLAG_USR|TOYFLAG_BIN))