# HG changeset patch # User Pascal Bellard # Date 1588710506 0 # Node ID b534f8a24834c71320e4e6c231d8a501b07d05d2 # Parent 299e2fd264d8260b48d1295a7a39fe1c488467ce fusecloop: multicompressor support (again) diff -r 299e2fd264d8 -r b534f8a24834 fusecloop/stuff/fusecloop.u --- a/fusecloop/stuff/fusecloop.u Tue May 05 20:14:04 2020 +0000 +++ b/fusecloop/stuff/fusecloop.u Tue May 05 20:28:26 2020 +0000 @@ -1977,7 +1977,17 @@ return 0; --- create_compressed_fs.c +++ create_compressed_fs.c -@@ -78,6 +78,7 @@ +@@ -58,6 +58,9 @@ + #include + #endif + ++/* Creates a compressed file */ ++#include "common_header.h" ++ + #include + static int xz_compress(Bytef *compressed, + uLongf *compressed_len, +@@ -78,6 +81,7 @@ if (lzma_code(&strm, LZMA_FINISH) == LZMA_STREAM_END) { *compressed_len -= strm.avail_out; @@ -1985,7 +1995,7 @@ res = Z_OK; } } -@@ -101,6 +102,7 @@ +@@ -101,6 +105,7 @@ (void) level; if (res <= 0) return Z_ERRNO; *compressed_len = res; @@ -1993,6 +2003,16 @@ return Z_OK; } +@@ -143,9 +148,6 @@ + + #include + +-/* Creates a compressed file */ +-#include "common_header.h" +- + #define CLOOP_PREAMBLE "#!/bin/sh\n" "#V3.0 Format\n" "modprobe cloop file=$0 && mount -r -t iso9660 /dev/cloop $1\n" "exit $?\n" + #define CHUNK 65536 + #define DEFAULT_BLOCKSIZE 65536 @@ -179,7 +181,6 @@ static unsigned long block_size = 0; static void flush_index(int sig)