mtd/util jffs3dump.c, NONE, 1.1 Makefile, 1.53, 1.54 jffs2dump.c, 1.7, 1.8 jffs3.h, 1.1, 1.2 summary.h, 1.1, 1.2

[havasi at infradead.org]

Update of /home/cvs/mtd/util
In directory phoenix.infradead.org:/tmp/cvs-serv20987

Modified Files:
	Makefile jffs2dump.c jffs3.h summary.h 
Added Files:
	jffs3dump.c 
Log Message:
jffs3dump (jffs2dump with summary support)



***** Error reading new file: [Errno 2] No such file or directory: 'jffs3dump.c'
Index: Makefile
===================================================================
RCS file: /home/cvs/mtd/util/Makefile,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Makefile	21 Dec 2004 15:18:51 -0000	1.53
+++ Makefile	21 Jan 2005 11:52:22 -0000	1.54
@@ -12,7 +12,7 @@
 
 TARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
 	mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock \
-	flash_info mtd_debug flashcp nandwrite jffs2dump \
+	flash_info mtd_debug flashcp nandwrite jffs2dump jffs3dump \
 	nftldump nftl_format docfdisk \
 	sumtool #jffs2reader 
 	
@@ -49,7 +49,10 @@
 
 jffs2dump: jffs2dump.o crc32.o
 	$(CC) $(LDFLAGS) -o $@ $^
-	
+
+jffs3dump: jffs3dump.o crc32.o
+	$(CC) $(LDFLAGS) -o $@ $^
+
 sumtool: sumtool.o crc32.o
 	$(CC) $(LDFLAGS) -o $@ $^
 

Index: jffs2dump.c
===================================================================
RCS file: /home/cvs/mtd/util/jffs2dump.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jffs2dump.c	2 Dec 2004 19:27:54 -0000	1.7
+++ jffs2dump.c	21 Jan 2005 11:52:22 -0000	1.8
@@ -102,7 +102,7 @@
 
 	for (;;) {
 		int option_index = 0;
-		static const char *short_options = "bce:rd:o:v";
+		static const char *short_options = "blce:rd:o:v";
 		static const struct option long_options[] = {
 			{"help", no_argument, 0, 0},
 			{"version", no_argument, 0, 0},

Index: jffs3.h
===================================================================
RCS file: /home/cvs/mtd/util/jffs3.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jffs3.h	5 Jan 2005 08:33:07 -0000	1.1
+++ jffs3.h	21 Jan 2005 11:52:23 -0000	1.2
@@ -149,7 +149,7 @@
 
 struct jffs3_summary_node{
     jint16_t magic;
-	jint16_t nodetype; 	/* = JFFS3_NODETYPE_INODE_SUM */
+	jint16_t nodetype; 	/* = JFFS3_NODETYPE_SUMMARY */
 	jint32_t totlen;
 	jint32_t hdr_crc;
 	jint16_t sum_num;	/* number of sum entries*/

Index: summary.h
===================================================================
RCS file: /home/cvs/mtd/util/summary.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- summary.h	5 Jan 2005 10:26:07 -0000	1.1
+++ summary.h	21 Jan 2005 11:52:23 -0000	1.2
@@ -135,7 +135,7 @@
 
 #define JFFS3_SUMMARY_FRAME_SIZE (sizeof(struct jffs3_summary_node)+sizeof(struct jffs3_sum_marker)+3)
 	
-#if !(defined(SUM_TOOL) || defined(JFFS2DUMP))
+#if !(defined(SUM_TOOL) || defined(JFFS2DUMP) || defined(JFFS3DUMP))
 
 int jffs3_sum_init(struct jffs3_sb_info *c);
 void jffs3_sum_exit(struct jffs3_sb_info *c);