sbase

suckless unix tools
git clone git://git.2f30.org/sbase.git
Log | Files | Refs | README | LICENSE

commit 8d9b12cfe06325ec50a66c2fa638759e0dd2e16b
parent 4b5f3c5dcc4bbafcdd3e56fa63af86d0cd5e572b
Author: sin <sin@2f30.org>
Date:   Sun Nov  1 17:23:27 +0000

Revert "ls: Fix sorting of named entries"

This reverts commit ff78d03791cc7c24dfc407c39dd2158451c9ad12.

Diffstat:
ls.c | 22++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/ls.c b/ls.c @@ -358,7 +358,7 @@ usage(void) int main(int argc, char *argv[]) { - struct entry *ent, *dents, *fents; + struct entry *ent, **dents, **fents; size_t i, ds, fs; ARGBEGIN { @@ -447,27 +447,29 @@ main(int argc, char *argv[]) break; default: for (i = ds = fs = 0, fents = dents = NULL; i < argc; ++i) { + ent = emalloc(sizeof(*ent)); + mkent(ent, argv[i], 1, Hflag || Lflag); + if ((!dflag && S_ISDIR(ent->mode)) || ((S_ISLNK(ent->mode) && S_ISDIR(ent->tmode)) && ((Hflag || Lflag) || !(dflag || Fflag || lflag)))) { - dents = ereallocarray(dents, ++ds, sizeof(*dents)); - ent = &dents[ds - 1]; + dents = ereallocarray(dents, ++ds, sizeof(ent)); + dents[ds - 1] = ent; } else { - fents = ereallocarray(fents, ++fs, sizeof(*fents)); - ent = &fents[fs - 1]; + fents = ereallocarray(fents, ++fs, sizeof(ent)); + fents[fs - 1] = ent; } - mkent(ent, argv[i], 1, Hflag || Lflag); } - qsort(fents, fs, sizeof(*fents), entcmp); - qsort(dents, ds, sizeof(*dents), entcmp); + qsort(fents, fs, sizeof(ent), entcmp); + qsort(dents, ds, sizeof(ent), entcmp); for (i = 0; i < fs; ++i) - ls("", &fents[i], 0); + ls("", fents[i], 0); if (fs && ds) putchar('\n'); for (i = 0; i < ds; ++i) - ls("", &dents[i], 1); + ls("", dents[i], 1); } return fshut(stdout, "<stdout>");