From: Rob Clark <robdclark@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 5/8] fs/fat: implement opendir/readdir/closedir
Date: Sat, 2 Sep 2017 12:38:00 -0400 [thread overview]
Message-ID: <20170902163806.27265-6-robdclark@gmail.com> (raw)
In-Reply-To: <20170902163806.27265-1-robdclark@gmail.com>
Implement the readdir interface using the directory iterators.
Signed-off-by: Rob Clark <robdclark@gmail.com>
---
fs/fat/fat.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index 3193290434..d30ef3903b 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -14,6 +14,7 @@
#include <config.h>
#include <exports.h>
#include <fat.h>
+#include <fs.h>
#include <asm/byteorder.h>
#include <part.h>
#include <malloc.h>
@@ -1119,6 +1120,61 @@ int fat_read_file(const char *filename, void *buf, loff_t offset, loff_t len,
return ret;
}
+typedef struct {
+ FS_DIR parent;
+ fsdata fsdata;
+ fat_itr itr;
+} fat_dir;
+
+int fat_opendir(const char *filename, FS_DIR **dirp)
+{
+ fat_dir *dir = malloc(sizeof(*dir));
+ int ret;
+
+ if (!dir)
+ return -ENOMEM;
+
+ ret = fat_itr_root(&dir->itr, &dir->fsdata);
+ if (ret)
+ goto fail;
+
+ ret = fat_itr_resolve(&dir->itr, filename, TYPE_DIR);
+ if (ret)
+ goto fail;
+
+ *dirp = (FS_DIR *)dir;
+ return 0;
+
+fail:
+ free(dir);
+ return ret;
+}
+
+int fat_readdir(FS_DIR *dirp)
+{
+ fat_dir *dir = (fat_dir *)dirp;
+ struct fs_dirent *dent = &dirp->dirent;
+
+ if (!fat_itr_next(&dir->itr))
+ return -ENOENT;
+
+ strcpy(dent->name, dir->itr.name);
+ if (fat_itr_isdir(&dir->itr)) {
+ dent->type = FS_DT_DIR;
+ } else {
+ dent->type = FS_DT_REG;
+ dent->size = FAT2CPU32(dir->itr.dent->size);
+ }
+
+ return 0;
+}
+
+void fat_closedir(FS_DIR *dirp)
+{
+ fat_dir *dir = (fat_dir *)dirp;
+ free(dir);
+}
+
void fat_close(void)
{
}
--
2.13.5
next prev parent reply other threads:[~2017-09-02 16:38 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-02 16:37 [U-Boot] [PATCH v2 0/8] fs/fat: cleanups + readdir implementation Rob Clark
2017-09-02 16:37 ` [U-Boot] [PATCH v2 1/8] fs/fat: split out helper to init fsdata Rob Clark
2017-09-03 14:52 ` Łukasz Majewski
2017-09-03 15:47 ` Rob Clark
2017-09-03 16:16 ` Łukasz Majewski
2017-09-05 8:55 ` Simon Glass
2017-09-02 16:37 ` [U-Boot] [PATCH v2 2/8] fs/fat: introduce new director iterators Rob Clark
2017-09-03 15:08 ` Łukasz Majewski
2017-09-05 8:56 ` Simon Glass
2017-09-05 9:54 ` Rob Clark
2017-09-09 4:55 ` Simon Glass
2017-09-09 10:34 ` Rob Clark
2017-09-02 16:37 ` [U-Boot] [PATCH v2 3/8] fat/fs: convert to directory iterators Rob Clark
2017-09-03 15:08 ` Łukasz Majewski
2017-09-05 8:56 ` Simon Glass
2017-09-06 2:18 ` Rob Clark
2017-09-02 16:37 ` [U-Boot] [PATCH v2 4/8] fs: add fs_readdir() Rob Clark
2017-09-03 15:16 ` Łukasz Majewski
2017-09-05 8:56 ` Simon Glass
2017-09-05 10:48 ` Rob Clark
2017-09-02 16:38 ` Rob Clark [this message]
2017-09-03 15:17 ` [U-Boot] [PATCH v2 5/8] fs/fat: implement opendir/readdir/closedir Łukasz Majewski
2017-09-05 8:56 ` Simon Glass
2017-09-02 16:38 ` [U-Boot] [PATCH v2 6/8] fat/fs: remove a bunch of dead code Rob Clark
2017-09-05 8:56 ` Simon Glass
2017-09-02 16:38 ` [U-Boot] [PATCH v2 7/8] fat/fs: move ls to generic implementation Rob Clark
2017-09-03 15:19 ` Łukasz Majewski
2017-09-05 8:56 ` Simon Glass
2017-09-06 2:12 ` Rob Clark
2017-09-02 16:38 ` [U-Boot] [PATCH v2 8/8] fs/fat: fix case for FAT shortnames Rob Clark
2017-09-03 15:22 ` Łukasz Majewski
2017-09-05 8:56 ` Simon Glass
-- strict thread matches above, loose matches on Subject: below --
2017-08-14 13:16 [U-Boot] [PATCH v2 0/8] fs/fat: cleanups + readdir implementation Rob Clark
2017-08-14 13:16 ` [U-Boot] [PATCH v2 5/8] fs/fat: implement opendir/readdir/closedir Rob Clark
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170902163806.27265-6-robdclark@gmail.com \
--to=robdclark@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox