From 584c654efead9619e5a08b387f715882709c3a54 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 15 May 2015 16:26:09 -0700 Subject: [PATCH] Regenerate generated files. Change-Id: Id114fc92751e1809eab477c1f0a0d855ce65246a --- Android.mk | 1 + generated/globals.h | 20 ++++++++++---------- generated/help.h | 8 ++++---- generated/newtoys.h | 4 ++-- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Android.mk b/Android.mk index d272bdb7..2592b725 100644 --- a/Android.mk +++ b/Android.mk @@ -51,6 +51,7 @@ LOCAL_SRC_FILES := \ lib/dirtree.c \ lib/getmountlist.c \ lib/help.c \ + lib/interestingtimes.c \ lib/lib.c \ lib/llist.c \ lib/net.c \ diff --git a/generated/globals.h b/generated/globals.h index e1106c9d..4bc2298f 100644 --- a/generated/globals.h +++ b/generated/globals.h @@ -160,6 +160,15 @@ struct free_data { unsigned long long units; }; +// toys/other/hexedit.c + +struct hexedit_data { + char *data; + long long len, base; + int numlen; + unsigned height; +}; + // toys/other/ifconfig.c struct ifconfig_data { @@ -516,15 +525,6 @@ struct groupadd_data { long gid; }; -// toys/pending/hexedit.c - -struct hexedit_data { - char *data; - long long len, base; - int numlen; - unsigned height; -}; - // toys/pending/host.c struct host_data { @@ -1197,6 +1197,7 @@ extern union global_union { struct dos2unix_data dos2unix; struct fallocate_data fallocate; struct free_data free; + struct hexedit_data hexedit; struct ifconfig_data ifconfig; struct login_data login; struct losetup_data losetup; @@ -1233,7 +1234,6 @@ extern union global_union { struct ftpget_data ftpget; struct getty_data getty; struct groupadd_data groupadd; - struct hexedit_data hexedit; struct host_data host; struct hwclock_data hwclock; struct iconv_data iconv; diff --git a/generated/help.h b/generated/help.h index b3ebf6fb..59876481 100644 --- a/generated/help.h +++ b/generated/help.h @@ -116,6 +116,8 @@ #define help_rev "usage: rev [FILE...]\n\nOutput each line reversed, when no files are given stdin is used.\n\n" +#define help_reset "usage: reset\n\nreset the terminal\n\n" + #define help_reboot "usage: reboot/halt/poweroff [-n]\n\nRestart, halt or powerdown the system.\n\n-n Don't sync before stopping the system.\n\n" #define help_realpath "usage: realpath FILE...\n\nDisplay the canonical absolute pathname\n\n" @@ -176,6 +178,8 @@ #define help_ifconfig "usage: ifconfig [-a] [INTERFACE [ACTION...]]\n\nDisplay or configure network interface.\n\nWith no arguments, display active interfaces. First argument is interface\nto operate on, one argument by itself displays that interface.\n\n-a Show all interfaces, not just active ones\n\nAdditional arguments are actions to perform on the interface:\n\nADDRESS[/NETMASK] - set IPv4 address (1.2.3.4/5)\ndefault - unset ipv4 address\nadd|del ADDRESS[/PREFIXLEN] - add/remove IPv6 address (1111::8888/128)\nup - enable interface\ndown - disable interface\n\nnetmask|broadcast|pointopoint ADDRESS - set more IPv4 characteristics\nhw ether|infiniband ADDRESS - set LAN hardware address (AA:BB:CC...)\ntxqueuelen LEN - number of buffered packets before output blocks\nmtu LEN - size of outgoing packets (Maximum Transmission Unit)\n\nFlags you can set on an interface (or -remove by prefixing with -):\narp - don't use Address Resolution Protocol to map LAN routes\npromisc - don't discard packets that aren't to this LAN hardware address\nmulticast - force interface into multicast mode if the driver doesn't\nallmulti - promisc for multicast packets\n\nObsolete fields included for historical purposes:\nirq|io_addr|mem_start ADDR - micromanage obsolete hardware\noutfill|keepalive INTEGER - SLIP analog dialup line quality monitoring\nmetric INTEGER - added to Linux 0.9.10 with comment \"never used\", still true\n\n" +#define help_hexedit "usage: hexedit FILENAME\n\nHexadecimal file editor.\n\n-r Read only (display but don't edit)\n\n" + #define help_help "usage: help [-ah] [command]\n\nShow usage information for toybox commands.\nRun \"toybox\" with no arguments for a list of available commands.\n\n-h HTML output\n-a All commands\n" #define help_fsfreeze "usage: fsfreeze {-f | -u} MOUNTPOINT\n\nFreeze or unfreeze a filesystem.\n\n-f freeze\n-u unfreeze\n\n" @@ -254,8 +258,6 @@ #define help_route "usage: route -neA inet{6} / [{add|del}]\n\nDisplay/Edit kernel routing tables.\n\n-n Don't resolve names\n-e Display other/more information\n-A inet{6} Select Address Family\n\n" -#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 \"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" @@ -306,8 +308,6 @@ #define help_host "usage: host [-av] [-t TYPE] NAME [SERVER]\n\nPerform DNS lookup on NAME, which can be a domain name to lookup,\nor an ipv4 dotted or ipv6 colon seprated address to reverse lookup.\nSERVER (if present) is the DNS server to use.\n\n-a no idea\n-t not a clue\n-v verbose\n\n" -#define help_hexedit "usage: hexedit FILENAME\n\nHexadecimal file editor.\n\n-r Read only (display but don't edit)\n\n" - #define help_groupdel "usage: groupdel [USER] GROUP\n\nDelete a group or remove a user from a group\n\n" #define help_groupadd "usage: groupadd [-S] [-g GID] [USER] GROUP\n\nAdd a group or add a user to a group\n\n -g GID Group id\n -S Create a system group\n\n" diff --git a/generated/newtoys.h b/generated/newtoys.h index 5302bda9..ebc449de 100644 --- a/generated/newtoys.h +++ b/generated/newtoys.h @@ -82,7 +82,7 @@ USE_REBOOT(OLDTOY(halt, reboot, TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) USE_HEAD(NEWTOY(head, "?n#<0=10", TOYFLAG_USR|TOYFLAG_BIN)) USE_HELLO(NEWTOY(hello, 0, TOYFLAG_USR|TOYFLAG_BIN)) USE_HELP(NEWTOY(help, ""USE_HELP_EXTRAS("ah"), TOYFLAG_BIN)) -USE_HEXEDIT(NEWTOY(hexedit, "<1>1r", TOYFLAG_USR|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_HOSTNAME(NEWTOY(hostname, NULL, 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)) @@ -168,7 +168,7 @@ USE_READLINK(NEWTOY(readlink, "<1>1fenq[-fe]", TOYFLAG_USR|TOYFLAG_BIN)) USE_REALPATH(NEWTOY(realpath, "<1", TOYFLAG_USR|TOYFLAG_BIN)) USE_REBOOT(NEWTOY(reboot, "n", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) USE_RENICE(NEWTOY(renice, "<1gpun#|", TOYFLAG_USR|TOYFLAG_BIN)) -USE_RESET(NEWTOY(reset, NULL, TOYFLAG_USR|TOYFLAG_BIN)) +USE_RESET(NEWTOY(reset, 0, TOYFLAG_USR|TOYFLAG_BIN)) USE_RESTORECON(NEWTOY(restorecon, "<1DFnRrv", TOYFLAG_USR|TOYFLAG_SBIN)) USE_REV(NEWTOY(rev, NULL, TOYFLAG_USR|TOYFLAG_BIN)) USE_RFKILL(NEWTOY(rfkill, "<1>2", TOYFLAG_USR|TOYFLAG_SBIN)) -- 2.11.0