Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-08-07 11:26:53 +00:00
Code Issues Projects Releases Wiki Activity

ls: make -F not follow symlinks of the command line

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-12-19 06:16:28 +01:00
parent d87815d5e0
commit 163d864357
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coreutils/ls.c
View File

@@ -155,15 +155,17 @@ enum {
OPT_Q = (1 << 10), OPT_Q = (1 << 10),
//OPT_A = (1 << 11), //OPT_A = (1 << 11),
//OPT_k = (1 << 12), //OPT_k = (1 << 12),
OPTBIT_color = 13 OPTBIT_F = 13
+ 4 * ENABLE_FEATURE_LS_TIMESTAMPS + 4 * ENABLE_FEATURE_LS_TIMESTAMPS
+ 4 * ENABLE_FEATURE_LS_SORTFILES + 4 * ENABLE_FEATURE_LS_SORTFILES,
OPTBIT_color = OPTBIT_F
+ 2 * ENABLE_FEATURE_LS_FILETYPES + 2 * ENABLE_FEATURE_LS_FILETYPES
+ 1 * ENABLE_FEATURE_LS_FOLLOWLINKS + 1 * ENABLE_FEATURE_LS_FOLLOWLINKS
+ 1 * ENABLE_FEATURE_LS_RECURSIVE + 1 * ENABLE_FEATURE_LS_RECURSIVE
+ 1 * ENABLE_FEATURE_HUMAN_READABLE + 1 * ENABLE_FEATURE_HUMAN_READABLE
+ 2 * ENABLE_SELINUX + 2 * ENABLE_SELINUX
+ 2 * ENABLE_FEATURE_AUTOWIDTH, + 2 * ENABLE_FEATURE_AUTOWIDTH,
OPT_F = (1 << OPTBIT_F) * ENABLE_FEATURE_LS_FILETYPES,
OPT_color = 1 << OPTBIT_color, OPT_color = 1 << OPTBIT_color,
}; };
@@ -1066,8 +1068,10 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
dn = NULL; dn = NULL;
nfiles = 0; nfiles = 0;
do { do {
/* NB: follow links on command line unless -l or -s */ /* NB: follow links on command line unless -l, -s or -F */
cur = my_stat(*argv, *argv, !(all_fmt & (STYLE_LONG|LIST_BLOCKS))); cur = my_stat(*argv, *argv,
!((all_fmt & (STYLE_LONG|LIST_BLOCKS)) || (option_mask32 & OPT_F))
);
argv++; argv++;
if (!cur) if (!cur)
continue; continue;