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

diff --git a/CHANGELOG b/CHANGELOG
index 69214c3a035eabdd9c4c2fcce890f627cf0c02cf..51c09eec2c53a4abb3a30477283bc623160bc26f 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
 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
 
 * Add support for Silicon Turnkey eXpress XTc (mpc87x/88x) board.

diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c
index 16f5b7aea9784733ab9851bf51a93f6c8fae45bc..7ab6e9ca7a1dddac15f112c2d7c4f40a548931af 100644 (file)
--- a/common/cmd_jffs2.c
+++ b/common/cmd_jffs2.c
@@ -1810,7 +1810,7 @@ int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
                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);
                }
 
-               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);
                }
 
-               return (ret == 1);
+               return ret ? 0 : 1;
        }
-       return 0;
+       return 1;
 }
 
 /* command line only */

diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index 667ae15e6d156a3cf995ae34f01e113b2b4dd83e..e53aa31effad72ffca0d67ebcbe6bb481e7edce6 100644 (file)
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -1288,7 +1288,7 @@ u32
 jffs2_1pass_ls(struct part_info * part, const char *fname)
 {
        struct b_lists *pl;
-       long ret = 0;
+       long ret = 1;
        u32 inode;
 
        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;
-       long ret = 0;
+       long ret = 1;
        u32 inode;
 
        if (! (pl  = jffs2_get_list(part, "load")))