d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sorting of directories when doing '-d'.

Browse Source 
PR:		bin/4558
Submitted by:	Keith Bostic
This commit is contained in:
sef 1997-09-18 06:42:27 +00:00
parent ce8df1cd4a
commit 2e215bb009
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/ls/ls.c
View File

@ -45,7 +45,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)ls.c 8.5 (Berkeley) 4/2/94";
#else
static const char rcsid[] =
"$Id: ls.c,v 1.15 1997/08/07 15:33:47 steve Exp $";
"$Id: ls.c,v 1.16 1997/08/07 22:28:23 steve Exp $";
#endif
#endif /* not lint */
@ -528,16 +528,12 @@ mastercmp(a, b)
if (a_info == FTS_NS || b_info == FTS_NS)
return (namecmp(*a, *b));
if (a_info == b_info)
return (sortfcn(*a, *b));
if ((*a)->fts_level == FTS_ROOTLEVEL)
if (a_info != b_info &&
(*a)->fts_level == FTS_ROOTLEVEL && !f_listdir) {
if (a_info == FTS_D)
return (1);
else if (b_info == FTS_D)
if (b_info == FTS_D)
return (-1);
else
return (sortfcn(*a, *b));
else
return (sortfcn(*a, *b));
}
return (sortfcn(*a, *b));
}