diff options
author | Elliott Hughes <enh@google.com> | 2015-05-05 13:17:47 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2015-05-05 13:17:47 -0700 |
commit | 12125dd0bf065cb500529920db077abbd818a85d (patch) | |
tree | 1421b0b35ddace9e8a4573a00471871b99a6df85 | |
parent | 5d6af359d033997567bba2623cda095711458e07 (diff) | |
download | toybox-12125dd0bf065cb500529920db077abbd818a85d.tar.gz |
Regenerate generated files.
Change-Id: Ie882b61d9bf3489348d145bc127bab8a128397fe
-rw-r--r-- | .config | 2 | ||||
-rw-r--r-- | generated/config.h | 4 | ||||
-rw-r--r-- | generated/flags.h | 6 | ||||
-rw-r--r-- | generated/help.h | 6 | ||||
-rw-r--r-- | generated/newtoys.h | 2 |
5 files changed, 9 insertions, 11 deletions
@@ -54,8 +54,8 @@ CONFIG_KILL=y # CONFIG_LINK is not set CONFIG_LN=y CONFIG_LS=y -# CONFIG_LS_SMACK is not set CONFIG_LS_COLOR=y +CONFIG_LS_Z=y CONFIG_MKDIR=y CONFIG_MKFIFO=y CONFIG_NICE=y diff --git a/generated/config.h b/generated/config.h index 67a542b5..9e141056 100644 --- a/generated/config.h +++ b/generated/config.h @@ -92,10 +92,10 @@ #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_LS_Z 1 +#define USE_LS_Z(...) __VA_ARGS__ #define CFG_MKDIR 1 #define USE_MKDIR(...) __VA_ARGS__ #define CFG_MKFIFO 1 diff --git a/generated/flags.h b/generated/flags.h index e77258ee..c4f1e55b 100644 --- a/generated/flags.h +++ b/generated/flags.h @@ -1182,9 +1182,9 @@ #undef FLAG_S #endif -// ls (color):;goACFHLRSacdfiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL] (color):;ZgoACFHLRSacdfiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL] +// ls (color):;ZgoACFHLRSacdfiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL] (color):;ZgoACFHLRSacdfiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL] #undef OPTSTR_ls -#define OPTSTR_ls "(color):;goACFHLRSacdfiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL]" +#define OPTSTR_ls "(color):;ZgoACFHLRSacdfiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL]" #ifdef CLEANUP_ls #undef CLEANUP_ls #undef FOR_ls @@ -3690,7 +3690,7 @@ #define FLAG_o (1<<24) #define FLAG_g (1<<25) #define FLAG_Z (1<<26) -#define FLAG_color (FORCED_FLAG<<27) +#define FLAG_color (1<<27) #endif #ifdef FOR_lsattr diff --git a/generated/help.h b/generated/help.h index 037c2e67..041da128 100644 --- a/generated/help.h +++ b/generated/help.h @@ -428,11 +428,9 @@ #define help_mkdir "usage: mkdir [-vp] [-m mode] [dirname...]\n\nCreate one or more directories.\n\n-m set permissions of directory to mode.\n-p make parent directories as needed.\n-v verbose\n\n" -#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_color "\n--color device=yellow symlink=turquoise/red dir=blue socket=purple\n-Z security context\n files: exe=green suid=red suidfile=redback stickydir=greenback\n =auto means detect if output is a tty.\nusage: ls --color[=auto] [-Z] [-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\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_ls "usage: ls --color[=auto] [-Z] [-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\n\n--color device=yellow symlink=turquoise/red dir=blue socket=purple\n-Z security context\n files: exe=green suid=red suidfile=redback stickydir=greenback\n =auto means detect if output is a tty.\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 b676f3b9..2636b2b3 100644 --- a/generated/newtoys.h +++ b/generated/newtoys.h @@ -112,7 +112,7 @@ USE_LOGGER(NEWTOY(logger, "st:p:", TOYFLAG_USR|TOYFLAG_BIN)) 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):;")USE_LS_SMACK("Z")"goACFHLRSacdfiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL]", TOYFLAG_BIN|TOYFLAG_LOCALE)) +USE_LS(NEWTOY(ls, USE_LS_COLOR("(color):;")USE_LS_Z("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)) |