diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-09-21 19:13:34 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-09-21 19:13:34 +0000 |
commit | f0c31da5a21302a7f25fbb818d24100f0ad3d4e3 (patch) | |
tree | 97cc42e456dc3e064be97d0bd39563a22941f0cb | |
parent | e2813918b96b7e6d5f5a37811e507246e604747f (diff) |
mtd: fix wrong open() return code checks
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17666 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | package/mtd/src/jffs2.c | 6 | ||||
-rw-r--r-- | package/mtd/src/mtd.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/package/mtd/src/jffs2.c b/package/mtd/src/jffs2.c index 18eb4e686..49a7d5612 100644 --- 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 bd966ab7d..2639b4ebb 100644 --- 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); } |