From 59cff4a51fb39aca802ed0094a118dd99878b881 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 18 Feb 2015 17:22:23 -0800 Subject: [PATCH] Regenerate generated toybox files after sync. Change-Id: I6b1d120bd08f58d7cfa869070e61ad792698071c --- .config | 5 ++++- generated/config.h | 6 ++++++ generated/flags.h | 52 +++++++++++++++++++++++++++++---------------- generated/help.h | 8 ++++--- generated/newtoys.h | 14 ++++++------ 5 files changed, 56 insertions(+), 29 deletions(-) diff --git a/.config b/.config index d7f7e9c10..ba82f9e39 100644 --- a/.config +++ b/.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # ToyBox version: KCONFIG_VERSION -# Mon Feb 9 12:06:00 2015 +# Wed Feb 18 17:15:59 2015 # CONFIG_TOYBOX_CONTAINER=y CONFIG_TOYBOX_FIFREEZE=y @@ -40,6 +40,8 @@ CONFIG_EXPAND=y CONFIG_FALSE=y CONFIG_FIND=y CONFIG_GREP=y +CONFIG_EGREP=y +CONFIG_FGREP=y CONFIG_HEAD=y CONFIG_ID=y CONFIG_ID_SELINUX=y @@ -184,6 +186,7 @@ CONFIG_CHVT=y CONFIG_CLEAR=y # CONFIG_COUNT is not set CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y # CONFIG_EJECT is not set # CONFIG_FACTOR is not set CONFIG_FALLOCATE=y diff --git a/generated/config.h b/generated/config.h index 7096babc7..9256a6fbc 100644 --- a/generated/config.h +++ b/generated/config.h @@ -64,6 +64,10 @@ #define USE_FIND(...) __VA_ARGS__ #define CFG_GREP 1 #define USE_GREP(...) __VA_ARGS__ +#define CFG_EGREP 1 +#define USE_EGREP(...) __VA_ARGS__ +#define CFG_FGREP 1 +#define USE_FGREP(...) __VA_ARGS__ #define CFG_HEAD 1 #define USE_HEAD(...) __VA_ARGS__ #define CFG_ID 1 @@ -336,6 +340,8 @@ #define USE_COUNT(...) #define CFG_DOS2UNIX 1 #define USE_DOS2UNIX(...) __VA_ARGS__ +#define CFG_UNIX2DOS 1 +#define USE_UNIX2DOS(...) __VA_ARGS__ #define CFG_EJECT 0 #define USE_EJECT(...) #define CFG_FACTOR 0 diff --git a/generated/flags.h b/generated/flags.h index 287784f11..83774c921 100644 --- a/generated/flags.h +++ b/generated/flags.h @@ -277,14 +277,15 @@ #undef FOR_count #endif -// cp <2RHLPprdaslvnFfi[-HLPd][-ni] <2RHLPprdaslvnFfi[-HLPd][-ni] +// cp <2RHLPprdaslvnF(remove-destination)fi[-HLPd][-ni] <2RHLPprdaslvnF(remove-destination)fi[-HLPd][-ni] #undef OPTSTR_cp -#define OPTSTR_cp "<2RHLPprdaslvnFfi[-HLPd][-ni]" +#define OPTSTR_cp "<2RHLPprdaslvnF(remove-destination)fi[-HLPd][-ni]" #ifdef CLEANUP_cp #undef CLEANUP_cp #undef FOR_cp #undef FLAG_i #undef FLAG_f +#undef FLAG_remove_destination #undef FLAG_F #undef FLAG_n #undef FLAG_v @@ -893,18 +894,18 @@ #undef FOR_hostname #endif -// hwclock >0(fast)f(rtc):u(utc)l(localtime)t(systz)w(systohc)s(hctosys)r(show)[!ul][!rsw] >0(fast)f(rtc):u(utc)l(localtime)t(systz)w(systohc)s(hctosys)r(show)[!ul][!rsw] +// 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] #undef OPTSTR_hwclock -#define OPTSTR_hwclock ">0(fast)f(rtc):u(utc)l(localtime)t(systz)w(systohc)s(hctosys)r(show)[!ul][!rsw]" +#define OPTSTR_hwclock ">0(fast)f(rtc):u(utc)l(localtime)t(systz)s(hctosys)r(show)w(systohc)[-ul][!rtsw]" #ifdef CLEANUP_hwclock #undef CLEANUP_hwclock #undef FOR_hwclock +#undef FLAG_systohc +#undef FLAG_w #undef FLAG_show #undef FLAG_r #undef FLAG_hctosys #undef FLAG_s -#undef FLAG_systohc -#undef FLAG_w #undef FLAG_systz #undef FLAG_t #undef FLAG_localtime @@ -1334,16 +1335,16 @@ #undef FOR_mkswap #endif -// mktemp >1q(directory)d(tmpdir)p: >1q(directory)d(tmpdir)p: +// mktemp >1qd(directory)p(tmpdir): >1qd(directory)p(tmpdir): #undef OPTSTR_mktemp -#define OPTSTR_mktemp ">1q(directory)d(tmpdir)p:" +#define OPTSTR_mktemp ">1qd(directory)p(tmpdir):" #ifdef CLEANUP_mktemp #undef CLEANUP_mktemp #undef FOR_mktemp -#undef FLAG_p #undef FLAG_tmpdir -#undef FLAG_d +#undef FLAG_p #undef FLAG_directory +#undef FLAG_d #undef FLAG_q #endif @@ -2410,6 +2411,14 @@ #undef FLAG_f #endif +// unix2dos +#undef OPTSTR_unix2dos +#define OPTSTR_unix2dos 0 +#ifdef CLEANUP_unix2dos +#undef CLEANUP_unix2dos +#undef FOR_unix2dos +#endif + // unlink <1>1 #undef OPTSTR_unlink #define OPTSTR_unlink 0 @@ -2828,6 +2837,7 @@ #endif #define FLAG_i (1<<0) #define FLAG_f (1<<1) +#define FLAG_remove_destination (1<<2) #define FLAG_F (1<<2) #define FLAG_n (1<<3) #define FLAG_v (1<<4) @@ -3346,12 +3356,12 @@ #ifndef TT #define TT this.hwclock #endif -#define FLAG_show (1<<0) -#define FLAG_r (1<<0) -#define FLAG_hctosys (1<<1) -#define FLAG_s (1<<1) -#define FLAG_systohc (1<<2) -#define FLAG_w (1<<2) +#define FLAG_systohc (1<<0) +#define FLAG_w (1<<0) +#define FLAG_show (1<<1) +#define FLAG_r (1<<1) +#define FLAG_hctosys (1<<2) +#define FLAG_s (1<<2) #define FLAG_systz (1<<3) #define FLAG_t (1<<3) #define FLAG_localtime (1<<4) @@ -3713,10 +3723,10 @@ #ifndef TT #define TT this.mktemp #endif +#define FLAG_tmpdir (1<<0) #define FLAG_p (1<<0) -#define FLAG_tmpdir (1<<1) +#define FLAG_directory (1<<1) #define FLAG_d (1<<1) -#define FLAG_directory (1<<2) #define FLAG_q (1<<2) #endif @@ -4609,6 +4619,12 @@ #define FLAG_f (1<<7) #endif +#ifdef FOR_unix2dos +#ifndef TT +#define TT this.unix2dos +#endif +#endif + #ifdef FOR_unlink #ifndef TT #define TT this.unlink diff --git a/generated/help.h b/generated/help.h index 84d2b586d..b9bbfc630 100644 --- a/generated/help.h +++ b/generated/help.h @@ -172,7 +172,9 @@ #define help_eject "usage: eject [-stT] [DEVICE]\n\nEject DEVICE or default /dev/cdrom\n\n-s SCSI device\n-t Close tray\n-T Open/close tray (toggle).\n\n" -#define help_dos2unix "usage: dos2unix/unix2dos [file...]\n\nConvert newline format between dos (\\r\\n) and unix (just \\n)\nIf no files listed copy from stdin, \"-\" is a synonym for stdin.\n\n" +#define help_unix2dos "usage: unix2dos [FILE...]\n\nConvert newline format from unix \"\\n\" to dos \"\\r\\n\".\nIf no files listed copy from stdin, \"-\" is a synonym for stdin.\n\n" + +#define help_dos2unix "usage: dos2unix [FILE...]\n\nConvert newline format from dos \"\\r\\n\" to unix \"\\n\".\nIf no files listed copy from stdin, \"-\" is a synonym for stdin.\n\n" #define help_count "usage: count\n\nCopy stdin to stdout, displaying simple progress indicator to stderr.\n\n" @@ -286,7 +288,7 @@ #define help_iconv "usage: iconv [-f FROM] [-t TO] [FILE...]\n\nConvert character encoding of files.\n\n-f convert from (default utf8)\n-t convert to (default utf8)\n\n" -#define help_hwclock "usage: hwclock [-rswtluf]\n\n-f FILE Use specified device file instead of /dev/rtc (--show)\n-l Hardware clock uses localtime (--localtime)\n-r Show hardware clock time (--show)\n-s Set system time from hardware clock (--hctosys)\n-t Set the system time based on the current timezone (--systz)\n-u Hardware clock uses UTC (--utc)\n-w Set hardware clock from system time (--systohc)\n\n" +#define help_hwclock "usage: hwclock [-rswtluf]\n\n-f FILE Use specified device file instead of /dev/rtc (--rtc)\n-l Hardware clock uses localtime (--localtime)\n-r Show hardware clock time (--show)\n-s Set system time from hardware clock (--hctosys)\n-t Set the system time based on the current timezone (--systz)\n-u Hardware clock uses UTC (--utc)\n-w Set hardware clock from system time (--systohc)\n\n" #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" @@ -462,7 +464,7 @@ #define help_mv "usage: mv [-finv] SOURCE... DEST\"\n\n-f force copy by deleting destination file\n-i interactive, prompt before overwriting existing DEST\n-n no clobber (don't overwrite DEST)\n-v verbose\n" -#define help_cp "usage: cp [-HLPRadfilnprsv] SOURCE... DEST\n\nCopy files from SOURCE to DEST. If more than one SOURCE, DEST must\nbe a directory.\n-F delete any existing destination file first (breaks hardlinks)\n-H Follow symlinks listed on command line\n-L Follow all symlinks\n-P Do not follow symlinks [default]\n-R recurse into subdirectories (DEST must be a directory)\n-a same as -dpr\n-d don't dereference symlinks\n-f delete destination files we can't write to\n-i interactive, prompt before overwriting existing DEST\n-l hard link instead of copy\n-n no clobber (don't overwrite DEST)\n-p preserve timestamps, ownership, and permissions\n-r synonym for -R\n-s symlink instead of copy\n-v verbose\n" +#define help_cp "usage: cp [-HLPRadfilnprsv] SOURCE... DEST\n\nCopy files from SOURCE to DEST. If more than one SOURCE, DEST must\nbe a directory.\n-F delete any existing destination file first (--remove-destination)\n-H Follow symlinks listed on command line\n-L Follow all symlinks\n-P Do not follow symlinks [default]\n-R recurse into subdirectories (DEST must be a directory)\n-a same as -dpr\n-d don't dereference symlinks\n-f delete destination files we can't write to\n-i interactive, prompt before overwriting existing DEST\n-l hard link instead of copy\n-n no clobber (don't overwrite DEST)\n-p preserve timestamps, ownership, and permissions\n-r synonym for -R\n-s symlink instead of copy\n-v verbose\n" #define help_comm "usage: comm [-123] FILE1 FILE2\n\nReads FILE1 and FILE2, which should be ordered, and produces three text\ncolumns as output: lines only in FILE1; lines only in FILE2; and lines\nin both files. Filename \"-\" is a synonym for stdin.\n\n-1 suppress the output column of lines unique to FILE1\n-2 suppress the output column of lines unique to FILE2\n-3 suppress the output column of lines duplicated in FILE1 and FILE2\n\n" diff --git a/generated/newtoys.h b/generated/newtoys.h index ca19d6962..6f1c2442a 100644 --- a/generated/newtoys.h +++ b/generated/newtoys.h @@ -28,7 +28,7 @@ USE_CMP(NEWTOY(cmp, "<2>2ls", TOYFLAG_USR|TOYFLAG_BIN)) USE_COMM(NEWTOY(comm, "<2>2321", TOYFLAG_USR|TOYFLAG_BIN)) USE_COMPRESS(NEWTOY(compress, "zcd9lrg[-cd][!zgLr]", TOYFLAG_USR|TOYFLAG_BIN)) USE_COUNT(NEWTOY(count, NULL, TOYFLAG_USR|TOYFLAG_BIN)) -USE_CP(NEWTOY(cp, "<2RHLPp"USE_CP_MORE("rdaslvnF")"fi[-HLP"USE_CP_MORE("d")"]"USE_CP_MORE("[-ni]"), TOYFLAG_BIN)) +USE_CP(NEWTOY(cp, "<2RHLPp"USE_CP_MORE("rdaslvnF(remove-destination)")"fi[-HLP"USE_CP_MORE("d")"]"USE_CP_MORE("[-ni]"), TOYFLAG_BIN)) USE_CPIO(NEWTOY(cpio, "mduH:p:|i|t|F:v(verbose)o|[!pio][!pot][!pF]", TOYFLAG_BIN)) 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)) @@ -44,11 +44,11 @@ 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_DOS2UNIX(NEWTOY(dos2unix, NULL, 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)) USE_ECHO(NEWTOY(echo, "^?en", TOYFLAG_BIN)) -USE_GREP(OLDTOY(egrep, grep, TOYFLAG_BIN)) +USE_EGREP(OLDTOY(egrep, grep, TOYFLAG_BIN)) USE_EJECT(NEWTOY(eject, ">1stT[!tT]", TOYFLAG_USR|TOYFLAG_BIN)) USE_ENV(NEWTOY(env, "^i", TOYFLAG_USR|TOYFLAG_BIN)) USE_SH(NEWTOY(exit, NULL, TOYFLAG_NOFORK)) @@ -58,7 +58,7 @@ USE_FACTOR(NEWTOY(factor, 0, TOYFLAG_USR|TOYFLAG_BIN)) USE_FALLOCATE(NEWTOY(fallocate, ">1l#|", TOYFLAG_USR|TOYFLAG_BIN)) USE_FALSE(NEWTOY(false, NULL, TOYFLAG_BIN)) USE_FDISK(NEWTOY(fdisk, "C#<0H#<0S#<0b#<512ul", TOYFLAG_SBIN)) -USE_GREP(OLDTOY(fgrep, grep, TOYFLAG_BIN)) +USE_FGREP(OLDTOY(fgrep, grep, TOYFLAG_BIN)) USE_FIND(NEWTOY(find, "?^HL[-HL]", TOYFLAG_USR|TOYFLAG_BIN)) USE_FOLD(NEWTOY(fold, "bsuw#", TOYFLAG_USR|TOYFLAG_BIN)) USE_FREE(NEWTOY(free, "tgmkb[!tgmkb]", TOYFLAG_USR|TOYFLAG_BIN)) @@ -82,7 +82,7 @@ USE_HELLO(NEWTOY(hello, 0, TOYFLAG_USR|TOYFLAG_BIN)) USE_HELP(NEWTOY(help, ""USE_HELP_EXTRAS("ah"), 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)w(systohc)s(hctosys)r(show)[!ul][!rsw]", TOYFLAG_USR|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_SELINUX("Z")"nGgru[!"USE_ID_SELINUX("Z")"Ggu]", TOYFLAG_BIN)) USE_IFCONFIG(NEWTOY(ifconfig, "^?a", TOYFLAG_BIN)) @@ -124,7 +124,7 @@ USE_MKFIFO(NEWTOY(mkfifo, "<1m:", TOYFLAG_BIN)) USE_MKNOD(NEWTOY(mknod, "<2>4", TOYFLAG_BIN)) USE_MKPASSWD(NEWTOY(mkpasswd, ">2S:m:P#=0<0", TOYFLAG_USR|TOYFLAG_BIN)) USE_MKSWAP(NEWTOY(mkswap, "<1>1", TOYFLAG_SBIN)) -USE_MKTEMP(NEWTOY(mktemp, ">1q(directory)d(tmpdir)p:", TOYFLAG_BIN)) +USE_MKTEMP(NEWTOY(mktemp, ">1qd(directory)p(tmpdir):", TOYFLAG_BIN)) USE_MODINFO(NEWTOY(modinfo, "<1b:k:F:0", TOYFLAG_BIN)) USE_MODPROBE(NEWTOY(modprobe, "alrqvsDb", TOYFLAG_SBIN)) USE_MORE(NEWTOY(more, NULL, TOYFLAG_USR|TOYFLAG_BIN)) @@ -218,7 +218,7 @@ USE_TCPSVD(OLDTOY(udpsvd, tcpsvd, TOYFLAG_USR|TOYFLAG_BIN)) USE_UMOUNT(NEWTOY(umount, "ndDflrat*v[!na]", TOYFLAG_BIN|TOYFLAG_STAYROOT)) USE_UNAME(NEWTOY(uname, "oamvrns[+os]", TOYFLAG_BIN)) USE_UNIQ(NEWTOY(uniq, "f#s#w#zicdu", TOYFLAG_BIN)) -USE_DOS2UNIX(OLDTOY(unix2dos, dos2unix, TOYFLAG_BIN)) +USE_UNIX2DOS(NEWTOY(unix2dos, 0, TOYFLAG_BIN)) USE_UNLINK(NEWTOY(unlink, "<1>1", TOYFLAG_USR|TOYFLAG_BIN)) USE_UNSHARE(NEWTOY(unshare, "<1^imnpuU", TOYFLAG_USR|TOYFLAG_BIN)) USE_UPTIME(NEWTOY(uptime, NULL, TOYFLAG_USR|TOYFLAG_BIN))