Build various 'pending' toybox commands that are in toolbox.
The stuff in pending isn't built by default, so anything we want from
there we have to explicitly choose. Stuff that's already in toolbox
seems like stuff we should be building so we can try it out.
Change-Id: Iabd069fbbfb2805a771958faa2ef2f6d5f0cb333
diff --git a/.config b/.config
index dfa6129..e6c417b 100644
--- a/.config
+++ b/.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# ToyBox version: KCONFIG_VERSION
-# Tue Dec 16 15:46:21 2014
+# Tue Dec 16 19:52:55 2014
#
CONFIG_TOYBOX_CONTAINER=y
CONFIG_TOYBOX_FIFREEZE=y
@@ -102,7 +102,7 @@
# CONFIG_GUNZIP is not set
# CONFIG_CROND is not set
# CONFIG_CRONTAB is not set
-# CONFIG_DD is not set
+CONFIG_DD=y
# CONFIG_DHCP is not set
# CONFIG_DHCPD is not set
# CONFIG_DEBUG_DHCP is not set
@@ -137,16 +137,16 @@
# CONFIG_MKE2FS_EXTENDED is not set
# CONFIG_MODPROBE is not set
CONFIG_MORE=y
-# CONFIG_NETSTAT is not set
+CONFIG_NETSTAT=y
# CONFIG_NSENTER is not set
# CONFIG_OPENVT is not set
# CONFIG_DEALLOCVT is not set
# CONFIG_PGREP is not set
# CONFIG_PING is not set
# CONFIG_PRINTF is not set
-# CONFIG_PS is not set
+CONFIG_PS=y
# CONFIG_RESET is not set
-# CONFIG_ROUTE is not set
+CONFIG_ROUTE=y
# CONFIG_SED is not set
# CONFIG_SH is not set
# CONFIG_SH_INTERACTIVE is not set
@@ -160,8 +160,8 @@
# CONFIG_TELNETD is not set
# CONFIG_TEST is not set
# CONFIG_TFTPD is not set
-# CONFIG_TOP is not set
-# CONFIG_TRACEROUTE is not set
+CONFIG_TOP=y
+CONFIG_TRACEROUTE=y
# CONFIG_TR is not set
# CONFIG_USERADD is not set
# CONFIG_USERDEL is not set
diff --git a/Android.mk b/Android.mk
index 662bd41..8070438 100644
--- a/Android.mk
+++ b/Android.mk
@@ -116,7 +116,13 @@
toys/other/which.c \
toys/other/yes.c \
toys/pending/chcon.c \
+ toys/pending/dd.c \
toys/pending/more.c \
+ toys/pending/ps.c \
+ toys/pending/netstat.c \
+ toys/pending/route.c \
+ toys/pending/top.c \
+ toys/pending/traceroute.c \
toys/posix/basename.c \
toys/posix/cal.c \
toys/posix/cat.c \
diff --git a/generated/config.h b/generated/config.h
index 04852e9..1d71b87 100644
--- a/generated/config.h
+++ b/generated/config.h
@@ -180,8 +180,8 @@
#define USE_CROND(...)
#define CFG_CRONTAB 0
#define USE_CRONTAB(...)
-#define CFG_DD 0
-#define USE_DD(...)
+#define CFG_DD 1
+#define USE_DD(...) __VA_ARGS__
#define CFG_DHCP 0
#define USE_DHCP(...)
#define CFG_DHCPD 0
@@ -250,8 +250,8 @@
#define USE_MODPROBE(...)
#define CFG_MORE 1
#define USE_MORE(...) __VA_ARGS__
-#define CFG_NETSTAT 0
-#define USE_NETSTAT(...)
+#define CFG_NETSTAT 1
+#define USE_NETSTAT(...) __VA_ARGS__
#define CFG_NSENTER 0
#define USE_NSENTER(...)
#define CFG_OPENVT 0
@@ -264,12 +264,12 @@
#define USE_PING(...)
#define CFG_PRINTF 0
#define USE_PRINTF(...)
-#define CFG_PS 0
-#define USE_PS(...)
+#define CFG_PS 1
+#define USE_PS(...) __VA_ARGS__
#define CFG_RESET 0
#define USE_RESET(...)
-#define CFG_ROUTE 0
-#define USE_ROUTE(...)
+#define CFG_ROUTE 1
+#define USE_ROUTE(...) __VA_ARGS__
#define CFG_SED 0
#define USE_SED(...)
#define CFG_SH 0
@@ -296,10 +296,10 @@
#define USE_TEST(...)
#define CFG_TFTPD 0
#define USE_TFTPD(...)
-#define CFG_TOP 0
-#define USE_TOP(...)
-#define CFG_TRACEROUTE 0
-#define USE_TRACEROUTE(...)
+#define CFG_TOP 1
+#define USE_TOP(...) __VA_ARGS__
+#define CFG_TRACEROUTE 1
+#define USE_TRACEROUTE(...) __VA_ARGS__
#define CFG_TR 0
#define USE_TR(...)
#define CFG_USERADD 0
diff --git a/generated/flags.h b/generated/flags.h
index b078099..bfd6a69 100644
--- a/generated/flags.h
+++ b/generated/flags.h
@@ -1167,7 +1167,7 @@
#undef FLAG_t
#endif
-// netstat pWrxwutneal
+// netstat pWrxwutneal pWrxwutneal
#ifdef CLEANUP_netstat
#undef CLEANUP_netstat
#undef FOR_netstat
@@ -1367,7 +1367,7 @@
#undef FOR_printf
#endif
-// ps >0o*T
+// ps >0o*T >0o*T
#ifdef CLEANUP_ps
#undef CLEANUP_ps
#undef FOR_ps
@@ -1472,7 +1472,7 @@
#undef FLAG_w
#endif
-// route ?neA:
+// route ?neA: ?neA:
#ifdef CLEANUP_route
#undef CLEANUP_route
#undef FOR_route
@@ -1835,7 +1835,7 @@
#undef FLAG_k
#endif
-// top >0d#=3n#<1mb
+// top >0d#=3n#<1mb >0d#=3n#<1mb
#ifdef CLEANUP_top
#undef CLEANUP_top
#undef FOR_top
@@ -1873,7 +1873,7 @@
#undef FLAG_C
#endif
-// traceroute <1>2i:f#<1>255=1z#<0>86400=0g*w#<0>86400=5t#<0>255=0s:q#<1>255=3p#<1>65535=33434m#<1>255=30rvndlIUF64
+// traceroute <1>2i:f#<1>255=1z#<0>86400=0g*w#<0>86400=5t#<0>255=0s:q#<1>255=3p#<1>65535=33434m#<1>255=30rvndlIUF64 <1>2i:f#<1>255=1z#<0>86400=0g*w#<0>86400=5t#<0>255=0s:q#<1>255=3p#<1>65535=33434m#<1>255=30rvndlIUF64
#ifdef CLEANUP_traceroute
#undef CLEANUP_traceroute
#undef FOR_traceroute
@@ -3286,17 +3286,17 @@
#ifndef TT
#define TT this.netstat
#endif
-#define FLAG_l 0
-#define FLAG_a 0
-#define FLAG_e 0
-#define FLAG_n 0
-#define FLAG_t 0
-#define FLAG_u 0
-#define FLAG_w 0
-#define FLAG_x 0
-#define FLAG_r 0
-#define FLAG_W 0
-#define FLAG_p 0
+#define FLAG_l (1<<0)
+#define FLAG_a (1<<1)
+#define FLAG_e (1<<2)
+#define FLAG_n (1<<3)
+#define FLAG_t (1<<4)
+#define FLAG_u (1<<5)
+#define FLAG_w (1<<6)
+#define FLAG_x (1<<7)
+#define FLAG_r (1<<8)
+#define FLAG_W (1<<9)
+#define FLAG_p (1<<10)
#endif
#ifdef FOR_nice
@@ -3486,8 +3486,8 @@
#ifndef TT
#define TT this.ps
#endif
-#define FLAG_T 0
-#define FLAG_o 0
+#define FLAG_T (1<<0)
+#define FLAG_o (1<<1)
#endif
#ifdef FOR_pwd
@@ -3591,9 +3591,9 @@
#ifndef TT
#define TT this.route
#endif
-#define FLAG_A 0
-#define FLAG_e 0
-#define FLAG_n 0
+#define FLAG_A (1<<0)
+#define FLAG_e (1<<1)
+#define FLAG_n (1<<2)
#endif
#ifdef FOR_sed
@@ -3954,10 +3954,10 @@
#ifndef TT
#define TT this.top
#endif
-#define FLAG_b 0
-#define FLAG_m 0
-#define FLAG_n 0
-#define FLAG_d 0
+#define FLAG_b (1<<0)
+#define FLAG_m (1<<1)
+#define FLAG_n (1<<2)
+#define FLAG_d (1<<3)
#endif
#ifdef FOR_touch
@@ -3992,26 +3992,26 @@
#ifndef TT
#define TT this.traceroute
#endif
-#define FLAG_4 0
-#define FLAG_6 0
-#define FLAG_F 0
-#define FLAG_U 0
-#define FLAG_I 0
-#define FLAG_l 0
-#define FLAG_d 0
-#define FLAG_n 0
-#define FLAG_v 0
-#define FLAG_r 0
-#define FLAG_m 0
-#define FLAG_p 0
-#define FLAG_q 0
-#define FLAG_s 0
-#define FLAG_t 0
-#define FLAG_w 0
-#define FLAG_g 0
-#define FLAG_z 0
-#define FLAG_f 0
-#define FLAG_i 0
+#define FLAG_4 (1<<0)
+#define FLAG_6 (1<<1)
+#define FLAG_F (1<<2)
+#define FLAG_U (1<<3)
+#define FLAG_I (1<<4)
+#define FLAG_l (1<<5)
+#define FLAG_d (1<<6)
+#define FLAG_n (1<<7)
+#define FLAG_v (1<<8)
+#define FLAG_r (1<<9)
+#define FLAG_m (1<<10)
+#define FLAG_p (1<<11)
+#define FLAG_q (1<<12)
+#define FLAG_s (1<<13)
+#define FLAG_t (1<<14)
+#define FLAG_w (1<<15)
+#define FLAG_g (1<<16)
+#define FLAG_z (1<<17)
+#define FLAG_f (1<<18)
+#define FLAG_i (1<<19)
#endif
#ifdef FOR_true