commit e8e9b97baf42525ee884c6dd6863c8694a81b13a
author Michael Forney <mforney@mforney.org> Sat May 14 18:56:51 2016 -0700
committer sin <sin@2f30.org> Sat Jul 09 10:09:50 2016 +0100
tree 5028a6586429208f57ca3fbdcf8689a68d1fb392
parent b91b9e79ec3b4f0d19c4697acefe01b0f4cc0d6e

Revert "ls: only display directory headers when more than one directory is specified"

This reverts commit b107489bf2cda579ca53551206270b9eee80c059.

ls.c

diff --git a/ls.c b/ls.c
index a59cc0a..55dfe40 100644
--- a/ls.c
+++ b/ls.c
@@ -53,7 +53,6 @@
 static int uflag = 0;
 static int first = 1;
 static char sort = 0;
-static size_t ds = 0;
 
 static void ls(const char *, const struct entry *, int);
 
@@ -278,7 +277,7 @@
 	if (!Uflag)
 		qsort(ents, n, sizeof(*ents), entcmp);
 
-	if (ds > 1 && (path[0] || dir->name[0] != '.'))
+	if (path[0] || dir->name[0] != '.')
 		printf("%s:\n", dir->name);
 	for (i = 0; i < n; i++)
 		output(&ents[i]);
@@ -369,7 +368,7 @@
 main(int argc, char *argv[])
 {
 	struct entry ent, *dents, *fents;
-	size_t i, fs;
+	size_t i, ds, fs;
 
 	ARGBEGIN {
 	case '1':