patch-2.4.0-test2 linux/scripts/cramfs/mkcramfs.c

• Lines: 20
• Date: Mon Jun 19 13:45:52 2000
• Orig file: v2.4.0-test1/linux/scripts/cramfs/mkcramfs.c
• Orig date: Tue May 23 15:31:37 2000

diff -u --recursive --new-file v2.4.0-test1/linux/scripts/cramfs/mkcramfs.c linux/scripts/cramfs/mkcramfs.c
@@ -93,7 +93,7 @@
         if(!orig) return 0;
         if(orig->size==newfile->size && orig->uncompressed && !memcmp(orig->uncompressed,newfile->uncompressed,orig->size)) {
                 newfile->same=orig;
-                return 0;
+                return 1;
         }
         return find_identical_file(orig->child,newfile) ||
                    find_identical_file(orig->next,newfile);
@@ -441,9 +441,9 @@
 		size -= input;
 		if (!is_zero (uncompressed, input)) {
 			compress(base + curr, &len, uncompressed, input);
-			uncompressed += input;
 			curr += len;
 		}
+		uncompressed += input;
 
 		if (len > blksize*2) {
 			/* (I don't think this can happen with zlib.) */