Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-27 01:32:08 +00:00
Code Issues Projects Releases Wiki Activity

ls: tweak -e handling; better comments

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-12-19 16:29:08 +01:00
parent 2f7d9e8903
commit 407ab2a434
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
coreutils/ls.c
View File

@ -184,15 +184,20 @@ SPLIT_FILE = 0,
SPLIT_SUBDIR = 2, SPLIT_SUBDIR = 2,
}; };
/* "[-]Cadil1", POSIX mandated options, busybox always supports */ /* -Cadil1 Std options, busybox always supports */
/* "[-]gnsx", POSIX non-mandated options, busybox always supports */ /* -gnsxA Std options, busybox always supports */
/* "[-]Q" GNU option? busybox always supports */ /* -Q GNU option? busybox always supports */
/* "[-]Ak" GNU options, busybox always supports */ /* -k SELinux option, busybox always supports (ignores if !SELinux) */
/* "[-]FLRctur", POSIX mandated options, busybox optionally supports */ /* Std has -k which means "show sizes in kbytes" */
/* "[-]p", POSIX non-mandated options, busybox optionally supports */ /* -FLRctur Std options, busybox optionally supports */
/* "[-]SXvThw", GNU options, busybox optionally supports */ /* -p Std option, busybox optionally supports */
/* "[-]K", SELinux mandated options, busybox optionally supports */ /* Not fully compatible - we show not only '/' but other chars too */
/* "[-]e", I think we made this one up */ /* -SXvhTw GNU options, busybox optionally supports */
/* -T TABWIDTH is ignored (we don't use tabs on output) */
/* -K SELinux mandated options, busybox optionally supports */
/* -e I think we made this one up (looks similar to GNU --full-time) */
/* Std opts we do not support: */
/* -H Follow the links on command line only */
static const char ls_options[] ALIGN1 = static const char ls_options[] ALIGN1 =
"Cadil1gnsxQAk" /* 13 opts, total 13 */ "Cadil1gnsxQAk" /* 13 opts, total 13 */
IF_FEATURE_LS_TIMESTAMPS("cetu") /* 4, 17 */ IF_FEATURE_LS_TIMESTAMPS("cetu") /* 4, 17 */
@ -229,7 +234,7 @@ enum {
+ 2 * ENABLE_SELINUX + 2 * ENABLE_SELINUX
+ 2 * ENABLE_FEATURE_AUTOWIDTH, + 2 * ENABLE_FEATURE_AUTOWIDTH,
OPT_F = (1 << OPTBIT_F) * ENABLE_FEATURE_LS_FILETYPES, OPT_F = (1 << OPTBIT_F) * ENABLE_FEATURE_LS_FILETYPES,
OPT_color = 1 << OPTBIT_color, OPT_color = (1 << OPTBIT_color),
}; };
/* TODO: simple toggles may be stored as OPT_xxx bits instead */ /* TODO: simple toggles may be stored as OPT_xxx bits instead */
@ -248,10 +253,10 @@ static const unsigned opt_flags[] = {
DISP_HIDDEN, /* A */ DISP_HIDDEN, /* A */
ENABLE_SELINUX * LIST_CONTEXT, /* k (ignored if !SELINUX) */ ENABLE_SELINUX * LIST_CONTEXT, /* k (ignored if !SELINUX) */
#if ENABLE_FEATURE_LS_TIMESTAMPS #if ENABLE_FEATURE_LS_TIMESTAMPS
TIME_CHANGE | (ENABLE_FEATURE_LS_SORTFILES * SORT_CTIME), /* c */ TIME_CHANGE | (ENABLE_FEATURE_LS_SORTFILES * SORT_CTIME), /* c */
LIST_FULLTIME, /* e */ LIST_FULLTIME, /* e */
ENABLE_FEATURE_LS_SORTFILES * SORT_MTIME, /* t */ ENABLE_FEATURE_LS_SORTFILES * SORT_MTIME, /* t */
TIME_ACCESS | (ENABLE_FEATURE_LS_SORTFILES * SORT_ATIME), /* u */ TIME_ACCESS | (ENABLE_FEATURE_LS_SORTFILES * SORT_ATIME), /* u */
#endif #endif
#if ENABLE_FEATURE_LS_SORTFILES #if ENABLE_FEATURE_LS_SORTFILES
SORT_SIZE, /* S */ SORT_SIZE, /* S */
@ -274,8 +279,6 @@ static const unsigned opt_flags[] = {
#endif #endif
#if ENABLE_SELINUX #if ENABLE_SELINUX
LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */ LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */
#endif
#if ENABLE_SELINUX
LIST_MODEBITS|LIST_ID_NAME|LIST_CONTEXT, /* Z */ LIST_MODEBITS|LIST_ID_NAME|LIST_CONTEXT, /* Z */
#endif #endif
(1U<<31) (1U<<31)
@ -1041,18 +1044,20 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
/* process options */ /* process options */
IF_FEATURE_LS_COLOR(applet_long_options = ls_longopts;) IF_FEATURE_LS_COLOR(applet_long_options = ls_longopts;)
opt_complementary = opt_complementary =
/* -e implies -l */
"el"
/* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ls.html: /* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ls.html:
* in some pairs of opts, only last one takes effect: * in some pairs of opts, only last one takes effect:
*/ */
IF_FEATURE_LS_TIMESTAMPS(IF_FEATURE_LS_SORTFILES("t-S:S-t")) /* time/size */ IF_FEATURE_LS_TIMESTAMPS(IF_FEATURE_LS_SORTFILES(":t-S:S-t")) /* time/size */
// ":H-L:L-H:" - we don't have -H // ":H-L:L-H:" - we don't have -H
// ":m-l:l-m:" - we don't have -m // ":m-l:l-m:" - we don't have -m
":C-xl:x-Cl:l-xC" /* bycols/bylines/long */ ":C-xl:x-Cl:l-xC" /* bycols/bylines/long */
":C-1:1-C" /* bycols/oneline */ ":C-1:1-C" /* bycols/oneline */
":x-1:1-x" /* bylines/oneline (not in SuS, but in GNU coreutils 8.4) */ ":x-1:1-x" /* bylines/oneline (not in SuS, but in GNU coreutils 8.4) */
":c-u:u-c" /* mtime/atime */ ":c-u:u-c" /* mtime/atime */
/* -T NUM, -w NUM: */ /* -w NUM: */
IF_FEATURE_AUTOWIDTH(":T+:w+"); IF_FEATURE_AUTOWIDTH(":w+");
opt = getopt32(argv, ls_options opt = getopt32(argv, ls_options
IF_FEATURE_AUTOWIDTH(, NULL, &terminal_width) IF_FEATURE_AUTOWIDTH(, NULL, &terminal_width)
IF_FEATURE_LS_COLOR(, &color_opt) IF_FEATURE_LS_COLOR(, &color_opt)
@ -1109,7 +1114,7 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
all_fmt = (all_fmt & ~SORT_MASK) | SORT_ATIME; all_fmt = (all_fmt & ~SORT_MASK) | SORT_ATIME;
} }
if ((all_fmt & STYLE_MASK) != STYLE_LONG) /* only for long list */ if ((all_fmt & STYLE_MASK) != STYLE_LONG) /* only for long list */
all_fmt &= ~(LIST_ID_NUMERIC|LIST_FULLTIME|LIST_ID_NAME|LIST_ID_NUMERIC); all_fmt &= ~(LIST_ID_NUMERIC|LIST_ID_NAME|LIST_FULLTIME);
if (ENABLE_FEATURE_LS_USERNAME) if (ENABLE_FEATURE_LS_USERNAME)
if ((all_fmt & STYLE_MASK) == STYLE_LONG && (all_fmt & LIST_ID_NUMERIC)) if ((all_fmt & STYLE_MASK) == STYLE_LONG && (all_fmt & LIST_ID_NUMERIC))
all_fmt &= ~LIST_ID_NAME; /* don't list names if numeric uid */ all_fmt &= ~LIST_ID_NAME; /* don't list names if numeric uid */