fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Fix showing directories when -R flag is set in ls(1)"

Browse Source 
This reverts commit bb83eade399e7d6f3642ae3a5e2cdebab6f222a1.

This commit causes the loop through dents at the end of main to
continue past the end of the dents array, causing a crash when
called with multiple directory arguments.
This commit is contained in:
Michael Forney 2016-05-14 18:56:50 -07:00 committed by sin
parent 229d7cc89a
commit b91b9e79ec
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ls.c
View File

@ -278,7 +278,7 @@ lsdir(const char *path, const struct entry *dir)
if (!Uflag)
qsort(ents, n, sizeof(*ents), entcmp);
if (ds++)
if (ds > 1 && (path[0] || dir->name[0] != '.'))
printf("%s:\n", dir->name);
for (i = 0; i < n; i++)
output(&ents[i]);