LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix return values of the jffs2 commands ls/fsload/fsinfo, 

so we can use them to, e.g., check the existence of a file with
"if ls foo; then this; else that; fi" in the hush shell
Patch by Andreas Engel, 16 August 2005
This commit is contained in:
Wolfgang Denk 2005-08-16 09:32:45 +02:00
parent 3d078ce6d7
commit 87b8bd5aed
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -2,6 +2,11 @@
Changes for U-Boot 1.1.4: Changes for U-Boot 1.1.4:
====================================================================== ======================================================================
* Fix return values of the jffs2 commands ls/fsload/fsinfo,
so we can use them to, e.g., check the existence of a file with
"if ls foo; then this; else that; fi" in the hush shell
Patch by Andreas Engel, 16 August 2005
* Coding style cleanup * Coding style cleanup
* Add support for Silicon Turnkey eXpress XTc (mpc87x/88x) board. * Add support for Silicon Turnkey eXpress XTc (mpc87x/88x) board.

10
common/cmd_jffs2.c
View File

@ -1810,7 +1810,7 @@ int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return !(size > 0); return !(size > 0);
} }
return 0; return 1;
} }
/** /**
@ -1846,9 +1846,9 @@ int do_jffs2_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
ret = jffs2_1pass_ls(part, filename); ret = jffs2_1pass_ls(part, filename);
} }
return (ret == 1); return ret ? 0 : 1;
} }
return 0; return 1;
} }
/** /**
@ -1884,9 +1884,9 @@ int do_jffs2_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
ret = jffs2_1pass_info(part); ret = jffs2_1pass_info(part);
} }
return (ret == 1); return ret ? 0 : 1;
} }
return 0; return 1;
} }
/* command line only */ /* command line only */

4
fs/jffs2/jffs2_1pass.c
View File

@ -1288,7 +1288,7 @@ u32
jffs2_1pass_ls(struct part_info * part, const char *fname) jffs2_1pass_ls(struct part_info * part, const char *fname)
{ {
struct b_lists *pl; struct b_lists *pl;
long ret = 0; long ret = 1;
u32 inode; u32 inode;
if (! (pl = jffs2_get_list(part, "ls"))) if (! (pl = jffs2_get_list(part, "ls")))
@ -1315,7 +1315,7 @@ jffs2_1pass_load(char *dest, struct part_info * part, const char *fname)
{ {
struct b_lists *pl; struct b_lists *pl;
long ret = 0; long ret = 1;
u32 inode; u32 inode;
if (! (pl = jffs2_get_list(part, "load"))) if (! (pl = jffs2_get_list(part, "load")))