From 2e215bb009cecad3f87477d63b57b7790d49b72e Mon Sep 17 00:00:00 2001
From: sef <sef@FreeBSD.org>
Date: Thu, 18 Sep 1997 06:42:27 +0000
Subject: Fix sorting of directories when doing '-d'.

PR:		bin/4558
Submitted by:	Keith Bostic
---
 bin/ls/ls.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'bin/ls/ls.c')

diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index 7f4e148..768af2d 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -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));
 }
-- 
cgit v1.1