Regenerate generated files.
Also temporarily stop building pending/ps.c --- it's under construction
and doesn't currently build with clang.
Change-Id: Ie83dc65be22df5850b08569ebb1b88d26155aca5
diff --git a/.config b/.config
index f353fcd..36322e4 100644
--- a/.config
+++ b/.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# ToyBox version: KCONFIG_VERSION
-# Tue Apr 7 21:08:32 2015
+# Sat Apr 18 13:49:48 2015
#
CONFIG_TOYBOX_CONTAINER=y
CONFIG_TOYBOX_FIFREEZE=y
@@ -93,7 +93,7 @@
# CONFIG_XARGS_PEDANTIC is not set
#
-# pending
+# pending (see toys/pending/README)
#
# CONFIG_ARP is not set
# CONFIG_ARPING is not set
@@ -146,7 +146,7 @@
# CONFIG_DEALLOCVT is not set
CONFIG_PGREP=y
# CONFIG_PING is not set
-CONFIG_PS=y
+# CONFIG_PS is not set
# CONFIG_RESET is not set
CONFIG_ROUTE=y
# CONFIG_SH is not set
@@ -291,7 +291,9 @@
#
CONFIG_TOYBOX=y
CONFIG_TOYBOX_SUID=y
+# CONFIG_TOYBOX_LSM_NONE is not set
CONFIG_TOYBOX_SELINUX=y
+# CONFIG_TOYBOX_SMACK is not set
CONFIG_TOYBOX_FLOAT=y
CONFIG_TOYBOX_HELP=y
CONFIG_TOYBOX_HELP_DASHDASH=y
diff --git a/Android.mk b/Android.mk
index 5782451..b2e24ce 100644
--- a/Android.mk
+++ b/Android.mk
@@ -134,7 +134,6 @@
toys/pending/hwclock.c \
toys/pending/more.c \
toys/pending/pgrep.c \
- toys/pending/ps.c \
toys/pending/netstat.c \
toys/pending/route.c \
toys/pending/tar.c \
diff --git a/generated/config.h b/generated/config.h
index 1c60ad8..ec6d0ae 100644
--- a/generated/config.h
+++ b/generated/config.h
@@ -268,8 +268,8 @@
#define USE_PGREP(...) __VA_ARGS__
#define CFG_PING 0
#define USE_PING(...)
-#define CFG_PS 1
-#define USE_PS(...) __VA_ARGS__
+#define CFG_PS 0
+#define USE_PS(...)
#define CFG_RESET 0
#define USE_RESET(...)
#define CFG_ROUTE 1
@@ -510,8 +510,12 @@
#define USE_TOYBOX(...) __VA_ARGS__
#define CFG_TOYBOX_SUID 1
#define USE_TOYBOX_SUID(...) __VA_ARGS__
+#define CFG_TOYBOX_LSM_NONE 0
+#define USE_TOYBOX_LSM_NONE(...)
#define CFG_TOYBOX_SELINUX 1
#define USE_TOYBOX_SELINUX(...) __VA_ARGS__
+#define CFG_TOYBOX_SMACK 0
+#define USE_TOYBOX_SMACK(...)
#define CFG_TOYBOX_FLOAT 1
#define USE_TOYBOX_FLOAT(...) __VA_ARGS__
#define CFG_TOYBOX_HELP 1
diff --git a/generated/flags.h b/generated/flags.h
index 4a41571..ba8b4fb 100644
--- a/generated/flags.h
+++ b/generated/flags.h
@@ -1709,9 +1709,9 @@
#undef FOR_printf
#endif
-// ps aAdeflo* aAdeflo*
+// ps aAdeflo*[!ol][+Ae]
#undef OPTSTR_ps
-#define OPTSTR_ps "aAdeflo*"
+#define OPTSTR_ps 0
#ifdef CLEANUP_ps
#undef CLEANUP_ps
#undef FOR_ps
@@ -4095,13 +4095,13 @@
#ifndef TT
#define TT this.ps
#endif
-#define FLAG_o (1<<0)
-#define FLAG_l (1<<1)
-#define FLAG_f (1<<2)
-#define FLAG_e (1<<3)
-#define FLAG_d (1<<4)
-#define FLAG_A (1<<5)
-#define FLAG_a (1<<6)
+#define FLAG_o (FORCED_FLAG<<0)
+#define FLAG_l (FORCED_FLAG<<1)
+#define FLAG_f (FORCED_FLAG<<2)
+#define FLAG_e (FORCED_FLAG<<3)
+#define FLAG_d (FORCED_FLAG<<4)
+#define FLAG_A (FORCED_FLAG<<5)
+#define FLAG_a (FORCED_FLAG<<6)
#endif
#ifdef FOR_pwd
diff --git a/generated/help.h b/generated/help.h
index d05322b..22277ca 100644
--- a/generated/help.h
+++ b/generated/help.h
@@ -16,9 +16,13 @@
#define help_toybox_float "Include floating point support infrastructure and commands that\nrequire it.\n\n"
+#define help_toybox_smack "Include SMACK options in commands like ls for systems like Tizen.\n\n\n"
+
#define help_toybox_selinux "Include SELinux options in commands such as ls, and add\nSELinux-specific commands such as chcon to the Android menu.\n\n"
-#define help_toybox_suid "Support for the Set User ID bit, to install toybox suid root and drop\npermissions for commands which do not require root access. To use\nthis change ownership of the file to the root user and set the suid\nbit in the file permissions:\n\nchown root:root toybox; chmod +s toybox\n\n"
+#define help_toybox_lsm_none "Don't try to achieve \"watertight\" by plugging the holes in a\ncollander, instead use conventional unix security (and possibly\nLinux Containers) for a simple straightforward system.\n\n"
+
+#define help_toybox_suid "Support for the Set User ID bit, to install toybox suid root and drop\npermissions for commands which do not require root access. To use\nthis change ownership of the file to the root user and set the suid\nbit in the file permissions:\n\nchown root:root toybox; chmod +s toybox\n\nprompt \"Security Blanket\"\ndefault TOYBOX_LSM_NONE\nhelp\nSelect a Linux Security Module to complicate your system\nuntil you can't find holes in it.\n\n"
#define help_toybox "usage: toybox [--long | --version | [command] [arguments...]]\n\nWith no arguments, shows available commands. First argument is\nname of a command to run, followed by any arguments to that command.\n\n--long Show path to each command\n--version Show toybox version\n\nTo install command symlinks, try:\n for i in $(/bin/toybox --long); do ln -s /bin/toybox $i; done\n\n"
@@ -252,7 +256,7 @@
#define help_reset "usage: reset\n\nA program to reset the terminal.\n\n"
-#define help_ps "usage: ps [-Aade] [-fl] [-gG GROUP] [-o FIELD] [-p PID] [-t TTY] [-u USER]\n\nList processes.\n\n-A All processes\n-a Processes with terminals, except session leaders\n-d Processes that aren't session leaders\n-e Same as -A\n-f Full listing\n-l Long listing\n\n-g Processes belonging to these session leaders\n-G Processes with these real group IDs\n-o Show FIELDS for each process\n-p select by PID\n-t select by TTY\n-u select by USER\n-U select by USER\n\n GROUP, FIELD, PID, TTY, and USER are comma separated lists.\n\nOUTPUT (-o) FIELDS:\n\n S Linux defines the process state letters as:\n R (running) S (sleeping) D (disk sleep) T (stopped) t (tracing stop)\n Z (zombie) X (dead) x (dead) K (wakekill) W (waking)\n F Process flags (PF_*) from linux source file include/sched.h\n (in octal rather than hex because posix inexplicably says so)\n\nDefault is PID,TTY,TIME,CMD With -f UID,PID,PPID,C,STIME,TTY,TIME,CMD\nWith -l F,S,UID,PID,PPID,C,PRI,NI,ADDR,SZ,WCHAN,TTY,TIME,CMD\n\n"
+#define help_ps "usage: ps [-Aade] [-fl] [-gG GROUP] [-o FIELD] [-p PID] [-t TTY] [-u USER]\n\nList processes.\n\n-A All processes\n-a Processes with terminals, except session leaders\n-d Processes that aren't session leaders\n-e Same as -A\n-f Full listing\n-l Long listing\n\n-g Processes belonging to these session leaders\n-G Processes with these real group IDs\n-o Show FIELDS for each process\n-p select by PID\n-t select by TTY\n-u select by USER\n-U select by USER\n\n GROUP, FIELD, PID, TTY, and USER are comma separated lists.\n\nOUTPUT (-o) FIELDS:\n\n \"UID\", \"PID\", \"PPID\", \"C\", \"PRI\", \"NI\", \"ADDR\", \"SZ\",\n \"WCHAN\", \"STIME\", \"TTY\", \"TIME\", \"CMD\", \"COMMAND\", \"ELAPSED\", \"GROUP\",\n \"%CPU\", \"PGID\", \"RGROUP\", \"RUSER\", \"USER\", \"VSZ\"\n\n C Processor utilization for scheduling\n F Process flags (PF_*) from linux source file include/sched.h\n (in octal rather than hex because posix)\n S Process state:\n R (running) S (sleeping) D (disk sleep) T (stopped) t (tracing stop)\n Z (zombie) X (dead) x (dead) K (wakekill) W (waking)\n PID Process id\n PPID Parent process id\n PRI Priority\n UID User id of process owner\n\nDefault output is -o PID,TTY,TIME,CMD\nWith -f USER=UID,PID,PPID,C,STIME,TTY,TIME,CMD\nWith -l F,S,UID,PID,PPID,C,PRI,NI,ADDR,SZ,WCHAN,TTY,TIME,CMD\n\n"
#define help_ping "usage: ping [OPTIONS] HOST\n\nCheck network connectivity by sending packets to a host and reporting\nits response.\n\nSend ICMP ECHO_REQUEST packets to ipv4 or ipv6 addresses and prints each\necho it receives back, with round trip time.\n\nOptions:\n-4, -6 Force IPv4 or IPv6\n-c CNT Send CNT many packets\n-I IFACE/IP Source interface or address\n-q Quiet, only displays output at start and when finished\n-s SIZE Packet SIZE in bytes (default 56)\n-t TTL Set Time (number of hops) To Live\n-W SEC Seconds to wait for response after all packets sent (default 10)\n-w SEC Exit after this many seconds\n\n"
diff --git a/generated/newtoys.h b/generated/newtoys.h
index 9e8c9ed..fb14485 100644
--- a/generated/newtoys.h
+++ b/generated/newtoys.h
@@ -158,7 +158,7 @@
USE_REBOOT(OLDTOY(poweroff, reboot, TOYFLAG_SBIN|TOYFLAG_NEEDROOT))
USE_PRINTENV(NEWTOY(printenv, "0(null)", TOYFLAG_USR|TOYFLAG_BIN))
USE_PRINTF(NEWTOY(printf, "<1", TOYFLAG_USR|TOYFLAG_BIN))
-USE_PS(NEWTOY(ps, "aAdeflo*", TOYFLAG_USR|TOYFLAG_BIN))
+USE_PS(NEWTOY(ps, "aAdeflo*[!ol][+Ae]", TOYFLAG_USR|TOYFLAG_BIN))
USE_PWD(NEWTOY(pwd, ">0LP[-LP]", TOYFLAG_BIN))
USE_PWDX(NEWTOY(pwdx, "<1a", TOYFLAG_USR|TOYFLAG_BIN))
USE_READAHEAD(NEWTOY(readahead, NULL, TOYFLAG_BIN))
