aboutsummaryrefslogtreecommitdiffstats
path: root/package/mtd/src/jffs2.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-08-21 18:23:57 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-08-21 18:23:57 +0000
commit1e38527a525ca2e4dbe3a53dad63669773d3d15c (patch)
tree6914285134a096e80ea7cc6fe3578ee2a23ab50e /package/mtd/src/jffs2.c
parentba05b57573eaf3272997892eb521451b670c4d5e (diff)
downloadupstream-1e38527a525ca2e4dbe3a53dad63669773d3d15c.tar.gz
upstream-1e38527a525ca2e4dbe3a53dad63669773d3d15c.tar.bz2
upstream-1e38527a525ca2e4dbe3a53dad63669773d3d15c.zip
add sysupgrade script for config preserving system upgrades. only implemented for x86-2.6 at the moment, but can be ported to other platforms easily
SVN-Revision: 8456
Diffstat (limited to 'package/mtd/src/jffs2.c')
-rw-r--r--package/mtd/src/jffs2.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/package/mtd/src/jffs2.c b/package/mtd/src/jffs2.c
index 7b68ae575f..f614a336ea 100644
--- a/package/mtd/src/jffs2.c
+++ b/package/mtd/src/jffs2.c
@@ -147,7 +147,7 @@ static void add_file(char *name, int parent)
else
fname = name;
- inode = add_dirent(name, IFTODT(S_IFREG), parent);
+ inode = add_dirent(fname, IFTODT(S_IFREG), parent);
memset(&ri, 0, sizeof(ri));
ri.magic = JFFS2_MAGIC_BITMASK;
ri.nodetype = JFFS2_NODETYPE_INODE;
@@ -223,6 +223,9 @@ int mtd_write_jffs2(char *mtd, char *filename, char *dir)
goto done;
}
+ if (!*dir)
+ target_ino = 1;
+
/* parse the structure of the jffs2 first
* locate the directory that the file is going to be placed in */
for(;;) {
@@ -253,7 +256,7 @@ int mtd_write_jffs2(char *mtd, char *filename, 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 ((de->pino == 1) && !strncmp(de->name, dir, de->nsize))
+ if (*dir && (de->pino == 1) && !strncmp(de->name, dir, de->nsize))
target_ino = de->ino;
/* store the last inode and version numbers for adding extra files */