X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/da0a101791b5ca677825918283a0e16af78fe8ea..495ea3c8471821855f1fc06ef5f66ffa05fabe62:/package/mtd/src/jffs2.c?ds=sidebyside diff --git a/package/mtd/src/jffs2.c b/package/mtd/src/jffs2.c index d1c6fb66f..c683b51d1 100644 --- a/package/mtd/src/jffs2.c +++ b/package/mtd/src/jffs2.c @@ -140,7 +140,6 @@ static void add_file(const char *name, int parent) struct stat st; char wbuf[4096]; const char *fname; - FILE *f; if (stat(name, &st)) { fprintf(stderr, "File %s does not exist\n", name); @@ -210,7 +209,7 @@ static void add_file(const char *name, int parent) close(fd); } -int mtd_replace_jffs2(int fd, int ofs, const char *filename) +int mtd_replace_jffs2(const char *mtd, int fd, int ofs, const char *filename) { outfd = fd; mtdofs = ofs; @@ -226,6 +225,11 @@ int mtd_replace_jffs2(int fd, int ofs, const char *filename) add_data(JFFS2_EOF, sizeof(JFFS2_EOF) - 1); pad(erasesize); free(buf); + +#ifdef target_brcm + trx_fixup(outfd, mtd); +#endif + return 0; } void mtd_parse_jffs2data(const char *buf, const char *dir) @@ -243,7 +247,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 */ @@ -258,7 +262,6 @@ void mtd_parse_jffs2data(const char *buf, const char *dir) int mtd_write_jffs2(const char *mtd, const char *filename, const char *dir) { int err = -1, fdeof = 0; - off_t offset; outfd = mtd_check_open(mtd); if (!outfd) @@ -326,6 +329,10 @@ int mtd_write_jffs2(const char *mtd, const char *filename, const char *dir) err = 0; +#ifdef target_brcm + trx_fixup(outfd, mtd); +#endif + done: close(outfd); if (buf)