projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fs: add fs_get_type() for current filesystem type
[oweals/u-boot.git]
/
cmd
/
ubifs.c
diff --git
a/cmd/ubifs.c
b/cmd/ubifs.c
index 11bab7a1a1f67546bfc357faef8d315a4309795d..e4000b7ad19dd466940fc7394bc5c45f8f80e54c 100644
(file)
--- a/
cmd/ubifs.c
+++ b/
cmd/ubifs.c
@@
-19,16
+19,10
@@
static int ubifs_initialized;
static int ubifs_mounted;
static int ubifs_initialized;
static int ubifs_mounted;
-static int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc,
- char * const argv[])
+int cmd_ubifs_mount(char *vol_name)
{
{
- char *vol_name;
int ret;
int ret;
- if (argc != 2)
- return CMD_RET_USAGE;
-
- vol_name = argv[1];
debug("Using volume %s\n", vol_name);
if (ubifs_initialized == 0) {
debug("Using volume %s\n", vol_name);
if (ubifs_initialized == 0) {
@@
-42,7
+36,19
@@
static int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc,
ubifs_mounted = 1;
ubifs_mounted = 1;
- return 0;
+ return ret;
+}
+static int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc,
+ char * const argv[])
+{
+ char *vol_name;
+
+ if (argc != 2)
+ return CMD_RET_USAGE;
+
+ vol_name = argv[1];
+
+ return cmd_ubifs_mount(vol_name);
}
int ubifs_is_mounted(void)
}
int ubifs_is_mounted(void)
@@
-50,11
+56,18
@@
int ubifs_is_mounted(void)
return ubifs_mounted;
}
return ubifs_mounted;
}
-
void
cmd_ubifs_umount(void)
+
int
cmd_ubifs_umount(void)
{
{
+ if (ubifs_initialized == 0) {
+ printf("No UBIFS volume mounted!\n");
+ return -1;
+ }
+
uboot_ubifs_umount();
ubifs_mounted = 0;
ubifs_initialized = 0;
uboot_ubifs_umount();
ubifs_mounted = 0;
ubifs_initialized = 0;
+
+ return 0;
}
static int do_ubifs_umount(cmd_tbl_t *cmdtp, int flag, int argc,
}
static int do_ubifs_umount(cmd_tbl_t *cmdtp, int flag, int argc,
@@
-63,14
+76,7
@@
static int do_ubifs_umount(cmd_tbl_t *cmdtp, int flag, int argc,
if (argc != 1)
return CMD_RET_USAGE;
if (argc != 1)
return CMD_RET_USAGE;
- if (ubifs_initialized == 0) {
- printf("No UBIFS volume mounted!\n");
- return -1;
- }
-
- cmd_ubifs_umount();
-
- return 0;
+ return cmd_ubifs_umount();
}
static int do_ubifs_ls(cmd_tbl_t *cmdtp, int flag, int argc,
}
static int do_ubifs_ls(cmd_tbl_t *cmdtp, int flag, int argc,