aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-05-04 13:42:18 -0700
committerElliott Hughes <enh@google.com>2016-05-04 13:42:18 -0700
commit2737fdfe8cd90b1dfe0ea3acd28b9c5f02a0f6a1 (patch)
tree6a8dcbb8cd7e6d1812d2e5ca60b32168ad84e699
parent67d6a99a509fede4f90a70f8b8d02533ef1ab308 (diff)
downloadandroid_external_toybox-2737fdfe8cd90b1dfe0ea3acd28b9c5f02a0f6a1.tar.gz
android_external_toybox-2737fdfe8cd90b1dfe0ea3acd28b9c5f02a0f6a1.tar.bz2
android_external_toybox-2737fdfe8cd90b1dfe0ea3acd28b9c5f02a0f6a1.zip
Regenerate generated files.
Change-Id: I8d1590a61a7339f65cd1bdf28601f85768563b57
-rw-r--r--generated/flags.h8
-rw-r--r--generated/globals.h7
-rw-r--r--generated/help.h4
-rw-r--r--generated/newtoys.h2
-rw-r--r--generated/tags.h2
5 files changed, 18 insertions, 5 deletions
diff --git a/generated/flags.h b/generated/flags.h
index b9ca2569..4c5ff545 100644
--- a/generated/flags.h
+++ b/generated/flags.h
@@ -1004,12 +1004,14 @@
#undef FOR_hostid
#endif
-// hostname
+// hostname bF: bF:
#undef OPTSTR_hostname
-#define OPTSTR_hostname 0
+#define OPTSTR_hostname "bF:"
#ifdef CLEANUP_hostname
#undef CLEANUP_hostname
#undef FOR_hostname
+#undef FLAG_F
+#undef FLAG_b
#endif
// hwclock >0(fast)f(rtc):u(utc)l(localtime)t(systz)s(hctosys)r(show)w(systohc)[-ul][!rtsw] >0(fast)f(rtc):u(utc)l(localtime)t(systz)s(hctosys)r(show)w(systohc)[-ul][!rtsw]
@@ -3901,6 +3903,8 @@
#ifndef TT
#define TT this.hostname
#endif
+#define FLAG_F (1<<0)
+#define FLAG_b (1<<1)
#endif
#ifdef FOR_hwclock
diff --git a/generated/globals.h b/generated/globals.h
index 874ab92c..5a47dfd3 100644
--- a/generated/globals.h
+++ b/generated/globals.h
@@ -39,6 +39,12 @@ struct dmesg_data {
long size;
};
+// toys/lsb/hostname.c
+
+struct hostname_data {
+ char *fname;
+};
+
// toys/lsb/killall.c
struct killall_data {
@@ -1317,6 +1323,7 @@ extern union global_union {
struct hello_data hello;
struct skeleton_data skeleton;
struct dmesg_data dmesg;
+ struct hostname_data hostname;
struct killall_data killall;
struct md5sum_data md5sum;
struct mknod_data mknod;
diff --git a/generated/help.h b/generated/help.h
index fa99c04a..67e0e9a8 100644
--- a/generated/help.h
+++ b/generated/help.h
@@ -82,7 +82,7 @@
#define HELP_killall "usage: killall [-l] [-iqv] [-SIGNAL|-s SIGNAL] PROCESS_NAME...\n\nSend a signal (default: TERM) to all processes with the given names.\n\n-i ask for confirmation before killing\n-l print list of all available signals\n-q don't print any warnings or error messages\n-s send SIGNAL instead of SIGTERM\n-v report if the signal was successfully sent\n\n"
-#define HELP_hostname "usage: hostname [newname]\n\nGet/Set the current hostname\n\n"
+#define HELP_hostname "usage: hostname [-b] [-F FILENAME] [newname]\n\nGet/Set the current hostname\n\n-b Set hostname to 'localhost' if otherwise unset\n-F Set hostname to contents of FILENAME\n\n"
#define HELP_dmesg "usage: dmesg [-c] [-r|-t] [-n LEVEL] [-s SIZE]\n\nPrint or control the kernel ring buffer.\n\n-c Clear the ring buffer after printing\n-n Set kernel logging LEVEL (1-9)\n-r Raw output (with <level markers>)\n-s Show the last SIZE many bytes\n-t Don't print kernel's timestamps\n\n"
@@ -462,7 +462,7 @@
#define HELP_top "usage: top [-m] [ -d seconds ] [ -n iterations ]\n\nShow process activity in real time.\n\n-k Fallback sort FIELDS (default -S,-%CPU,-ETIME,-PID)\n-o Show FIELDS (def PID,USER,PR,NI,VIRT,RES,SHR,S,%CPU,%MEM,TIME+,CMDLINE)\n-s Sort by field number (1-X, default 9)\n\n"
-#define HELP_ps "usage: ps [-AadefLlnwZ] [-gG GROUP,] [-k FIELD,] [-o FIELD,] [-p PID,] [-t TTY,] [-uU USER,]\n\nList processes.\n\nWhich processes to show (selections may be comma separated lists):\n\n-A All processes\n-a Processes with terminals that aren't session leaders\n-d All processes that aren't session leaders\n-e Same as -A\n-g Belonging to GROUPs\n-G Belonging to real GROUPs (before sgid)\n-p PIDs (--pid)\n-P Parent PIDs (--ppid)\n-s In session IDs\n-t Attached to selected TTYs\n-T Show Threads\n-u Owned by USERs\n-U Owned by real USERs (before suid)\n\nOutput modifiers:\n\n-k Sort FIELDs in +increasing or -decreasting order (--sort)\n-M Measure field widths (expanding as necessary)\n-n Show numeric USER and GROUP\n-w Wide output (don't truncate at terminal width)\n\nWhich FIELDs to show. (Default = -o PID,TTY,TIME,CMD)\n\n-f Full listing (-o USER:8=UID,PID,PPID,C,STIME,TTY,TIME,CMD)\n-l Long listing (-o F,S,UID,PID,PPID,C,PRI,NI,ADDR,SZ,WCHAN,TTY,TIME,CMD)\n-o Output FIELDs instead of defaults, each with optional :size and =title\n-O Add FIELDS to defaults\n-Z Include LABEL\n\nAvailable -o FIELDs:\n\n ADDR Instruction pointer ARGS Command line (argv[] -path)\n BIT Is this process 32 or 64 bits\n CMD COMM, or ARGS with -f CMDLINE Command line (argv[])\n COMM Original command name COMMAND Original command path\n CPU Which processor running on ETIME Elapsed time since PID start\n F Flags (1=FORKNOEXEC 4=SUPERPRIV) GID Group id\n GROUP Group name LABEL Security label\n MAJFL Major page faults MINFL Minor page faults\n NAME Command name (argv[0]) NI Niceness (lower is faster)\n PCPU Percentage of CPU time used PGID Process Group ID\n PID Process ID PPID Parent Process ID\n PRI Priority (higher is faster) PSR Processor last executed on\n RGID Real (before sgid) group ID RGROUP Real (before sgid) group name\n RSS Resident Set Size (pages in use) RTPRIO Realtime priority\n RUID Real (before suid) user ID RUSER Real (before suid) user name\n S Process state:\n R (running) S (sleeping) D (device I/O) T (stopped) t (traced)\n Z (zombie) X (deader) x (dead) K (wakekill) W (waking)\n SCHED Scheduling policy (0=other, 1=fifo, 2=rr, 3=batch, 4=iso, 5=idle)\n STAT Process state (S) plus:\n < high priority N low priority L locked memory\n s session leader + foreground l multithreaded\n STIME Start time of process in hh:mm (size :19 shows yyyy-mm-dd hh:mm:ss)\n SZ Memory Size (4k pages needed to completely swap out process)\n TCNT Thread count TID Thread ID\n TIME CPU time consumed TTY Controlling terminal\n UID User id USER User name\n VSZ Virtual memory size (1k units) %VSZ VSZ as % of physical memory\n WCHAN Waiting in kernel for\n\n"
+#define HELP_ps "usage: ps [-AadefLlnwZ] [-gG GROUP,] [-k FIELD,] [-o FIELD,] [-p PID,] [-t TTY,] [-uU USER,]\n\nList processes.\n\nWhich processes to show (selections may be comma separated lists):\n\n-A All processes\n-a Processes with terminals that aren't session leaders\n-d All processes that aren't session leaders\n-e Same as -A\n-g Belonging to GROUPs\n-G Belonging to real GROUPs (before sgid)\n-p PIDs (--pid)\n-P Parent PIDs (--ppid)\n-s In session IDs\n-t Attached to selected TTYs\n-T Show Threads\n-u Owned by USERs\n-U Owned by real USERs (before suid)\n\nOutput modifiers:\n\n-k Sort FIELDs in +increasing or -decreasting order (--sort)\n-M Measure field widths (expanding as necessary)\n-n Show numeric USER and GROUP\n-w Wide output (don't truncate at terminal width)\n\nWhich FIELDs to show. (Default = -o PID,TTY,TIME,CMD)\n\n-f Full listing (-o USER:8=UID,PID,PPID,C,STIME,TTY,TIME,CMD)\n-l Long listing (-o F,S,UID,PID,PPID,C,PRI,NI,ADDR,SZ,WCHAN,TTY,TIME,CMD)\n-o Output FIELDs instead of defaults, each with optional :size and =title\n-O Add FIELDS to defaults\n-Z Include LABEL\n\nAvailable -o FIELDs:\n\n ADDR Instruction pointer ARGS Command line (argv[] -path)\n BIT Is this process 32 or 64 bits\n CMD COMM, or ARGS with -f CMDLINE Command line (argv[])\n COMM Original command name COMMAND Original command path\n CPU Which processor running on ETIME Elapsed time since PID start\n F Flags (1=FORKNOEXEC 4=SUPERPRIV) GID Group id\n GROUP Group name LABEL Security label\n MAJFL Major page faults MINFL Minor page faults\n NAME Command name (argv[0]) NI Niceness (lower is faster)\n PCPU Percentage of CPU time used PCY Android scheduling policy\n PGID Process Group ID\n PID Process ID PPID Parent Process ID\n PRI Priority (higher is faster) PSR Processor last executed on\n RGID Real (before sgid) group ID RGROUP Real (before sgid) group name\n RSS Resident Set Size (pages in use) RTPRIO Realtime priority\n RUID Real (before suid) user ID RUSER Real (before suid) user name\n S Process state:\n R (running) S (sleeping) D (device I/O) T (stopped) t (traced)\n Z (zombie) X (deader) x (dead) K (wakekill) W (waking)\n SCHED Scheduling policy (0=other, 1=fifo, 2=rr, 3=batch, 4=iso, 5=idle)\n STAT Process state (S) plus:\n < high priority N low priority L locked memory\n s session leader + foreground l multithreaded\n STIME Start time of process in hh:mm (size :19 shows yyyy-mm-dd hh:mm:ss)\n SZ Memory Size (4k pages needed to completely swap out process)\n TCNT Thread count TID Thread ID\n TIME CPU time consumed TTY Controlling terminal\n UID User id USER User name\n VSZ Virtual memory size (1k units) %VSZ VSZ as % of physical memory\n WCHAN Waiting in kernel for\n\n"
#define HELP_printf "usage: printf FORMAT [ARGUMENT...]\n\nFormat and print ARGUMENT(s) according to FORMAT, using C printf syntax\n(% escapes for cdeEfgGiosuxX, \\ escapes for abefnrtv0 or \\OCTAL or \\xHEX).\n\n"
diff --git a/generated/newtoys.h b/generated/newtoys.h
index 877ff0db..123eb408 100644
--- a/generated/newtoys.h
+++ b/generated/newtoys.h
@@ -92,7 +92,7 @@ USE_HELP(NEWTOY(help, ""USE_HELP_EXTRAS("ah"), TOYFLAG_BIN))
USE_HEXEDIT(NEWTOY(hexedit, "<1>1r", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LOCALE))
USE_HOST(NEWTOY(host, "<1>2avt:", TOYFLAG_USR|TOYFLAG_BIN))
USE_HOSTID(NEWTOY(hostid, ">0", TOYFLAG_USR|TOYFLAG_BIN))
-USE_HOSTNAME(NEWTOY(hostname, NULL, TOYFLAG_BIN))
+USE_HOSTNAME(NEWTOY(hostname, "bF:", TOYFLAG_BIN))
USE_HWCLOCK(NEWTOY(hwclock, ">0(fast)f(rtc):u(utc)l(localtime)t(systz)s(hctosys)r(show)w(systohc)[-ul][!rtsw]", TOYFLAG_USR|TOYFLAG_BIN))
USE_ICONV(NEWTOY(iconv, "cst:f:", TOYFLAG_USR|TOYFLAG_BIN))
USE_ID(NEWTOY(id, ">1"USE_ID_Z("Z")"nGgru[!"USE_ID_Z("Z")"Ggu]", TOYFLAG_USR|TOYFLAG_BIN))
diff --git a/generated/tags.h b/generated/tags.h
index 2be65462..69d3d641 100644
--- a/generated/tags.h
+++ b/generated/tags.h
@@ -122,6 +122,8 @@
#define _PS_S (1LL<<55)
#define PS_STAT 56
#define _PS_STAT (1LL<<56)
+#define PS_PCY 57
+#define _PS_PCY (1LL<<57)
#define KEY_UP 0
#define _KEY_UP (1<<0)
#define KEY_DOWN 1