aboutsummaryrefslogtreecommitdiff
path: root/coreutils/ls.c
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils/ls.c')
-rw-r--r--coreutils/ls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 2605ab12d..f7fa9a110 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -315,7 +315,7 @@ static int count_dirs(struct dnode **dn, int nfiles, int notsubdirs)
315 if (S_ISDIR(dn[i]->dstat.st_mode) 315 if (S_ISDIR(dn[i]->dstat.st_mode)
316 && (notsubdirs 316 && (notsubdirs
317 || ((dn[i]->name[0] != '.') 317 || ((dn[i]->name[0] != '.')
318 || (dn[i]->name[1] 318 || (dn[i]->name[1]
319 && ((dn[i]->name[1] != '.') 319 && ((dn[i]->name[1] != '.')
320 || dn[i]->name[2]))))) 320 || dn[i]->name[2])))))
321 dirs++; 321 dirs++;
@@ -1055,7 +1055,7 @@ extern int ls_main(int argc, char **argv)
1055 if ((all_fmt & STYLE_MASK) == STYLE_LONG && (all_fmt & LIST_ID_NUMERIC)) 1055 if ((all_fmt & STYLE_MASK) == STYLE_LONG && (all_fmt & LIST_ID_NUMERIC))
1056 all_fmt &= ~LIST_ID_NAME; /* don't list names if numeric uid */ 1056 all_fmt &= ~LIST_ID_NAME; /* don't list names if numeric uid */
1057#endif 1057#endif
1058 1058
1059 /* choose a display format */ 1059 /* choose a display format */
1060 if ((all_fmt & STYLE_MASK) == STYLE_AUTO) 1060 if ((all_fmt & STYLE_MASK) == STYLE_AUTO)
1061#if STYLE_AUTO != 0 1061#if STYLE_AUTO != 0