[PATCH 3/4] util/jffs2reader catfile fix

[PATCH 3/4] util/jffs2reader catfile fix

[Suzuki Takashi]

This is another bug fix for util/jffs2reader.c.

Please review and apply if it is ok.
Thanks.


[PATCH 3/4] util/jffs2reader catfile fix

jffs2reader only writes out the newest raw inode of a file for -f option.
This patch makes it to write out all the raw inodes of the file.
New collect_raw_inodes function collects all the inodes for a file
in version ascending order. The catfile function now uses it and
is able to output entire contents of a file.

This patch depends on:
[PATCH 1/4] util/jffs2reader compile fix

Signed-off-by: Suzuki Takashi <suzuki.takashi@gmail.com>


--- jffs2reader.c.printsize	2005-10-10 17:55:17.000000000 +0900
+++ jffs2reader.c	2005-10-10 18:22:02.000000000 +0900
@@ -87,7 +87,14 @@
 #include <linux/jffs2.h>
 #include <mtd/jffs2-user.h>

+#ifdef DEBUG
+#define dprintf(...) printf (__VA_ARGS__)
+#else /* not DEBUG */
+#define dprintf(...)
+#endif /* not DEBUG */
+
 #define SCRATCH_SIZE (5*1024*1024)
+#define SCRATCH_NUM  (64)

 #ifndef MAJOR
 /* FIXME:  I am using illicit insider knowledge of
@@ -117,6 +124,7 @@ void printdir(char *o, size_t size, stru
 void freedir(struct dir *);

 struct jffs2_raw_inode *find_raw_inode(char *o, size_t size, uint32_t ino);
+struct jffs2_raw_inode **collect_raw_inodes(char *o, size_t size,
uint32_t ino, int *);
 struct jffs2_raw_dirent *resolvedirent(char *, size_t, uint32_t, uint32_t,
 									   char *, uint8_t);
 struct jffs2_raw_dirent *resolvename(char *, size_t, uint32_t, char
*, uint8_t);
@@ -420,7 +428,7 @@ void freedir(struct dir *d)
 	}
 }

-/* collects directory/file nodes in version order. */
+/* searches the newest directory/file nodes. */

 /*
   f       - file flag.
@@ -491,6 +499,67 @@ struct jffs2_raw_inode *find_raw_inode(c
 	return NULL;
 }

+/* collects directory/file nodes in version order. */
+
+/*
+  o       - filesystem image pointer
+  size    - size of filesystem image
+  ino     - inode to compare against. see f.
+  *num    - number of raw inodes (result)
+
+  return value: a pointer to jffs2_raw_inode array and should be freed later.
+*/
+
+struct jffs2_raw_inode **collect_raw_inodes(char *o, size_t size,
uint32_t ino, int *num)
+{
+	/* aligned! */
+	union jffs2_node_union *n = (union jffs2_node_union *) o;
+	union jffs2_node_union *e = (union jffs2_node_union *) (o + size);
+
+	struct jffs2_raw_inode **ri = NULL;
+	int i, count = 0, bufnum = 0;
+	uint32_t ver;
+
+	do {
+		while (n < e && je16_to_cpu (n->u.magic) != JFFS2_MAGIC_BITMASK)
+			n = (union jffs2_node_union *) ((char *) n + 4);
+
+		if (n < e && je16_to_cpu (n->u.magic) == JFFS2_MAGIC_BITMASK) {
+			if (je16_to_cpu (n->u.nodetype) == JFFS2_NODETYPE_INODE &&
+				je32_to_cpu (n->i.ino) == ino) {
+				/* XXX crc check */
+
+				if (bufnum <= count) {
+					bufnum += SCRATCH_NUM;
+					ri = realloc(ri, sizeof(struct jffs2_raw_inode *) * bufnum);
+					if (ri == NULL) {
+						fprintf(stderr, "memory exhausted\n");
+						exit(EXIT_FAILURE);
+					}
+				}
+
+				ver = je32_to_cpu (n->i.version);
+
+				for (i = 0; i < count; i++) {
+					if (ver < je32_to_cpu (ri[i]->version)) {
+						memmove(&ri[i + 1], &ri[i],
+								sizeof(struct jffs2_raw_inode *) * (count - i));
+						break;
+					}
+				}
+
+				ri[i] = &(n->i);
+				count++;
+			}
+		}
+
+		n = (union jffs2_node_union *) ((char *) n + ((je32_to_cpu
(n->u.totlen) + 3) & ~3));
+	} while (n < e);
+
+	*num = count;
+	return ri;
+}
+
 /* collects dir struct for selected inode */

 /*
@@ -853,8 +922,9 @@ void catfile(char *o, size_t size, char
 			 size_t * rsize)
 {
 	struct jffs2_raw_dirent *dd;
-	struct jffs2_raw_inode *ri;
+	struct jffs2_raw_inode **rip;
 	uint32_t ino;
+	int i, count;

 	dd = resolvepath(o, size, 1, path, &ino);

@@ -868,8 +938,23 @@ void catfile(char *o, size_t size, char
 		exit(EXIT_FAILURE);
 	}

-	ri = find_raw_inode(o, size, ino);
-	putblock(b, bsize, rsize, ri);
+	rip = collect_raw_inodes(o, size, ino, &count);
+
+	dprintf(" ver   isize   offset    csize    dsize      ctime      mtime\n");
+
+	for (i = 0; i < count; i++) {
+		struct jffs2_raw_inode *ri = rip[i];
+		dprintf ("%4u %8u %8u %8u %8u %10u %10u\n",
+				 je32_to_cpu (ri->version), je32_to_cpu (ri->isize),
+				 je32_to_cpu (ri->offset),
+				 je32_to_cpu (ri->csize), je32_to_cpu (ri->dsize),
+				 je32_to_cpu (ri->ctime), je32_to_cpu (ri->mtime));
+		putblock(b, bsize, rsize, ri);
+	};
+
+	fflush (stdout);
+
+	free (rip);

 	write(1, b, *rsize);
 }

--
Suzuki Takashi

Re: [PATCH 3/4] util/jffs2reader catfile fix

[Suzuki Takashi]

On Sat, 15 Oct 2005 12:13:29 +0900, I wrote:
> This is another bug fix for util/jffs2reader.c.
> 
> Please review and apply if it is ok.

The patch without quoted-printable encoding and extra linebreaks.
Thanks.


--- jffs2reader.c.printsize	2005-10-10 17:55:17.000000000 +0900
+++ jffs2reader.c	2005-10-10 18:22:02.000000000 +0900
@@ -87,7 +87,14 @@
 #include <linux/jffs2.h>
 #include <mtd/jffs2-user.h>
 
+#ifdef DEBUG
+#define dprintf(...) printf (__VA_ARGS__)
+#else /* not DEBUG */
+#define dprintf(...)
+#endif /* not DEBUG */
+
 #define SCRATCH_SIZE (5*1024*1024)
+#define SCRATCH_NUM  (64)
 
 #ifndef MAJOR
 /* FIXME:  I am using illicit insider knowledge of 
@@ -117,6 +124,7 @@ void printdir(char *o, size_t size, stru
 void freedir(struct dir *);
 
 struct jffs2_raw_inode *find_raw_inode(char *o, size_t size, uint32_t ino);
+struct jffs2_raw_inode **collect_raw_inodes(char *o, size_t size, uint32_t ino, int *);
 struct jffs2_raw_dirent *resolvedirent(char *, size_t, uint32_t, uint32_t,
 									   char *, uint8_t);
 struct jffs2_raw_dirent *resolvename(char *, size_t, uint32_t, char *, uint8_t);
@@ -420,7 +428,7 @@ void freedir(struct dir *d)
 	}
 }
 
-/* collects directory/file nodes in version order. */
+/* searches the newest directory/file nodes. */
 
 /*
   f       - file flag.
@@ -491,6 +499,67 @@ struct jffs2_raw_inode *find_raw_inode(c
 	return NULL;
 }
 
+/* collects directory/file nodes in version order. */
+
+/*
+  o       - filesystem image pointer
+  size    - size of filesystem image
+  ino     - inode to compare against. see f.
+  *num    - number of raw inodes (result)
+
+  return value: a pointer to jffs2_raw_inode array and should be freed later.
+*/
+
+struct jffs2_raw_inode **collect_raw_inodes(char *o, size_t size, uint32_t ino, int *num)
+{
+	/* aligned! */
+	union jffs2_node_union *n = (union jffs2_node_union *) o;
+	union jffs2_node_union *e = (union jffs2_node_union *) (o + size);
+
+	struct jffs2_raw_inode **ri = NULL;
+	int i, count = 0, bufnum = 0;
+	uint32_t ver;
+
+	do {
+		while (n < e && je16_to_cpu (n->u.magic) != JFFS2_MAGIC_BITMASK)
+			n = (union jffs2_node_union *) ((char *) n + 4);
+
+		if (n < e && je16_to_cpu (n->u.magic) == JFFS2_MAGIC_BITMASK) {
+			if (je16_to_cpu (n->u.nodetype) == JFFS2_NODETYPE_INODE &&
+				je32_to_cpu (n->i.ino) == ino) {
+				/* XXX crc check */
+
+				if (bufnum <= count) {
+					bufnum += SCRATCH_NUM;
+					ri = realloc(ri, sizeof(struct jffs2_raw_inode *) * bufnum);
+					if (ri == NULL) {
+						fprintf(stderr, "memory exhausted\n");
+						exit(EXIT_FAILURE);
+					}
+				}
+
+				ver = je32_to_cpu (n->i.version);
+
+				for (i = 0; i < count; i++) {
+					if (ver < je32_to_cpu (ri[i]->version)) {
+						memmove(&ri[i + 1], &ri[i], 
+								sizeof(struct jffs2_raw_inode *) * (count - i));
+						break;
+					}
+				}
+
+				ri[i] = &(n->i);
+				count++;
+			}
+		}
+
+		n = (union jffs2_node_union *) ((char *) n + ((je32_to_cpu (n->u.totlen) + 3) & ~3));
+	} while (n < e);
+
+	*num = count;
+	return ri;
+}
+
 /* collects dir struct for selected inode */
 
 /*
@@ -853,8 +922,9 @@ void catfile(char *o, size_t size, char 
 			 size_t * rsize)
 {
 	struct jffs2_raw_dirent *dd;
-	struct jffs2_raw_inode *ri;
+	struct jffs2_raw_inode **rip;
 	uint32_t ino;
+	int i, count;
 
 	dd = resolvepath(o, size, 1, path, &ino);
 
@@ -868,8 +938,23 @@ void catfile(char *o, size_t size, char 
 		exit(EXIT_FAILURE);
 	}
 
-	ri = find_raw_inode(o, size, ino);
-	putblock(b, bsize, rsize, ri);
+	rip = collect_raw_inodes(o, size, ino, &count);
+
+	dprintf(" ver   isize   offset    csize    dsize      ctime      mtime\n");
+
+	for (i = 0; i < count; i++) {
+		struct jffs2_raw_inode *ri = rip[i];
+		dprintf ("%4u %8u %8u %8u %8u %10u %10u\n",
+				 je32_to_cpu (ri->version), je32_to_cpu (ri->isize),
+				 je32_to_cpu (ri->offset),
+				 je32_to_cpu (ri->csize), je32_to_cpu (ri->dsize),
+				 je32_to_cpu (ri->ctime), je32_to_cpu (ri->mtime));
+		putblock(b, bsize, rsize, ri);
+	};
+
+	fflush (stdout);
+
+	free (rip);
 
 	write(1, b, *rsize);
 }


-- 
Suzuki Takashi

Re: [PATCH 3/4] util/jffs2reader catfile fix

[Holger Schurig]

> The patch without quoted-printable encoding and extra linebreaks.
> Thanks.

You'll save a lot of trouble if you do NOT inline the patch, but attach it as 
a file. That will create a MIME encoded e-mail that is understood since about 
8 years by about every e-mail program. Attachments are MEANT to be 
byte-transparent :-)

Surely even GMAIL allows you to attach a file, maybe via a button in the web 
formular?

Re: [PATCH 3/4] util/jffs2reader catfile fix

[Jörn Engel]

On Mon, 24 October 2005 11:39:30 +0200, Holger Schurig wrote:
> 
> > The patch without quoted-printable encoding and extra linebreaks.
> > Thanks.
> 
> You'll save a lot of trouble if you do NOT inline the patch, but attach it as 
> a file. That will create a MIME encoded e-mail that is understood since about 
> 8 years by about every e-mail program. Attachments are MEANT to be 
> byte-transparent :-)

Actually, I prefer inline patches.  Attachments are better than broken
patches, but as long as it works, inlines keep patch description and
patch itself together.

Jörn

-- 
Mundie uses a textbook tactic of manipulation: start with some
reasonable talk, and lead the audience to an unreasonable conclusion.
-- Bruce Perens