Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

fs: implement infrastructure for an 'exists' function

Browse source 
This could be used in scripts such as:

if test -e mmc 0:1 /boot/boot.scr; then
    load mmc 0:1 ${scriptaddr} /boot/boot.scr
    source ${scriptaddr}
fi

rather than:

if load mmc 0:1 ${scriptaddr} /boot/boot.scr; then
    source ${scriptaddr}
fi

This prevents errors being printed by attempts to load non-existent
files, which can be important when checking for a large set of files,
such as /boot/boot.scr.uimg, /boot/boot.scr, /boot/extlinux.conf,
/boot.scr.uimg, /boot.scr, /extlinux.conf.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Stephen Warren 2014-02-03 13:21:00 -07:00 committed by Tom Rini
parent bd6fb31fab
commit 6152916a95
2 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
fs/fs.c
View file

@ -41,6 +41,11 @@ static inline int fs_ls_unsupported(const char *dirname)
return -1; return -1;
} }
static inline int fs_exists_unsupported(const char *filename)
{
return 0;
}
static inline int fs_read_unsupported(const char *filename, void *buf, static inline int fs_read_unsupported(const char *filename, void *buf,
int offset, int len) int offset, int len)
{ {
@ -62,6 +67,7 @@ struct fstype_info {
int (*probe)(block_dev_desc_t *fs_dev_desc, int (*probe)(block_dev_desc_t *fs_dev_desc,
disk_partition_t *fs_partition); disk_partition_t *fs_partition);
int (*ls)(const char *dirname); int (*ls)(const char *dirname);
int (*exists)(const char *filename);
int (*read)(const char *filename, void *buf, int offset, int len); int (*read)(const char *filename, void *buf, int offset, int len);
int (*write)(const char *filename, void *buf, int offset, int len); int (*write)(const char *filename, void *buf, int offset, int len);
void (*close)(void); void (*close)(void);
@ -74,6 +80,7 @@ static struct fstype_info fstypes[] = {
.probe = fat_set_blk_dev, .probe = fat_set_blk_dev,
.close = fat_close, .close = fat_close,
.ls = file_fat_ls, .ls = file_fat_ls,
.exists = fs_exists_unsupported,
.read = fat_read_file, .read = fat_read_file,
.write = fs_write_unsupported, .write = fs_write_unsupported,
}, },
@ -84,6 +91,7 @@ static struct fstype_info fstypes[] = {
.probe = ext4fs_probe, .probe = ext4fs_probe,
.close = ext4fs_close, .close = ext4fs_close,
.ls = ext4fs_ls, .ls = ext4fs_ls,
.exists = fs_exists_unsupported,
.read = ext4_read_file, .read = ext4_read_file,
.write = fs_write_unsupported, .write = fs_write_unsupported,
}, },
@ -94,6 +102,7 @@ static struct fstype_info fstypes[] = {
.probe = sandbox_fs_set_blk_dev, .probe = sandbox_fs_set_blk_dev,
.close = sandbox_fs_close, .close = sandbox_fs_close,
.ls = sandbox_fs_ls, .ls = sandbox_fs_ls,
.exists = fs_exists_unsupported,
.read = fs_read_sandbox, .read = fs_read_sandbox,
.write = fs_write_sandbox, .write = fs_write_sandbox,
}, },
@ -103,6 +112,7 @@ static struct fstype_info fstypes[] = {
.probe = fs_probe_unsupported, .probe = fs_probe_unsupported,
.close = fs_close_unsupported, .close = fs_close_unsupported,
.ls = fs_ls_unsupported, .ls = fs_ls_unsupported,
.exists = fs_exists_unsupported,
.read = fs_read_unsupported, .read = fs_read_unsupported,
.write = fs_write_unsupported, .write = fs_write_unsupported,
}, },
@ -184,6 +194,19 @@ int fs_ls(const char *dirname)
return ret; return ret;
} }
int fs_exists(const char *filename)
{
int ret;
struct fstype_info *info = fs_get_info(fs_type);
ret = info->exists(filename);
fs_close();
return ret;
}
int fs_read(const char *filename, ulong addr, int offset, int len) int fs_read(const char *filename, ulong addr, int offset, int len)
{ {
struct fstype_info *info = fs_get_info(fs_type); struct fstype_info *info = fs_get_info(fs_type);
@ -309,6 +332,15 @@ int do_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
return 0; return 0;
} }
int file_exists(const char *dev_type, const char *dev_part, const char *file,
int fstype)
{
if (fs_set_blk_dev(dev_type, dev_part, fstype))
return 0;
return fs_exists(file);
}
int do_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], int do_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
int fstype) int fstype)
{ {

9
include/fs.h
View file

@ -43,6 +43,13 @@ int fs_set_blk_dev(const char *ifname, const char *dev_part_str, int fstype);
*/ */
int fs_ls(const char *dirname); int fs_ls(const char *dirname);
/*
* Determine whether a file exists
*
* Returns 1 if the file exists, 0 if it doesn't exist.
*/
int fs_exists(const char *filename);
/* /*
* Read file "filename" from the partition previously set by fs_set_blk_dev(), * Read file "filename" from the partition previously set by fs_set_blk_dev(),
* to address "addr", starting at byte offset "offset", and reading "len" * to address "addr", starting at byte offset "offset", and reading "len"
@ -72,6 +79,8 @@ int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
int fstype); int fstype);
int do_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], int do_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
int fstype); int fstype);
int file_exists(const char *dev_type, const char *dev_part, const char *file,
int fstype);
int do_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], int do_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
int fstype); int fstype);