modernize backfire 10.03 so it can be operational again

[openwrt-10.03/.git] / package / mtd / src / jffs2.c

diff --git a/package/mtd/src/jffs2.c b/package/mtd/src/jffs2.c
index 18eb4e686927a2ce56b4e3100e77b1a7f164e1b4..2a83bd47f4aa2ba5422cffae1d37991758468f5e 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;
        }
@@ -244,10 +244,7 @@ int mtd_replace_jffs2(const char *mtd, int fd, int ofs, const char *filename)
        pad(erasesize);
        free(buf);
 
-#ifdef target_brcm
-       trx_fixup(outfd, mtd);
-#endif
-       return 0;
+       return (mtdofs - ofs);
 }
 
 void mtd_parse_jffs2data(const char *buf, const char *dir)
@@ -282,7 +279,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)
@@ -347,9 +344,9 @@ int mtd_write_jffs2(const char *mtd, const char *filename, const char *dir)
 
        err = 0;
 
-#ifdef target_brcm
-       trx_fixup(outfd, mtd);
-#endif
+       if (trx_fixup) {
+         trx_fixup(outfd, mtd);
+       }
 
 done:
        close(outfd);