Regenerate generated files.
Change-Id: I5644b11b7c76e71feaace364d60a03e88cd8fabe
diff --git a/.config b/.config
index 423b06c..2d354d0 100644
--- a/.config
+++ b/.config
@@ -190,6 +190,7 @@
CONFIG_BLKID=y
# CONFIG_FSTYPE is not set
CONFIG_BLOCKDEV=y
+CONFIG_BUNZIP2=y
CONFIG_BZCAT=y
CONFIG_CHCON=y
CONFIG_CHROOT=y
diff --git a/generated/config.h b/generated/config.h
index 3775017..3cfcdc0 100644
--- a/generated/config.h
+++ b/generated/config.h
@@ -350,6 +350,8 @@
#define USE_FSTYPE(...)
#define CFG_BLOCKDEV 1
#define USE_BLOCKDEV(...) __VA_ARGS__
+#define CFG_BUNZIP2 1
+#define USE_BUNZIP2(...) __VA_ARGS__
#define CFG_BZCAT 1
#define USE_BZCAT(...) __VA_ARGS__
#define CFG_CHCON 1
diff --git a/generated/flags.h b/generated/flags.h
index a311883..2fb316f 100644
--- a/generated/flags.h
+++ b/generated/flags.h
@@ -115,6 +115,19 @@
#undef FOR_brctl
#endif
+// bunzip2 cftkv cftkv
+#undef OPTSTR_bunzip2
+#define OPTSTR_bunzip2 "cftkv"
+#ifdef CLEANUP_bunzip2
+#undef CLEANUP_bunzip2
+#undef FOR_bunzip2
+#undef FLAG_v
+#undef FLAG_k
+#undef FLAG_t
+#undef FLAG_f
+#undef FLAG_c
+#endif
+
// bzcat
#undef OPTSTR_bzcat
#define OPTSTR_bzcat 0
@@ -374,15 +387,15 @@
#undef FLAG_b
#endif
-// date d:s:r:u[!dr] d:s:r:u[!dr]
+// date d:D:r:u[!dr] d:D:r:u[!dr]
#undef OPTSTR_date
-#define OPTSTR_date "d:s:r:u[!dr]"
+#define OPTSTR_date "d:D:r:u[!dr]"
#ifdef CLEANUP_date
#undef CLEANUP_date
#undef FOR_date
#undef FLAG_u
#undef FLAG_r
-#undef FLAG_s
+#undef FLAG_D
#undef FLAG_d
#endif
@@ -2859,6 +2872,17 @@
#endif
#endif
+#ifdef FOR_bunzip2
+#ifndef TT
+#define TT this.bunzip2
+#endif
+#define FLAG_v (1<<0)
+#define FLAG_k (1<<1)
+#define FLAG_t (1<<2)
+#define FLAG_f (1<<3)
+#define FLAG_c (1<<4)
+#endif
+
#ifdef FOR_bzcat
#ifndef TT
#define TT this.bzcat
@@ -3080,7 +3104,7 @@
#endif
#define FLAG_u (1<<0)
#define FLAG_r (1<<1)
-#define FLAG_s (1<<2)
+#define FLAG_D (1<<2)
#define FLAG_d (1<<3)
#endif
diff --git a/generated/globals.h b/generated/globals.h
index 3ee33ce..607cd31 100644
--- a/generated/globals.h
+++ b/generated/globals.h
@@ -963,6 +963,9 @@
char *file;
char *setfmt;
char *showdate;
+
+ char *tz;
+ unsigned nano;
};
// toys/posix/df.c
diff --git a/generated/help.h b/generated/help.h
index ba18362..c07c86c 100644
--- a/generated/help.h
+++ b/generated/help.h
@@ -226,7 +226,9 @@
#define help_chcon "usage: chcon [-hRv] CONTEXT FILE...\n\nChange the SELinux security context of listed file[s].\n\n-h change symlinks instead of what they point to.\n-R recurse into subdirectories.\n-v verbose output.\n\n"
-#define help_bzcat "usage: bzcat [filename...]\n\nDecompress listed files to stdout. Use stdin if no files listed.\n\n"
+#define help_bzcat "usage: bzcat [FILE...]\n\nDecompress listed files to stdout. Use stdin if no files listed.\n\n"
+
+#define help_bunzip2 "usage: bunzip2 [-cftkv] [FILE...]\n\nDecompress listed files (file.bz becomes file) deleting archive file(s).\nRead from stdin if no files listed.\n\n-c force output to stdout\n-f force decompression. (If FILE doesn't end in .bz, replace original.)\n-k keep input files (-c and -t imply this)\n-t test integrity\n-v verbose\n\n"
#define help_blockdev "usage: blockdev --OPTION... BLOCKDEV...\n\nCall ioctl(s) on each listed block device\n\nOPTIONs:\n--setro Set read only\n--setrw Set read write\n--getro Get read only\n--getss Get sector size\n--getbsz Get block size\n--setbsz BYTES Set block size\n--getsz Get device size in 512-byte sectors\n--getsize Get device size in sectors (deprecated)\n--getsize64 Get device size in bytes\n--flushbufs Flush buffers\n--rereadpt Reread partition table\n\n"
@@ -488,7 +490,7 @@
#define help_df "usage: df [-t type] [FILESYSTEM ...]\n\nThe \"disk free\" command shows total/used/available disk space for\neach filesystem listed on the command line, or all currently mounted\nfilesystems.\n\n-P The SUSv3 \"Pedantic\" option\n-k Sets units back to 1024 bytes (the default without -P)\n-t type Display only filesystems of this type.\n\nPedantic provides a slightly less useful output format dictated by Posix,\nand sets the units to 512 bytes instead of the default 1024 bytes.\n\n"
-#define help_date "usage: date [-u] [-r FILE] [-d DATE] [+DISPLAY_FORMAT] [-s SET_FORMAT] [SET]\n\nSet/get the current date/time. With no SET shows the current date.\n\nDefault SET format is \"MMDDhhmm[[CC]YY][.ss]\", that's (2 digits each)\nmonth, day, hour (0-23), and minute. Optionally century, year, and second.\n\n-d Show DATE instead of current time (convert date format)\n-r Use modification time of FILE instead of current date\n-s +FORMAT for SET or -d (instead of MMDDhhmm[[CC]YY][.ss])\n-u Use UTC instead of current timezone\n\n+FORMAT specifies display format string using these escapes:\n\n%% literal % %n newline %t tab\n%S seconds (00-60) %M minute (00-59) %m month (01-12)\n%H hour (0-23) %I hour (01-12) %p AM/PM\n%y short year (00-99) %Y year %C century\n%a short weekday name %A weekday name %u day of week (1-7, 1=mon)\n%b short month name %B month name %Z timezone name\n%j day of year (001-366) %d day of month (01-31) %e day of month ( 1-31)\n\n%U Week of year (0-53 start sunday) %W Week of year (0-53 start monday)\n%V Week of year (1-53 start monday, week < 4 days not part of this year)\n\n%D = \"%m/%d/%y\" %r = \"%I : %M : %S %p\" %T = \"%H:%M:%S\" %h = \"%b\"\n%x locale date %X locale time %c locale date/time\n\n"
+#define help_date "usage: date [-u] [-r FILE] [-d DATE] [+DISPLAY_FORMAT] [-D SET_FORMAT] [SET]\n\nSet/get the current date/time. With no SET shows the current date.\n\nDefault SET format is \"MMDDhhmm[[CC]YY][.ss]\", that's (2 digits each)\nmonth, day, hour (0-23), and minute. Optionally century, year, and second.\nAlso accepts \"@UNIXTIME[.FRACTION]\" as seconds since midnight Jan 1 1970.\n\n-d Show DATE instead of current time (convert date format)\n-D +FORMAT for SET or -d (instead of MMDDhhmm[[CC]YY][.ss])\n-r Use modification time of FILE instead of current date\n-u Use UTC instead of current timezone\n\n+FORMAT specifies display format string using these escapes:\n\n%% literal % %n newline %t tab\n%S seconds (00-60) %M minute (00-59) %m month (01-12)\n%H hour (0-23) %I hour (01-12) %p AM/PM\n%y short year (00-99) %Y year %C century\n%a short weekday name %A weekday name %u day of week (1-7, 1=mon)\n%b short month name %B month name %Z timezone name\n%j day of year (001-366) %d day of month (01-31) %e day of month ( 1-31)\n\n%U Week of year (0-53 start sunday) %W Week of year (0-53 start monday)\n%V Week of year (1-53 start monday, week < 4 days not part of this year)\n\n%D = \"%m/%d/%y\" %r = \"%I : %M : %S %p\" %T = \"%H:%M:%S\" %h = \"%b\"\n%x locale date %X locale time %c locale date/time\n\n"
#define help_cut "usage: cut OPTION... [FILE]...\n\nPrint selected parts of lines from each FILE to standard output.\n\n-b LIST select only these bytes from LIST.\n-c LIST select only these characters from LIST.\n-f LIST select only these fields.\n-d DELIM use DELIM instead of TAB for field delimiter.\n-s do not print lines not containing delimiters.\n-n don't split multibyte characters (Ignored).\n\n"
diff --git a/generated/newtoys.h b/generated/newtoys.h
index 3801f2e..e6af5be 100644
--- a/generated/newtoys.h
+++ b/generated/newtoys.h
@@ -11,6 +11,7 @@
USE_BLOCKDEV(NEWTOY(blockdev, "<1>1(setro)(setrw)(getro)(getss)(getbsz)(setbsz)#<0(getsz)(getsize)(getsize64)(flushbufs)(rereadpt)",TOYFLAG_USR|TOYFLAG_BIN))
USE_BOOTCHARTD(NEWTOY(bootchartd, 0, TOYFLAG_STAYROOT|TOYFLAG_USR|TOYFLAG_BIN))
USE_BRCTL(NEWTOY(brctl, "<1", TOYFLAG_USR|TOYFLAG_SBIN))
+USE_BUNZIP2(NEWTOY(bunzip2, "cftkv", TOYFLAG_USR|TOYFLAG_BIN))
USE_BZCAT(NEWTOY(bzcat, NULL, TOYFLAG_USR|TOYFLAG_BIN))
USE_CAL(NEWTOY(cal, ">2", TOYFLAG_USR|TOYFLAG_BIN))
USE_CAT(NEWTOY(cat, "u"USE_CAT_V("vte"), TOYFLAG_BIN))
@@ -34,7 +35,7 @@
USE_CROND(NEWTOY(crond, "fbSl#<0=8d#<0L:c:[-bf][-LS][-ld]", TOYFLAG_USR|TOYFLAG_SBIN|TOYFLAG_NEEDROOT))
USE_CRONTAB(NEWTOY(crontab, "c:u:elr[!elr]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_STAYROOT))
USE_CUT(NEWTOY(cut, "b:|c:|f:|d:sn[!cbf]", TOYFLAG_USR|TOYFLAG_BIN))
-USE_DATE(NEWTOY(date, "d:s:r:u[!dr]", TOYFLAG_BIN))
+USE_DATE(NEWTOY(date, "d:D:r:u[!dr]", TOYFLAG_BIN))
USE_DD(NEWTOY(dd, NULL, TOYFLAG_USR|TOYFLAG_BIN))
USE_DEALLOCVT(NEWTOY(deallocvt, ">1", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_NEEDROOT))
USE_GROUPDEL(OLDTOY(delgroup, groupdel, TOYFLAG_NEEDROOT|TOYFLAG_SBIN))
