diff options
author | Elliott Hughes <enh@google.com> | 2019-11-14 11:12:35 -0800 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2019-11-14 13:18:22 -0800 |
commit | 56af1fb2d0ee6830a77b6a9224ec0fce70734e4f (patch) | |
tree | 17751b716e94ad090b8f3f165cd94e797b390663 /android | |
parent | 287d1c012e831284e2cf53736517e9448ddb1a23 (diff) | |
parent | ae34569fd0e2242ea85ffec193d825dd006d1038 (diff) | |
download | toybox-56af1fb2d0ee6830a77b6a9224ec0fce70734e4f.tar.gz |
Merge remote-tracking branch 'toybox/master' into HEAD
Change-Id: Ic323f5f63d1cc0a4fc341897da3a39b62bf1c198
Diffstat (limited to 'android')
-rw-r--r-- | android/device/generated/flags.h | 72 | ||||
-rw-r--r-- | android/device/generated/globals.h | 4 | ||||
-rw-r--r-- | android/device/generated/help.h | 6 | ||||
-rw-r--r-- | android/device/generated/newtoys.h | 4 | ||||
-rw-r--r-- | android/linux/generated/flags.h | 72 | ||||
-rw-r--r-- | android/linux/generated/globals.h | 4 | ||||
-rw-r--r-- | android/linux/generated/help.h | 6 | ||||
-rw-r--r-- | android/linux/generated/newtoys.h | 4 | ||||
-rw-r--r-- | android/mac/generated/flags.h | 72 | ||||
-rw-r--r-- | android/mac/generated/globals.h | 4 | ||||
-rw-r--r-- | android/mac/generated/help.h | 6 | ||||
-rw-r--r-- | android/mac/generated/newtoys.h | 4 |
12 files changed, 135 insertions, 123 deletions
diff --git a/android/device/generated/flags.h b/android/device/generated/flags.h index 4c12cbf4..65ecffa0 100644 --- a/android/device/generated/flags.h +++ b/android/device/generated/flags.h @@ -1496,9 +1496,9 @@ #undef FOR_link #endif -// ln <1t:Tvnfs <1t:Tvnfs +// ln <1rt:Tvnfs <1rt:Tvnfs #undef OPTSTR_ln -#define OPTSTR_ln "<1t:Tvnfs" +#define OPTSTR_ln "<1rt:Tvnfs" #ifdef CLEANUP_ln #undef CLEANUP_ln #undef FOR_ln @@ -1508,6 +1508,7 @@ #undef FLAG_v #undef FLAG_T #undef FLAG_t +#undef FLAG_r #endif // load_policy <1>1 <1>1 @@ -1584,14 +1585,15 @@ #undef FLAG_S #endif -// ls (color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb] (color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb] +// ls (color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstuw#=80<0x1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb] (color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstuw#=80<0x1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb] #undef OPTSTR_ls -#define OPTSTR_ls "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]" +#define OPTSTR_ls "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstuw#=80<0x1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]" #ifdef CLEANUP_ls #undef CLEANUP_ls #undef FOR_ls #undef FLAG_1 #undef FLAG_x +#undef FLAG_w #undef FLAG_u #undef FLAG_t #undef FLAG_s @@ -4633,6 +4635,7 @@ #define FLAG_v (1<<3) #define FLAG_T (1<<4) #define FLAG_t (1<<5) +#define FLAG_r (1<<6) #endif #ifdef FOR_load_policy @@ -4701,36 +4704,37 @@ #endif #define FLAG_1 (1<<0) #define FLAG_x (1<<1) -#define FLAG_u (1<<2) -#define FLAG_t (1<<3) -#define FLAG_s (1<<4) -#define FLAG_r (1<<5) -#define FLAG_q (1<<6) -#define FLAG_p (1<<7) -#define FLAG_n (1<<8) -#define FLAG_m (1<<9) -#define FLAG_l (1<<10) -#define FLAG_k (1<<11) -#define FLAG_i (1<<12) -#define FLAG_h (1<<13) -#define FLAG_f (1<<14) -#define FLAG_d (1<<15) -#define FLAG_c (1<<16) -#define FLAG_b (1<<17) -#define FLAG_a (1<<18) -#define FLAG_S (1<<19) -#define FLAG_R (1<<20) -#define FLAG_L (1<<21) -#define FLAG_H (1<<22) -#define FLAG_F (1<<23) -#define FLAG_C (1<<24) -#define FLAG_A (1<<25) -#define FLAG_o (1<<26) -#define FLAG_g (1<<27) -#define FLAG_Z (1<<28) -#define FLAG_show_control_chars (1<<29) -#define FLAG_full_time (1<<30) -#define FLAG_color (1<<31) +#define FLAG_w (1<<2) +#define FLAG_u (1<<3) +#define FLAG_t (1<<4) +#define FLAG_s (1<<5) +#define FLAG_r (1<<6) +#define FLAG_q (1<<7) +#define FLAG_p (1<<8) +#define FLAG_n (1<<9) +#define FLAG_m (1<<10) +#define FLAG_l (1<<11) +#define FLAG_k (1<<12) +#define FLAG_i (1<<13) +#define FLAG_h (1<<14) +#define FLAG_f (1<<15) +#define FLAG_d (1<<16) +#define FLAG_c (1<<17) +#define FLAG_b (1<<18) +#define FLAG_a (1<<19) +#define FLAG_S (1<<20) +#define FLAG_R (1<<21) +#define FLAG_L (1<<22) +#define FLAG_H (1<<23) +#define FLAG_F (1<<24) +#define FLAG_C (1<<25) +#define FLAG_A (1<<26) +#define FLAG_o (1<<27) +#define FLAG_g (1<<28) +#define FLAG_Z (1<<29) +#define FLAG_show_control_chars (1<<30) +#define FLAG_full_time (1<<31) +#define FLAG_color (1LL<<32) #endif #ifdef FOR_lsattr diff --git a/android/device/generated/globals.h b/android/device/generated/globals.h index 04334b61..1077449b 100644 --- a/android/device/generated/globals.h +++ b/android/device/generated/globals.h @@ -245,8 +245,7 @@ struct dos2unix_data { // toys/other/fallocate.c struct fallocate_data { - long offset; - long size; + long o, l; }; // toys/other/fmt.c @@ -1171,6 +1170,7 @@ struct logger_data { // toys/posix/ls.c struct ls_data { + long w; long l; char *color; diff --git a/android/device/generated/help.h b/android/device/generated/help.h index 86eb663a..a3b3d5d3 100644 --- a/android/device/generated/help.h +++ b/android/device/generated/help.h @@ -520,11 +520,11 @@ #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" -#define HELP_ls "usage: ls [-ACFHLRSZacdfhiklmnpqrstux1] [--color[=auto]] [directory...]\n\nList files.\n\nwhat to show:\n-a all files including .hidden -b escape nongraphic chars\n-c use ctime for timestamps -d directory, not contents\n-i inode number -p put a '/' after dir names\n-q unprintable chars as '?' -s storage used (1024 byte units)\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 in subdirs -F append /dir *exe @sym |FIFO\n-Z security context\n\noutput formats:\n-1 list one file per line -C columns (sorted vertically)\n-g like -l but no owner -h human readable sizes\n-l long (show full details) -m comma separated\n-n like -l but numeric uid/gid -o like -l but no group\n-x columns (horizontal sort) -ll long with nanoseconds (--full-time)\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\nsorting (default is alphabetical):\n-f unsorted -r reverse -t timestamp -S size" +#define HELP_ls "usage: ls [-ACFHLRSZacdfhiklmnpqrstuwx1] [--color[=auto]] [directory...]\n\nList files.\n\nwhat to show:\n-a all files including .hidden -b escape nongraphic chars\n-c use ctime for timestamps -d directory, not contents\n-i inode number -p put a '/' after dir names\n-q unprintable chars as '?' -s storage used (1024 byte units)\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 in subdirs -F append /dir *exe @sym |FIFO\n-Z security context\n\noutput formats:\n-1 list one file per line -C columns (sorted vertically)\n-g like -l but no owner -h human readable sizes\n-l long (show full details) -m comma separated\n-n like -l but numeric uid/gid -o like -l but no group\n-w set column width -x columns (horizontal sort)\n-ll long with nanoseconds (--full-time)\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\nsorting (default is alphabetical):\n-f unsorted -r reverse -t timestamp -S size" #define HELP_logger "usage: logger [-s] [-t TAG] [-p [FACILITY.]PRIORITY] [message...]\n\nLog message (or stdin) to syslog.\n\n-s Also write message to stderr\n-t Use TAG instead of username to identify message source\n-p Specify PRIORITY with optional FACILITY. Default is \"user.notice\"" -#define HELP_ln "usage: ln [-sfnv] [-t DIR] [FROM...] TO\n\nCreate a link between FROM and TO.\nOne/two/many arguments work like \"mv\" or \"cp\".\n\n-s Create a symbolic link\n-f Force the creation of the link, even if TO already exists\n-n Symlink at TO treated as file\n-t Create links in DIR\n-T TO always treated as file, max 2 arguments\n-v Verbose" +#define HELP_ln "usage: ln [-sfnv] [-t DIR] [FROM...] TO\n\nCreate a link between FROM and TO.\nOne/two/many arguments work like \"mv\" or \"cp\".\n\n-s Create a symbolic link\n-f Force the creation of the link, even if TO already exists\n-n Symlink at TO treated as file\n-r Create relative symlink from -> to\n-t Create links in DIR\n-T TO always treated as file, max 2 arguments\n-v Verbose" #define HELP_link "usage: link FILE NEWLINK\n\nCreate hardlink to a file." @@ -538,7 +538,7 @@ #define HELP_groups "usage: groups [user]\n\nPrint the groups a user is in." -#define HELP_id "usage: id [-GZgnru] [USER...]\n\nPrint user and group ID.\n-G Show only the group IDs\n-Z Show only security context\n-g Show only the effective group ID\n-n Print names instead of numeric IDs (to be used with -Ggu)\n-r Show real ID instead of effective ID\n-u Show only the effective user ID" +#define HELP_id "usage: id [-GZgnru] [USER...]\n\nPrint user and group ID.\n-G Show all group IDs\n-Z Show only security context\n-g Show only the effective group ID\n-n Print names instead of numeric IDs (to be used with -Ggu)\n-r Show real ID instead of effective ID\n-u Show only the effective user ID" #define HELP_iconv "usage: iconv [-f FROM] [-t TO] [FILE...]\n\nConvert character encoding of files.\n\n-c Omit invalid chars\n-f Convert from (default utf8)\n-t Convert to (default utf8)" diff --git a/android/device/generated/newtoys.h b/android/device/generated/newtoys.h index 62b1d24a..a504d757 100644 --- a/android/device/generated/newtoys.h +++ b/android/device/generated/newtoys.h @@ -137,7 +137,7 @@ USE_KILLALL5(NEWTOY(killall5, "?o*ls: [!lo][!ls]", TOYFLAG_SBIN)) USE_KLOGD(NEWTOY(klogd, "c#<1>8n", TOYFLAG_SBIN)) USE_LAST(NEWTOY(last, "f:W", TOYFLAG_BIN)) USE_LINK(NEWTOY(link, "<2>2", TOYFLAG_USR|TOYFLAG_BIN)) -USE_LN(NEWTOY(ln, "<1t:Tvnfs", TOYFLAG_BIN)) +USE_LN(NEWTOY(ln, "<1rt:Tvnfs", TOYFLAG_BIN)) USE_LOAD_POLICY(NEWTOY(load_policy, "<1>1", TOYFLAG_USR|TOYFLAG_SBIN)) USE_LOG(NEWTOY(log, "<1p:t:", TOYFLAG_USR|TOYFLAG_SBIN)) USE_LOGGER(NEWTOY(logger, "st:p:", TOYFLAG_USR|TOYFLAG_BIN)) @@ -145,7 +145,7 @@ USE_LOGIN(NEWTOY(login, ">1f:ph:", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) USE_LOGNAME(NEWTOY(logname, ">0", TOYFLAG_USR|TOYFLAG_BIN)) USE_LOGWRAPPER(NEWTOY(logwrapper, 0, TOYFLAG_NOHELP|TOYFLAG_USR|TOYFLAG_BIN)) USE_LOSETUP(NEWTOY(losetup, ">2S(sizelimit)#s(show)ro#j:fdcaD[!afj]", TOYFLAG_SBIN)) -USE_LS(NEWTOY(ls, "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]", TOYFLAG_BIN|TOYFLAG_LOCALE)) +USE_LS(NEWTOY(ls, "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstuw#=80<0x1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]", TOYFLAG_BIN|TOYFLAG_LOCALE)) USE_LSATTR(NEWTOY(lsattr, "vldaR", TOYFLAG_BIN)) USE_LSMOD(NEWTOY(lsmod, NULL, TOYFLAG_SBIN)) USE_LSOF(NEWTOY(lsof, "lp*t", TOYFLAG_USR|TOYFLAG_BIN)) diff --git a/android/linux/generated/flags.h b/android/linux/generated/flags.h index 7331009a..f83570e1 100644 --- a/android/linux/generated/flags.h +++ b/android/linux/generated/flags.h @@ -1496,9 +1496,9 @@ #undef FOR_link #endif -// ln <1t:Tvnfs <1t:Tvnfs +// ln <1rt:Tvnfs <1rt:Tvnfs #undef OPTSTR_ln -#define OPTSTR_ln "<1t:Tvnfs" +#define OPTSTR_ln "<1rt:Tvnfs" #ifdef CLEANUP_ln #undef CLEANUP_ln #undef FOR_ln @@ -1508,6 +1508,7 @@ #undef FLAG_v #undef FLAG_T #undef FLAG_t +#undef FLAG_r #endif // load_policy <1>1 @@ -1584,14 +1585,15 @@ #undef FLAG_S #endif -// ls (color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb] (color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb] +// ls (color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstuw#=80<0x1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb] (color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstuw#=80<0x1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb] #undef OPTSTR_ls -#define OPTSTR_ls "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]" +#define OPTSTR_ls "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstuw#=80<0x1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]" #ifdef CLEANUP_ls #undef CLEANUP_ls #undef FOR_ls #undef FLAG_1 #undef FLAG_x +#undef FLAG_w #undef FLAG_u #undef FLAG_t #undef FLAG_s @@ -4633,6 +4635,7 @@ #define FLAG_v (1<<3) #define FLAG_T (1<<4) #define FLAG_t (1<<5) +#define FLAG_r (1<<6) #endif #ifdef FOR_load_policy @@ -4701,36 +4704,37 @@ #endif #define FLAG_1 (1<<0) #define FLAG_x (1<<1) -#define FLAG_u (1<<2) -#define FLAG_t (1<<3) -#define FLAG_s (1<<4) -#define FLAG_r (1<<5) -#define FLAG_q (1<<6) -#define FLAG_p (1<<7) -#define FLAG_n (1<<8) -#define FLAG_m (1<<9) -#define FLAG_l (1<<10) -#define FLAG_k (1<<11) -#define FLAG_i (1<<12) -#define FLAG_h (1<<13) -#define FLAG_f (1<<14) -#define FLAG_d (1<<15) -#define FLAG_c (1<<16) -#define FLAG_b (1<<17) -#define FLAG_a (1<<18) -#define FLAG_S (1<<19) -#define FLAG_R (1<<20) -#define FLAG_L (1<<21) -#define FLAG_H (1<<22) -#define FLAG_F (1<<23) -#define FLAG_C (1<<24) -#define FLAG_A (1<<25) -#define FLAG_o (1<<26) -#define FLAG_g (1<<27) -#define FLAG_Z (1<<28) -#define FLAG_show_control_chars (1<<29) -#define FLAG_full_time (1<<30) -#define FLAG_color (1<<31) +#define FLAG_w (1<<2) +#define FLAG_u (1<<3) +#define FLAG_t (1<<4) +#define FLAG_s (1<<5) +#define FLAG_r (1<<6) +#define FLAG_q (1<<7) +#define FLAG_p (1<<8) +#define FLAG_n (1<<9) +#define FLAG_m (1<<10) +#define FLAG_l (1<<11) +#define FLAG_k (1<<12) +#define FLAG_i (1<<13) +#define FLAG_h (1<<14) +#define FLAG_f (1<<15) +#define FLAG_d (1<<16) +#define FLAG_c (1<<17) +#define FLAG_b (1<<18) +#define FLAG_a (1<<19) +#define FLAG_S (1<<20) +#define FLAG_R (1<<21) +#define FLAG_L (1<<22) +#define FLAG_H (1<<23) +#define FLAG_F (1<<24) +#define FLAG_C (1<<25) +#define FLAG_A (1<<26) +#define FLAG_o (1<<27) +#define FLAG_g (1<<28) +#define FLAG_Z (1<<29) +#define FLAG_show_control_chars (1<<30) +#define FLAG_full_time (1<<31) +#define FLAG_color (1LL<<32) #endif #ifdef FOR_lsattr diff --git a/android/linux/generated/globals.h b/android/linux/generated/globals.h index 04334b61..1077449b 100644 --- a/android/linux/generated/globals.h +++ b/android/linux/generated/globals.h @@ -245,8 +245,7 @@ struct dos2unix_data { // toys/other/fallocate.c struct fallocate_data { - long offset; - long size; + long o, l; }; // toys/other/fmt.c @@ -1171,6 +1170,7 @@ struct logger_data { // toys/posix/ls.c struct ls_data { + long w; long l; char *color; diff --git a/android/linux/generated/help.h b/android/linux/generated/help.h index 10516a4b..ce4abfee 100644 --- a/android/linux/generated/help.h +++ b/android/linux/generated/help.h @@ -526,11 +526,11 @@ #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" -#define HELP_ls "usage: ls [-ACFHLRSZacdfhiklmnpqrstux1] [--color[=auto]] [directory...]\n\nList files.\n\nwhat to show:\n-a all files including .hidden -b escape nongraphic chars\n-c use ctime for timestamps -d directory, not contents\n-i inode number -p put a '/' after dir names\n-q unprintable chars as '?' -s storage used (1024 byte units)\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 in subdirs -F append /dir *exe @sym |FIFO\n-Z security context\n\noutput formats:\n-1 list one file per line -C columns (sorted vertically)\n-g like -l but no owner -h human readable sizes\n-l long (show full details) -m comma separated\n-n like -l but numeric uid/gid -o like -l but no group\n-x columns (horizontal sort) -ll long with nanoseconds (--full-time)\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\nsorting (default is alphabetical):\n-f unsorted -r reverse -t timestamp -S size" +#define HELP_ls "usage: ls [-ACFHLRSZacdfhiklmnpqrstuwx1] [--color[=auto]] [directory...]\n\nList files.\n\nwhat to show:\n-a all files including .hidden -b escape nongraphic chars\n-c use ctime for timestamps -d directory, not contents\n-i inode number -p put a '/' after dir names\n-q unprintable chars as '?' -s storage used (1024 byte units)\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 in subdirs -F append /dir *exe @sym |FIFO\n-Z security context\n\noutput formats:\n-1 list one file per line -C columns (sorted vertically)\n-g like -l but no owner -h human readable sizes\n-l long (show full details) -m comma separated\n-n like -l but numeric uid/gid -o like -l but no group\n-w set column width -x columns (horizontal sort)\n-ll long with nanoseconds (--full-time)\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\nsorting (default is alphabetical):\n-f unsorted -r reverse -t timestamp -S size" #define HELP_logger "usage: logger [-s] [-t TAG] [-p [FACILITY.]PRIORITY] [message...]\n\nLog message (or stdin) to syslog.\n\n-s Also write message to stderr\n-t Use TAG instead of username to identify message source\n-p Specify PRIORITY with optional FACILITY. Default is \"user.notice\"" -#define HELP_ln "usage: ln [-sfnv] [-t DIR] [FROM...] TO\n\nCreate a link between FROM and TO.\nOne/two/many arguments work like \"mv\" or \"cp\".\n\n-s Create a symbolic link\n-f Force the creation of the link, even if TO already exists\n-n Symlink at TO treated as file\n-t Create links in DIR\n-T TO always treated as file, max 2 arguments\n-v Verbose" +#define HELP_ln "usage: ln [-sfnv] [-t DIR] [FROM...] TO\n\nCreate a link between FROM and TO.\nOne/two/many arguments work like \"mv\" or \"cp\".\n\n-s Create a symbolic link\n-f Force the creation of the link, even if TO already exists\n-n Symlink at TO treated as file\n-r Create relative symlink from -> to\n-t Create links in DIR\n-T TO always treated as file, max 2 arguments\n-v Verbose" #define HELP_link "usage: link FILE NEWLINK\n\nCreate hardlink to a file." @@ -546,7 +546,7 @@ #define HELP_id_z "usage: id [-Z]\n\n-Z Show only security context" -#define HELP_id "usage: id [-nGgru] [USER...]\n\nPrint user and group ID.\n\n-n Print names instead of numeric IDs (to be used with -Ggu)\n-G Show only the group IDs\n-g Show only the effective group ID\n-r Show real ID instead of effective ID\n-u Show only the effective user ID" +#define HELP_id "usage: id [-nGgru] [USER...]\n\nPrint user and group ID.\n\n-G Show all group IDs\n-g Show only the effective group ID\n-n Print names instead of numeric IDs (to be used with -Ggu)\n-r Show real ID instead of effective ID\n-u Show only the effective user ID" #define HELP_iconv "usage: iconv [-f FROM] [-t TO] [FILE...]\n\nConvert character encoding of files.\n\n-c Omit invalid chars\n-f Convert from (default utf8)\n-t Convert to (default utf8)" diff --git a/android/linux/generated/newtoys.h b/android/linux/generated/newtoys.h index 62b1d24a..a504d757 100644 --- a/android/linux/generated/newtoys.h +++ b/android/linux/generated/newtoys.h @@ -137,7 +137,7 @@ USE_KILLALL5(NEWTOY(killall5, "?o*ls: [!lo][!ls]", TOYFLAG_SBIN)) USE_KLOGD(NEWTOY(klogd, "c#<1>8n", TOYFLAG_SBIN)) USE_LAST(NEWTOY(last, "f:W", TOYFLAG_BIN)) USE_LINK(NEWTOY(link, "<2>2", TOYFLAG_USR|TOYFLAG_BIN)) -USE_LN(NEWTOY(ln, "<1t:Tvnfs", TOYFLAG_BIN)) +USE_LN(NEWTOY(ln, "<1rt:Tvnfs", TOYFLAG_BIN)) USE_LOAD_POLICY(NEWTOY(load_policy, "<1>1", TOYFLAG_USR|TOYFLAG_SBIN)) USE_LOG(NEWTOY(log, "<1p:t:", TOYFLAG_USR|TOYFLAG_SBIN)) USE_LOGGER(NEWTOY(logger, "st:p:", TOYFLAG_USR|TOYFLAG_BIN)) @@ -145,7 +145,7 @@ USE_LOGIN(NEWTOY(login, ">1f:ph:", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) USE_LOGNAME(NEWTOY(logname, ">0", TOYFLAG_USR|TOYFLAG_BIN)) USE_LOGWRAPPER(NEWTOY(logwrapper, 0, TOYFLAG_NOHELP|TOYFLAG_USR|TOYFLAG_BIN)) USE_LOSETUP(NEWTOY(losetup, ">2S(sizelimit)#s(show)ro#j:fdcaD[!afj]", TOYFLAG_SBIN)) -USE_LS(NEWTOY(ls, "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]", TOYFLAG_BIN|TOYFLAG_LOCALE)) +USE_LS(NEWTOY(ls, "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstuw#=80<0x1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]", TOYFLAG_BIN|TOYFLAG_LOCALE)) USE_LSATTR(NEWTOY(lsattr, "vldaR", TOYFLAG_BIN)) USE_LSMOD(NEWTOY(lsmod, NULL, TOYFLAG_SBIN)) USE_LSOF(NEWTOY(lsof, "lp*t", TOYFLAG_USR|TOYFLAG_BIN)) diff --git a/android/mac/generated/flags.h b/android/mac/generated/flags.h index 5779a492..4af79e53 100644 --- a/android/mac/generated/flags.h +++ b/android/mac/generated/flags.h @@ -1496,9 +1496,9 @@ #undef FOR_link #endif -// ln <1t:Tvnfs <1t:Tvnfs +// ln <1rt:Tvnfs <1rt:Tvnfs #undef OPTSTR_ln -#define OPTSTR_ln "<1t:Tvnfs" +#define OPTSTR_ln "<1rt:Tvnfs" #ifdef CLEANUP_ln #undef CLEANUP_ln #undef FOR_ln @@ -1508,6 +1508,7 @@ #undef FLAG_v #undef FLAG_T #undef FLAG_t +#undef FLAG_r #endif // load_policy <1>1 @@ -1584,14 +1585,15 @@ #undef FLAG_S #endif -// ls (color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb] (color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb] +// ls (color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstuw#=80<0x1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb] (color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstuw#=80<0x1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb] #undef OPTSTR_ls -#define OPTSTR_ls "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]" +#define OPTSTR_ls "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstuw#=80<0x1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]" #ifdef CLEANUP_ls #undef CLEANUP_ls #undef FOR_ls #undef FLAG_1 #undef FLAG_x +#undef FLAG_w #undef FLAG_u #undef FLAG_t #undef FLAG_s @@ -4633,6 +4635,7 @@ #define FLAG_v (1<<3) #define FLAG_T (1<<4) #define FLAG_t (1<<5) +#define FLAG_r (1<<6) #endif #ifdef FOR_load_policy @@ -4701,36 +4704,37 @@ #endif #define FLAG_1 (1<<0) #define FLAG_x (1<<1) -#define FLAG_u (1<<2) -#define FLAG_t (1<<3) -#define FLAG_s (1<<4) -#define FLAG_r (1<<5) -#define FLAG_q (1<<6) -#define FLAG_p (1<<7) -#define FLAG_n (1<<8) -#define FLAG_m (1<<9) -#define FLAG_l (1<<10) -#define FLAG_k (1<<11) -#define FLAG_i (1<<12) -#define FLAG_h (1<<13) -#define FLAG_f (1<<14) -#define FLAG_d (1<<15) -#define FLAG_c (1<<16) -#define FLAG_b (1<<17) -#define FLAG_a (1<<18) -#define FLAG_S (1<<19) -#define FLAG_R (1<<20) -#define FLAG_L (1<<21) -#define FLAG_H (1<<22) -#define FLAG_F (1<<23) -#define FLAG_C (1<<24) -#define FLAG_A (1<<25) -#define FLAG_o (1<<26) -#define FLAG_g (1<<27) -#define FLAG_Z (1<<28) -#define FLAG_show_control_chars (1<<29) -#define FLAG_full_time (1<<30) -#define FLAG_color (1<<31) +#define FLAG_w (1<<2) +#define FLAG_u (1<<3) +#define FLAG_t (1<<4) +#define FLAG_s (1<<5) +#define FLAG_r (1<<6) +#define FLAG_q (1<<7) +#define FLAG_p (1<<8) +#define FLAG_n (1<<9) +#define FLAG_m (1<<10) +#define FLAG_l (1<<11) +#define FLAG_k (1<<12) +#define FLAG_i (1<<13) +#define FLAG_h (1<<14) +#define FLAG_f (1<<15) +#define FLAG_d (1<<16) +#define FLAG_c (1<<17) +#define FLAG_b (1<<18) +#define FLAG_a (1<<19) +#define FLAG_S (1<<20) +#define FLAG_R (1<<21) +#define FLAG_L (1<<22) +#define FLAG_H (1<<23) +#define FLAG_F (1<<24) +#define FLAG_C (1<<25) +#define FLAG_A (1<<26) +#define FLAG_o (1<<27) +#define FLAG_g (1<<28) +#define FLAG_Z (1<<29) +#define FLAG_show_control_chars (1<<30) +#define FLAG_full_time (1<<31) +#define FLAG_color (1LL<<32) #endif #ifdef FOR_lsattr diff --git a/android/mac/generated/globals.h b/android/mac/generated/globals.h index 04334b61..1077449b 100644 --- a/android/mac/generated/globals.h +++ b/android/mac/generated/globals.h @@ -245,8 +245,7 @@ struct dos2unix_data { // toys/other/fallocate.c struct fallocate_data { - long offset; - long size; + long o, l; }; // toys/other/fmt.c @@ -1171,6 +1170,7 @@ struct logger_data { // toys/posix/ls.c struct ls_data { + long w; long l; char *color; diff --git a/android/mac/generated/help.h b/android/mac/generated/help.h index 10516a4b..ce4abfee 100644 --- a/android/mac/generated/help.h +++ b/android/mac/generated/help.h @@ -526,11 +526,11 @@ #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" -#define HELP_ls "usage: ls [-ACFHLRSZacdfhiklmnpqrstux1] [--color[=auto]] [directory...]\n\nList files.\n\nwhat to show:\n-a all files including .hidden -b escape nongraphic chars\n-c use ctime for timestamps -d directory, not contents\n-i inode number -p put a '/' after dir names\n-q unprintable chars as '?' -s storage used (1024 byte units)\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 in subdirs -F append /dir *exe @sym |FIFO\n-Z security context\n\noutput formats:\n-1 list one file per line -C columns (sorted vertically)\n-g like -l but no owner -h human readable sizes\n-l long (show full details) -m comma separated\n-n like -l but numeric uid/gid -o like -l but no group\n-x columns (horizontal sort) -ll long with nanoseconds (--full-time)\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\nsorting (default is alphabetical):\n-f unsorted -r reverse -t timestamp -S size" +#define HELP_ls "usage: ls [-ACFHLRSZacdfhiklmnpqrstuwx1] [--color[=auto]] [directory...]\n\nList files.\n\nwhat to show:\n-a all files including .hidden -b escape nongraphic chars\n-c use ctime for timestamps -d directory, not contents\n-i inode number -p put a '/' after dir names\n-q unprintable chars as '?' -s storage used (1024 byte units)\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 in subdirs -F append /dir *exe @sym |FIFO\n-Z security context\n\noutput formats:\n-1 list one file per line -C columns (sorted vertically)\n-g like -l but no owner -h human readable sizes\n-l long (show full details) -m comma separated\n-n like -l but numeric uid/gid -o like -l but no group\n-w set column width -x columns (horizontal sort)\n-ll long with nanoseconds (--full-time)\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\nsorting (default is alphabetical):\n-f unsorted -r reverse -t timestamp -S size" #define HELP_logger "usage: logger [-s] [-t TAG] [-p [FACILITY.]PRIORITY] [message...]\n\nLog message (or stdin) to syslog.\n\n-s Also write message to stderr\n-t Use TAG instead of username to identify message source\n-p Specify PRIORITY with optional FACILITY. Default is \"user.notice\"" -#define HELP_ln "usage: ln [-sfnv] [-t DIR] [FROM...] TO\n\nCreate a link between FROM and TO.\nOne/two/many arguments work like \"mv\" or \"cp\".\n\n-s Create a symbolic link\n-f Force the creation of the link, even if TO already exists\n-n Symlink at TO treated as file\n-t Create links in DIR\n-T TO always treated as file, max 2 arguments\n-v Verbose" +#define HELP_ln "usage: ln [-sfnv] [-t DIR] [FROM...] TO\n\nCreate a link between FROM and TO.\nOne/two/many arguments work like \"mv\" or \"cp\".\n\n-s Create a symbolic link\n-f Force the creation of the link, even if TO already exists\n-n Symlink at TO treated as file\n-r Create relative symlink from -> to\n-t Create links in DIR\n-T TO always treated as file, max 2 arguments\n-v Verbose" #define HELP_link "usage: link FILE NEWLINK\n\nCreate hardlink to a file." @@ -546,7 +546,7 @@ #define HELP_id_z "usage: id [-Z]\n\n-Z Show only security context" -#define HELP_id "usage: id [-nGgru] [USER...]\n\nPrint user and group ID.\n\n-n Print names instead of numeric IDs (to be used with -Ggu)\n-G Show only the group IDs\n-g Show only the effective group ID\n-r Show real ID instead of effective ID\n-u Show only the effective user ID" +#define HELP_id "usage: id [-nGgru] [USER...]\n\nPrint user and group ID.\n\n-G Show all group IDs\n-g Show only the effective group ID\n-n Print names instead of numeric IDs (to be used with -Ggu)\n-r Show real ID instead of effective ID\n-u Show only the effective user ID" #define HELP_iconv "usage: iconv [-f FROM] [-t TO] [FILE...]\n\nConvert character encoding of files.\n\n-c Omit invalid chars\n-f Convert from (default utf8)\n-t Convert to (default utf8)" diff --git a/android/mac/generated/newtoys.h b/android/mac/generated/newtoys.h index 62b1d24a..a504d757 100644 --- a/android/mac/generated/newtoys.h +++ b/android/mac/generated/newtoys.h @@ -137,7 +137,7 @@ USE_KILLALL5(NEWTOY(killall5, "?o*ls: [!lo][!ls]", TOYFLAG_SBIN)) USE_KLOGD(NEWTOY(klogd, "c#<1>8n", TOYFLAG_SBIN)) USE_LAST(NEWTOY(last, "f:W", TOYFLAG_BIN)) USE_LINK(NEWTOY(link, "<2>2", TOYFLAG_USR|TOYFLAG_BIN)) -USE_LN(NEWTOY(ln, "<1t:Tvnfs", TOYFLAG_BIN)) +USE_LN(NEWTOY(ln, "<1rt:Tvnfs", TOYFLAG_BIN)) USE_LOAD_POLICY(NEWTOY(load_policy, "<1>1", TOYFLAG_USR|TOYFLAG_SBIN)) USE_LOG(NEWTOY(log, "<1p:t:", TOYFLAG_USR|TOYFLAG_SBIN)) USE_LOGGER(NEWTOY(logger, "st:p:", TOYFLAG_USR|TOYFLAG_BIN)) @@ -145,7 +145,7 @@ USE_LOGIN(NEWTOY(login, ">1f:ph:", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) USE_LOGNAME(NEWTOY(logname, ">0", TOYFLAG_USR|TOYFLAG_BIN)) USE_LOGWRAPPER(NEWTOY(logwrapper, 0, TOYFLAG_NOHELP|TOYFLAG_USR|TOYFLAG_BIN)) USE_LOSETUP(NEWTOY(losetup, ">2S(sizelimit)#s(show)ro#j:fdcaD[!afj]", TOYFLAG_SBIN)) -USE_LS(NEWTOY(ls, "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]", TOYFLAG_BIN|TOYFLAG_LOCALE)) +USE_LS(NEWTOY(ls, "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstuw#=80<0x1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]", TOYFLAG_BIN|TOYFLAG_LOCALE)) USE_LSATTR(NEWTOY(lsattr, "vldaR", TOYFLAG_BIN)) USE_LSMOD(NEWTOY(lsmod, NULL, TOYFLAG_SBIN)) USE_LSOF(NEWTOY(lsof, "lp*t", TOYFLAG_USR|TOYFLAG_BIN)) |