Start building toybox ps.
This lets you use "toybox ps" if you want, but "ps" is still a symbolic link
to the toolbox ps.
Change-Id: I82e4b94d68009640a3e69e0d349dc81aa84c50fd
diff --git a/.config b/.config
index 3e13c02..b557195 100644
--- a/.config
+++ b/.config
@@ -74,6 +74,7 @@
CONFIG_PASTE=y
CONFIG_PATCH=y
CONFIG_PRINTF=y
+CONFIG_PS=y
CONFIG_PWD=y
CONFIG_RENICE=y
CONFIG_RM=y
@@ -160,7 +161,6 @@
# CONFIG_DEALLOCVT is not set
CONFIG_PGREP=y
# CONFIG_PING is not set
-# CONFIG_PS is not set
# CONFIG_RESET is not set
CONFIG_ROUTE=y
# CONFIG_SH is not set
diff --git a/Android.mk b/Android.mk
index bbca322..9b1abef 100644
--- a/Android.mk
+++ b/Android.mk
@@ -179,6 +179,7 @@
toys/posix/paste.c \
toys/posix/patch.c \
toys/posix/printf.c \
+ toys/posix/ps.c \
toys/posix/pwd.c \
toys/posix/renice.c \
toys/posix/rm.c \
diff --git a/generated/config.h b/generated/config.h
index ae22ece..fdab2e0 100644
--- a/generated/config.h
+++ b/generated/config.h
@@ -134,6 +134,8 @@
#define USE_PATCH(...) __VA_ARGS__
#define CFG_PRINTF 1
#define USE_PRINTF(...) __VA_ARGS__
+#define CFG_PS 1
+#define USE_PS(...) __VA_ARGS__
#define CFG_PWD 1
#define USE_PWD(...) __VA_ARGS__
#define CFG_RENICE 1
@@ -298,8 +300,6 @@
#define USE_PGREP(...) __VA_ARGS__
#define CFG_PING 0
#define USE_PING(...)
-#define CFG_PS 0
-#define USE_PS(...)
#define CFG_RESET 0
#define USE_RESET(...)
#define CFG_ROUTE 1
diff --git a/generated/flags.h b/generated/flags.h
index 9b223ed..87ea902 100644
--- a/generated/flags.h
+++ b/generated/flags.h
@@ -1823,9 +1823,9 @@
#undef FOR_printf
#endif
-// ps aAdeflo*p*s*t*u*U*g*G*w[!ol][+Ae]
+// ps aAdeflo*p*s*t*u*U*g*G*w[!ol][+Ae] aAdeflo*p*s*t*u*U*g*G*w[!ol][+Ae]
#undef OPTSTR_ps
-#define OPTSTR_ps 0
+#define OPTSTR_ps "aAdeflo*p*s*t*u*U*g*G*w[!ol][+Ae]"
#ifdef CLEANUP_ps
#undef CLEANUP_ps
#undef FOR_ps
@@ -4347,21 +4347,21 @@
#ifndef TT
#define TT this.ps
#endif
-#define FLAG_w (FORCED_FLAG<<0)
-#define FLAG_G (FORCED_FLAG<<1)
-#define FLAG_g (FORCED_FLAG<<2)
-#define FLAG_U (FORCED_FLAG<<3)
-#define FLAG_u (FORCED_FLAG<<4)
-#define FLAG_t (FORCED_FLAG<<5)
-#define FLAG_s (FORCED_FLAG<<6)
-#define FLAG_p (FORCED_FLAG<<7)
-#define FLAG_o (FORCED_FLAG<<8)
-#define FLAG_l (FORCED_FLAG<<9)
-#define FLAG_f (FORCED_FLAG<<10)
-#define FLAG_e (FORCED_FLAG<<11)
-#define FLAG_d (FORCED_FLAG<<12)
-#define FLAG_A (FORCED_FLAG<<13)
-#define FLAG_a (FORCED_FLAG<<14)
+#define FLAG_w (1<<0)
+#define FLAG_G (1<<1)
+#define FLAG_g (1<<2)
+#define FLAG_U (1<<3)
+#define FLAG_u (1<<4)
+#define FLAG_t (1<<5)
+#define FLAG_s (1<<6)
+#define FLAG_p (1<<7)
+#define FLAG_o (1<<8)
+#define FLAG_l (1<<9)
+#define FLAG_f (1<<10)
+#define FLAG_e (1<<11)
+#define FLAG_d (1<<12)
+#define FLAG_A (1<<13)
+#define FLAG_a (1<<14)
#endif
#ifdef FOR_pwd
