summaryrefslogtreecommitdiffstats
path: root/commands/ls.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-06-24 12:08:51 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-07-03 09:39:28 +0200
commit10d63913999fbd5c02a2a8daecf877c24663bdca (patch)
treee2dc1c8fa8839ccbd8ed6d837260dd90fc876ffb /commands/ls.c
parent6dd613f1bcf323507c7c6a6131bfb5a985a06c85 (diff)
downloadbarebox-10d63913999fbd5c02a2a8daecf877c24663bdca.tar.gz
ls: sort files with -l
Always collect directory entries in a string_list and evaluate it later. This makes sure that the files are printed alphabetically even when -l is given. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands/ls.c')
-rw-r--r--commands/ls.c54
1 files changed, 28 insertions, 26 deletions
diff --git a/commands/ls.c b/commands/ls.c
index f8144ae..1a5925d 100644
--- a/commands/ls.c
+++ b/commands/ls.c
@@ -53,6 +53,8 @@ int ls(const char *path, ulong flags)
char tmp[PATH_MAX];
struct stat s;
struct string_list sl;
+ struct string_list *entry;
+ int ret;
string_list_init(&sl);
@@ -71,51 +73,51 @@ int ls(const char *path, ulong flags)
if (!dir)
return -errno;
- while ((d = readdir(dir))) {
- sprintf(tmp, "%s/%s", path, d->d_name);
- if (flags & LS_COLUMN) {
- string_list_add_sorted(&sl, d->d_name);
- } else {
- if (lstat(tmp, &s))
- goto out;
- ls_one(d->d_name, tmp, &s);
- }
- }
+ while ((d = readdir(dir)))
+ string_list_add_sorted(&sl, d->d_name);
closedir(dir);
if (flags & LS_COLUMN) {
string_list_print_by_column(&sl);
- string_list_free(&sl);
- }
-
- if (!(flags & LS_RECURSIVE))
- return 0;
+ } else {
+ string_list_for_each_entry(entry, &sl) {
+ sprintf(tmp, "%s/%s", path, entry->str);
+ ret = lstat(tmp, &s);
+ if (ret) {
+ printf("%s: %s\n", tmp, strerror(-ret));
+ continue;
+ }
- dir = opendir(path);
- if (!dir) {
- errno = ENOENT;
- return -ENOENT;
+ ls_one(entry->str, tmp, &s);
+ }
}
- while ((d = readdir(dir))) {
+ if (!(flags & LS_RECURSIVE))
+ goto out;
- if (!strcmp(d->d_name, "."))
+ string_list_for_each_entry(entry, &sl) {
+ if (!strcmp(entry->str, "."))
continue;
- if (!strcmp(d->d_name, ".."))
+ if (!strcmp(entry->str, ".."))
continue;
- sprintf(tmp, "%s/%s", path, d->d_name);
+ sprintf(tmp, "%s/%s", path, entry->str);
+
+ ret = lstat(tmp, &s);
+ if (ret) {
+ printf("%s: %s\n", tmp, strerror(-ret));
+ continue;
+ }
- if (lstat(tmp, &s))
- goto out;
if (s.st_mode & S_IFDIR) {
char *norm = normalise_path(tmp);
ls(norm, flags);
free(norm);
}
}
+
out:
- closedir(dir);
+ string_list_free(&sl);
return 0;
}