diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
| commit | 6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch) | |
| tree | 0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /scripts/cramfs | |
| parent | ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff) | |
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine
status unknown.
Diffstat (limited to 'scripts/cramfs')
| -rw-r--r-- | scripts/cramfs/mkcramfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cramfs/mkcramfs.c b/scripts/cramfs/mkcramfs.c index 36b12df49..878e12b32 100644 --- a/scripts/cramfs/mkcramfs.c +++ b/scripts/cramfs/mkcramfs.c @@ -93,7 +93,7 @@ static int find_identical_file(struct entry *orig,struct entry *newfile) 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 @@ static unsigned int do_compress(char *base, unsigned int offset, char const *nam 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.) */ |