summaryrefslogtreecommitdiff
path: root/core/sbase/patch/0002-Revert-ls-only-display-directory-headers-when-more-t.patch
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-07-09 09:24:10 -0700
committerMichael Forney <mforney@mforney.org>2016-07-09 09:24:10 -0700
commit89246ef0df580ef992a2726e8873105cfe7d775b (patch)
treeef2b260cd2133427e6e0b936fa55a40b134fbc42 /core/sbase/patch/0002-Revert-ls-only-display-directory-headers-when-more-t.patch
parent289cd1337a556044bbd0ca7a258cb520a7c51c9c (diff)
sbase: Patches were applied upstream
Diffstat (limited to 'core/sbase/patch/0002-Revert-ls-only-display-directory-headers-when-more-t.patch')
-rw-r--r--core/sbase/patch/0002-Revert-ls-only-display-directory-headers-when-more-t.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/core/sbase/patch/0002-Revert-ls-only-display-directory-headers-when-more-t.patch b/core/sbase/patch/0002-Revert-ls-only-display-directory-headers-when-more-t.patch
deleted file mode 100644
index 2d2427b0..00000000
--- a/core/sbase/patch/0002-Revert-ls-only-display-directory-headers-when-more-t.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6ce4e756d6cf5a4cc5539a57b93fcacbfb7654a6 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 14 May 2016 16:54:32 -0700
-Subject: [PATCH] Revert "ls: only display directory headers when more than one
- directory is specified"
-
-This reverts commit b107489bf2cda579ca53551206270b9eee80c059.
----
- ls.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-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 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 @@ lsdir(const char *path, const struct entry *dir)
- 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 @@ int
- main(int argc, char *argv[])
- {
- struct entry ent, *dents, *fents;
-- size_t i, fs;
-+ size_t i, ds, fs;
-
- ARGBEGIN {
- case '1':
---
-2.8.1
-