merge fixes from r17666 to 8.09

SVN-Revision: 17667

diff --git a/package/mtd/src/jffs2.c b/package/mtd/src/jffs2.c
index 18eb4e686927a2ce56b4e3100e77b1a7f164e1b4..49a7d56120e05cc78a6e12754a1a67c9eab2670a 100644 (file)
--- a/package/mtd/src/jffs2.c
+++ b/package/mtd/src/jffs2.c
@@ -42,7 +42,7 @@ static int last_ino = 0;
 static int last_version = 0;
 static char *buf = NULL;
 static int ofs = 0;
-static int outfd = 0;
+static int outfd = -1;
 static int mtdofs = 0;
 static int target_ino = 0;
 
@@ -186,7 +186,7 @@ static void add_file(const char *name, int parent)
        ri.usercompr = 0;
 
        fd = open(name, 0);
-       if (fd <= 0) {
+       if (fd < 0) {
                fprintf(stderr, "File %s does not exist\n", name);
                return;
        }
@@ -282,7 +282,7 @@ int mtd_write_jffs2(const char *mtd, const char *filename, const char *dir)
        int err = -1, fdeof = 0;
 
        outfd = mtd_check_open(mtd);
-       if (!outfd)
+       if (outfd < 0)
                return -1;
 
        if (quiet < 2)

diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c
index bd966ab7dca699a16aadcfdc61ab0fb88fdd427d..2639b4ebb5e2309f24bbe78ec5da987ad2812b54 100644 (file)
--- a/package/mtd/src/mtd.c
+++ b/package/mtd/src/mtd.c
@@ -98,13 +98,13 @@ int mtd_check_open(const char *mtd)
        fd = mtd_open(mtd, false);
        if(fd < 0) {
                fprintf(stderr, "Could not open mtd device: %s\n", mtd);
-               return 0;
+               return -1;
        }
 
        if(ioctl(fd, MEMGETINFO, &mtdInfo)) {
                fprintf(stderr, "Could not get MTD device info from %s\n", mtd);
                close(fd);
-               return 0;
+               return -1;
        }
        mtdsize = mtdInfo.size;
        erasesize = mtdInfo.erasesize;
@@ -162,7 +162,7 @@ static int mtd_check(const char *mtd)
                }
 
                fd = mtd_check_open(mtd);
-               if (!fd)
+               if (fd < 0)
                        return 0;
 
                if (!buf)
@@ -199,7 +199,7 @@ mtd_unlock(const char *mtd)
                }
 
                fd = mtd_check_open(mtd);
-               if(fd <= 0) {
+               if(fd < 0) {
                        fprintf(stderr, "Could not open mtd device: %s\n", mtd);
                        exit(1);
                }
@@ -230,7 +230,7 @@ mtd_erase(const char *mtd)
                fprintf(stderr, "Erasing %s ...\n", mtd);
 
        fd = mtd_check_open(mtd);
-       if(fd <= 0) {
+       if(fd < 0) {
                fprintf(stderr, "Could not open mtd device: %s\n", mtd);
                exit(1);
        }
@@ -260,7 +260,7 @@ mtd_refresh(const char *mtd)
                fprintf(stderr, "Refreshing mtd partition %s ... ", mtd);
 
        fd = mtd_check_open(mtd);
-       if(fd <= 0) {
+       if(fd < 0) {
                fprintf(stderr, "Could not open mtd device: %s\n", mtd);
                exit(1);
        }