wok-current rev 23764
fusecloop: multicompressor support (again)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue May 05 20:28:26 2020 +0000 (2020-05-05) |
parents | 299e2fd264d8 |
children | c6796c6304f6 |
files | fusecloop/stuff/fusecloop.u |
line diff
1.1 --- a/fusecloop/stuff/fusecloop.u Tue May 05 20:14:04 2020 +0000 1.2 +++ b/fusecloop/stuff/fusecloop.u Tue May 05 20:28:26 2020 +0000 1.3 @@ -1977,7 +1977,17 @@ 1.4 return 0; 1.5 --- create_compressed_fs.c 1.6 +++ create_compressed_fs.c 1.7 -@@ -78,6 +78,7 @@ 1.8 +@@ -58,6 +58,9 @@ 1.9 + #include <zlib.h> 1.10 + #endif 1.11 + 1.12 ++/* Creates a compressed file */ 1.13 ++#include "common_header.h" 1.14 ++ 1.15 + #include <lzma.h> 1.16 + static int xz_compress(Bytef *compressed, 1.17 + uLongf *compressed_len, 1.18 +@@ -78,6 +81,7 @@ 1.19 if (lzma_code(&strm, LZMA_FINISH) == LZMA_STREAM_END) { 1.20 1.21 *compressed_len -= strm.avail_out; 1.22 @@ -1985,7 +1995,7 @@ 1.23 res = Z_OK; 1.24 } 1.25 } 1.26 -@@ -101,6 +102,7 @@ 1.27 +@@ -101,6 +105,7 @@ 1.28 (void) level; 1.29 if (res <= 0) return Z_ERRNO; 1.30 *compressed_len = res; 1.31 @@ -1993,6 +2003,16 @@ 1.32 return Z_OK; 1.33 } 1.34 1.35 +@@ -143,9 +148,6 @@ 1.36 + 1.37 + #include <signal.h> 1.38 + 1.39 +-/* Creates a compressed file */ 1.40 +-#include "common_header.h" 1.41 +- 1.42 + #define CLOOP_PREAMBLE "#!/bin/sh\n" "#V3.0 Format\n" "modprobe cloop file=$0 && mount -r -t iso9660 /dev/cloop $1\n" "exit $?\n" 1.43 + #define CHUNK 65536 1.44 + #define DEFAULT_BLOCKSIZE 65536 1.45 @@ -179,7 +181,6 @@ 1.46 static unsigned long block_size = 0; 1.47 static void flush_index(int sig)