X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2c2e02d72979e9d2865a400068abc4262bf88074..92f09266ed788f163deb0cdf24c21959e05c37a2:/package/mtd/src/jffs2.c

diff --git a/package/mtd/src/jffs2.c b/package/mtd/src/jffs2.c
index 18eb4e686..aaf9be5a9 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;
 	}
@@ -244,10 +244,10 @@ 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;
+	if (trx_fixup) {
+	  trx_fixup(outfd, mtd);
+	}
+	return (mtdofs - ofs);
 }
 
 void mtd_parse_jffs2data(const char *buf, const char *dir)
@@ -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)
@@ -347,9 +347,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);