Regenerate generated files after upstream sync.
Change-Id: I21fdf950573bd41610c524c63c71c22939e5badb
diff --git a/generated/config.h b/generated/config.h
index c5223ae..67a542b 100644
--- a/generated/config.h
+++ b/generated/config.h
@@ -10,6 +10,8 @@
#define USE_TOYBOX_UTMPX(...) __VA_ARGS__
#define CFG_TOYBOX_SHADOW 1
#define USE_TOYBOX_SHADOW(...) __VA_ARGS__
+#define CFG_TOYBOX_ON_ANDROID 1
+#define USE_TOYBOX_ON_ANDROID(...) __VA_ARGS__
#define CFG_BASENAME 1
#define USE_BASENAME(...) __VA_ARGS__
#define CFG_CAL 1
@@ -90,6 +92,8 @@
#define USE_LN(...) __VA_ARGS__
#define CFG_LS 1
#define USE_LS(...) __VA_ARGS__
+#define CFG_LS_SMACK 0
+#define USE_LS_SMACK(...)
#define CFG_LS_COLOR 1
#define USE_LS_COLOR(...) __VA_ARGS__
#define CFG_MKDIR 1
@@ -218,6 +222,8 @@
#define USE_GROUPADD(...)
#define CFG_GROUPDEL 0
#define USE_GROUPDEL(...)
+#define CFG_HEXEDIT 0
+#define USE_HEXEDIT(...)
#define CFG_HOST 0
#define USE_HOST(...)
#define CFG_HWCLOCK 1
diff --git a/generated/flags.h b/generated/flags.h
index 320dd51..e77258e 100644
--- a/generated/flags.h
+++ b/generated/flags.h
@@ -491,9 +491,9 @@
#undef FOR_dirname
#endif
-// dmesg rs#<1n#c rs#<1n#c
+// dmesg trs#<1n#c[!tr] trs#<1n#c[!tr]
#undef OPTSTR_dmesg
-#define OPTSTR_dmesg "rs#<1n#c"
+#define OPTSTR_dmesg "trs#<1n#c[!tr]"
#ifdef CLEANUP_dmesg
#undef CLEANUP_dmesg
#undef FOR_dmesg
@@ -501,6 +501,7 @@
#undef FLAG_n
#undef FLAG_s
#undef FLAG_r
+#undef FLAG_t
#endif
// dos2unix
@@ -883,6 +884,15 @@
#undef FLAG_a
#endif
+// hexedit <1>1r
+#undef OPTSTR_hexedit
+#define OPTSTR_hexedit 0
+#ifdef CLEANUP_hexedit
+#undef CLEANUP_hexedit
+#undef FOR_hexedit
+#undef FLAG_r
+#endif
+
// host <1>2avt:
#undef OPTSTR_host
#define OPTSTR_host 0
@@ -1172,9 +1182,9 @@
#undef FLAG_S
#endif
-// ls (color):;goACFHLRSacdfiklmnpqrstux1[-1Cglmnox][-cu][-ftS][-HL] (color):;goACFHLRSacdfiklmnpqrstux1[-1Cglmnox][-cu][-ftS][-HL]
+// ls (color):;goACFHLRSacdfiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL] (color):;ZgoACFHLRSacdfiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL]
#undef OPTSTR_ls
-#define OPTSTR_ls "(color):;goACFHLRSacdfiklmnpqrstux1[-1Cglmnox][-cu][-ftS][-HL]"
+#define OPTSTR_ls "(color):;goACFHLRSacdfiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL]"
#ifdef CLEANUP_ls
#undef CLEANUP_ls
#undef FOR_ls
@@ -1204,6 +1214,7 @@
#undef FLAG_A
#undef FLAG_o
#undef FLAG_g
+#undef FLAG_Z
#undef FLAG_color
#endif
@@ -2401,9 +2412,9 @@
#undef FOR_true
#endif
-// truncate <1s#|c <1s#|c
+// truncate <1s:|c <1s:|c
#undef OPTSTR_truncate
-#define OPTSTR_truncate "<1s#|c"
+#define OPTSTR_truncate "<1s:|c"
#ifdef CLEANUP_truncate
#undef CLEANUP_truncate
#undef FOR_truncate
@@ -3085,6 +3096,7 @@
#define FLAG_n (1<<1)
#define FLAG_s (1<<2)
#define FLAG_r (1<<3)
+#define FLAG_t (1<<4)
#endif
#ifdef FOR_dos2unix
@@ -3401,6 +3413,13 @@
#define FLAG_a (1<<1)
#endif
+#ifdef FOR_hexedit
+#ifndef TT
+#define TT this.hexedit
+#endif
+#define FLAG_r (FORCED_FLAG<<0)
+#endif
+
#ifdef FOR_host
#ifndef TT
#define TT this.host
@@ -3670,7 +3689,8 @@
#define FLAG_A (1<<23)
#define FLAG_o (1<<24)
#define FLAG_g (1<<25)
-#define FLAG_color (1<<26)
+#define FLAG_Z (1<<26)
+#define FLAG_color (FORCED_FLAG<<27)
#endif
#ifdef FOR_lsattr
diff --git a/generated/globals.h b/generated/globals.h
index 6bc1f4c..e1106c9 100644
--- a/generated/globals.h
+++ b/generated/globals.h
@@ -2,7 +2,7 @@
struct getprop_data {
size_t size;
- size_t capacity;
+ char **nv; // name/value pairs: even=name, odd=value
};
// toys/example/hello.c
@@ -303,7 +303,10 @@
// toys/other/truncate.c
struct truncate_data {
+ char *s;
+
long size;
+ int type;
};
// toys/pending/arp.c
@@ -513,6 +516,15 @@
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 {
@@ -1221,6 +1233,7 @@
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 22277ca..037c2e6 100644
--- a/generated/help.h
+++ b/generated/help.h
@@ -72,7 +72,7 @@
#define help_hostname "usage: hostname [newname]\n\nGet/Set the current hostname\n\n"
-#define help_dmesg "usage: dmesg [-n LEVEL] [-s SIZE] | -c\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\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"
#define help_yes "usage: yes [args...]\n\nRepeatedly output line until killed. If no args, output 'y'.\n\n\n"
@@ -88,7 +88,7 @@
#define help_uptime "usage: uptime\n\nTell how long the system has been running and the system load\naverages for the past 1, 5 and 15 minutes.\n\n"
-#define help_truncate "usage: truncate [-c] -s file...\n\nSet length of file(s), extending sparsely if necessary.\n\n-c Don't create file if it doesn't exist.\n-s New size\n\n"
+#define help_truncate "usage: truncate [-c] -s SIZE file...\n\nSet length of file(s), extending sparsely if necessary.\n\n-c Don't create file if it doesn't exist.\n-s New size (with optional prefix and suffix)\n\nSIZE prefix: + add, - subtract, < shrink to, > expand to,\n / multiple rounding down, % multiple rounding up\nSIZE suffix: k=1024, m=1024^2, g=1024^3, t=1024^4, p=1024^5, e=1024^6\n\n"
#define help_timeout "usage: timeout [-k LENGTH] [-s SIGNAL] LENGTH COMMAND...\n\nRun command line as a child process, sending child a signal if the\ncommand doesn't exit soon enough.\n\nLength can be a decimal fraction. An optional suffix can be \"m\"\n(minutes), \"h\" (hours), \"d\" (days), or \"s\" (seconds, the default).\n\n-s Send specified signal (default TERM)\n-k Send KILL signal if child still running this long after first signal.\n-v Verbose\n\n"
@@ -306,6 +306,8 @@
#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"
@@ -428,6 +430,8 @@
#define help_ls_color "--color device=yellow symlink=turquoise/red dir=blue socket=purple\n files: exe=green suid=red suidfile=redback stickydir=greenback\n =auto means detect if output is a tty.\n\nusage: ls --color[=auto] [-ACFHLRSacdfiklmnpqrstux1] [directory...]\n\nlist files\n\nwhat to show:\n-a all files including .hidden -c use ctime for timestamps\n-d directory, not contents -i inode number\n-k block sizes in kilobytes -p put a '/' after dir names\n-q unprintable chars as '?' -s size (in blocks)\n-u use access time for timestamps -A list all files but . and ..\n-H follow command line symlinks -L follow symlinks\n-R recursively list files in subdirs -F append /dir *exe @sym |FIFO\n\noutput formats:\n-1 list one file per line -C columns (sorted vertically)\n-g like -l but no owner -l long (show full details)\n-m comma separated -n like -l but numeric uid/gid\n-o like -l but no group -x columns (horizontal sort)\n\nsorting (default is alphabetical):\n-f unsorted -r reverse -t timestamp -S size\n"
+#define help_ls_smack "usage: ls [-Z]\n\n-Z security context\n\n"
+
#define help_ls "usage: ls --color[=auto] [-ACFHLRSacdfiklmnpqrstux1] [directory...]\n\nlist files\n\nwhat to show:\n-a all files including .hidden -c use ctime for timestamps\n-d directory, not contents -i inode number\n-k block sizes in kilobytes -p put a '/' after dir names\n-q unprintable chars as '?' -s size (in blocks)\n-u use access time for timestamps -A list all files but . and ..\n-H follow command line symlinks -L follow symlinks\n-R recursively list files in subdirs -F append /dir *exe @sym |FIFO\n\noutput formats:\n-1 list one file per line -C columns (sorted vertically)\n-g like -l but no owner -l long (show full details)\n-m comma separated -n like -l but numeric uid/gid\n-o like -l but no group -x columns (horizontal sort)\n\nsorting (default is alphabetical):\n-f unsorted -r reverse -t timestamp -S size\n--color device=yellow symlink=turquoise/red dir=blue socket=purple\n files: exe=green suid=red suidfile=redback stickydir=greenback\n =auto means detect if output is a tty.\n\n"
#define help_ln "usage: ln [-sfnv] [FROM...] TO\n\nCreate a link between FROM and TO.\nWith only one argument, create link in current directory.\n\n-s Create a symbolic link\n-f Force the creation of the link, even if TO already exists\n-n Symlink at destination treated as file\n-v Verbose\n\n"
diff --git a/generated/newtoys.h b/generated/newtoys.h
index fb14485..b676f3b 100644
--- a/generated/newtoys.h
+++ b/generated/newtoys.h
@@ -43,7 +43,7 @@
USE_DHCPD(NEWTOY(dhcpd, ">1P#<0>65535=67fS", TOYFLAG_SBIN|TOYFLAG_ROOTONLY))
USE_DIFF(NEWTOY(diff, "<2>2B(ignore-blank-lines)d(minimal)b(ignore-space-change)ut(expand-tabs)w(ignore-all-space)i(ignore-case)T(initial-tab)s(report-identical-files)q(brief)a(text)L(label)*S(starting-file):N(new-file)r(recursive)U(unified)#<0=3", TOYFLAG_USR|TOYFLAG_BIN))
USE_DIRNAME(NEWTOY(dirname, "<1", TOYFLAG_USR|TOYFLAG_BIN))
-USE_DMESG(NEWTOY(dmesg, "rs#<1n#c", TOYFLAG_BIN))
+USE_DMESG(NEWTOY(dmesg, "trs#<1n#c[!tr]", TOYFLAG_BIN))
USE_DOS2UNIX(NEWTOY(dos2unix, 0, TOYFLAG_BIN))
USE_DU(NEWTOY(du, "d#<0hmlcaHkKLsx[-HL][-kKmh]", TOYFLAG_USR|TOYFLAG_BIN))
USE_DUMPLEASES(NEWTOY(dumpleases, ">0arf:[!ar]", TOYFLAG_USR|TOYFLAG_BIN))
@@ -81,6 +81,7 @@
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_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))
@@ -111,7 +112,7 @@
USE_LOGIN(NEWTOY(login, ">1fph:", TOYFLAG_BIN))
USE_LOGNAME(NEWTOY(logname, ">0", TOYFLAG_USR|TOYFLAG_BIN))
USE_LOSETUP(NEWTOY(losetup, ">2S(sizelimit)#s(show)ro#j:fdca[!afj]", TOYFLAG_SBIN))
-USE_LS(NEWTOY(ls, USE_LS_COLOR("(color):;")"goACFHLRSacdfiklmnpqrstux1[-1Cglmnox][-cu][-ftS][-HL]", TOYFLAG_BIN|TOYFLAG_LOCALE))
+USE_LS(NEWTOY(ls, USE_LS_COLOR("(color):;")USE_LS_SMACK("Z")"goACFHLRSacdfiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL]", TOYFLAG_BIN|TOYFLAG_LOCALE))
USE_LSATTR(NEWTOY(lsattr, "vldaR", TOYFLAG_BIN))
USE_LSMOD(NEWTOY(lsmod, NULL, TOYFLAG_SBIN))
USE_LSPCI(NEWTOY(lspci, "emkn"USE_LSPCI_TEXT("@i:"), TOYFLAG_USR|TOYFLAG_BIN))
@@ -217,7 +218,7 @@
USE_TRACEROUTE(NEWTOY(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", TOYFLAG_STAYROOT|TOYFLAG_USR|TOYFLAG_BIN))
USE_TRACEROUTE(OLDTOY(traceroute6,traceroute, TOYFLAG_STAYROOT|TOYFLAG_USR|TOYFLAG_BIN))
USE_TRUE(NEWTOY(true, NULL, TOYFLAG_BIN))
-USE_TRUNCATE(NEWTOY(truncate, "<1s#|c", TOYFLAG_BIN))
+USE_TRUNCATE(NEWTOY(truncate, "<1s:|c", TOYFLAG_BIN))
USE_TTY(NEWTOY(tty, "s", TOYFLAG_USR|TOYFLAG_BIN))
USE_TCPSVD(OLDTOY(udpsvd, tcpsvd, TOYFLAG_USR|TOYFLAG_BIN))
USE_UMOUNT(NEWTOY(umount, "ndDflrat*v[!na]", TOYFLAG_BIN|TOYFLAG_STAYROOT))