X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fmtd%2Fsrc%2Fjffs2.c;h=2a83bd47f4aa2ba5422cffae1d37991758468f5e;hb=801985e5286881dd578a19280b2a6c8e212a530d;hp=5654f93e078b0a019778c6941eae65bc63a7bd4d;hpb=82cd54f3ea9325bbd7958526f261ef6121896270;p=openwrt.git

diff --git a/package/mtd/src/jffs2.c b/package/mtd/src/jffs2.c
index 5654f93e07..2a83bd47f4 100644
--- a/package/mtd/src/jffs2.c
+++ b/package/mtd/src/jffs2.c
@@ -1,3 +1,21 @@
+/*
+ * jffs2 on-disk structure generator for mtd
+ *
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License v2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * Based on:
+ *   JFFS2 -- Journalling Flash File System, Version 2.
+ *   Copyright © 2001-2007 Red Hat, Inc.
+ *   Created by David Woodhouse <dwmw2@infradead.org>
+ */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdint.h>
@@ -24,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;
 
@@ -168,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;
 	}
@@ -226,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)
@@ -247,7 +262,7 @@ void mtd_parse_jffs2data(const char *buf, const char *dir)
 			struct jffs2_raw_dirent *de = (struct jffs2_raw_dirent *) node;
 
 			/* is this the right directory name and is it a subdirectory of / */
-			if (*dir && (de->pino == 1) && !strncmp(de->name, dir, de->nsize))
+			if (*dir && (de->pino == 1) && !strncmp((char *) de->name, dir, de->nsize))
 				target_ino = de->ino;
 
 			/* store the last inode and version numbers for adding extra files */
@@ -264,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)
@@ -329,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);