ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2025-12-06 07:12:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modify the file format to not include rzip chunk size except for STDOUT chunked files thus decreasing the file format size further.

Browse source
This commit is contained in:
Con Kolivas 2011-03-22 09:04:24 +11:00
parent 7101372167
commit 131d4c92c2
6 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/magic.header.txt
View file

@ -28,7 +28,7 @@ Encrypted salt (bytes 6->14 in magic if encrypted):
Rzip Chunk Data: Rzip Chunk Data:
0 Data offsets byte width (meaning length is < (2 * 8)^RCD0) 0 Data offsets byte width (meaning length is < (2 * 8)^RCD0)
1 Flag that there is no chunk beyond this 1 Flag that there is no chunk beyond this
(RCD0 bytes) Chunk decompressed size (not stored in encrypted file) (RCD0 bytes) Chunk decompressed size (only stored in stdout chunked file)
XX Stream 0 header data XX Stream 0 header data
XX Stream 1 header data XX Stream 1 header data

1
liblrzip.h
View file

@ -49,6 +49,7 @@
#define TMP_OUTBUF (control->flags & FLAG_TMP_OUTBUF) #define TMP_OUTBUF (control->flags & FLAG_TMP_OUTBUF)
#define TMP_INBUF (control->flags & FLAG_TMP_INBUF) #define TMP_INBUF (control->flags & FLAG_TMP_INBUF)
#define ENCRYPT (control->flags & FLAG_ENCRYPT) #define ENCRYPT (control->flags & FLAG_ENCRYPT)
#define CHUNKED (control->flags & FLAG_CHUNKED)
#define print_output(format, args...) do {\ #define print_output(format, args...) do {\
fprintf(control->msgout, format, ##args); \ fprintf(control->msgout, format, ##args); \

16
lrzip.c
View file

@ -175,6 +175,10 @@ static void get_magic(rzip_control *control, char *magic)
print_output("Asked to decrypt a non-encrypted archive. Bypassing decryption.\n"); print_output("Asked to decrypt a non-encrypted archive. Bypassing decryption.\n");
control->flags &= ~FLAG_ENCRYPT; control->flags &= ~FLAG_ENCRYPT;
} }
/* If the file was generated from STDOUT and !ENCRYPT, an extra field
* describing the chunk length exists */
if (!ENCRYPT && !expected_size)
control->flags |= FLAG_CHUNKED;
} }
void read_magic(rzip_control *control, int fd_in, i64 *expected_size) void read_magic(rzip_control *control, int fd_in, i64 *expected_size)
@ -777,11 +781,13 @@ void get_fileinfo(rzip_control *control)
if (control->major_version == 0 && control->minor_version > 5) { if (control->major_version == 0 && control->minor_version > 5) {
if (unlikely(read(fd_in, &control->eof, 1) != 1)) if (unlikely(read(fd_in, &control->eof, 1) != 1))
fatal("Failed to read eof in get_fileinfo\n"); fatal("Failed to read eof in get_fileinfo\n");
if (CHUNKED) {
if (unlikely(read(fd_in, &chunk_size, chunk_byte) != chunk_byte)) if (unlikely(read(fd_in, &chunk_size, chunk_byte) != chunk_byte))
fatal("Failed to read chunk_size in get_fileinfo\n"); fatal("Failed to read chunk_size in get_fileinfo\n");
chunk_size = le64toh(chunk_size); chunk_size = le64toh(chunk_size);
} }
} }
}
if (control->major_version == 0 && control->minor_version < 4) { if (control->major_version == 0 && control->minor_version < 4) {
ofs = 24; ofs = 24;
@ -793,7 +799,7 @@ void get_fileinfo(rzip_control *control)
ofs = 25; ofs = 25;
header_length = 25; header_length = 25;
} else { } else {
ofs = 26 + chunk_byte; ofs = 26 + (CHUNKED ? chunk_byte: 0);
header_length = 1 + (chunk_byte * 3); header_length = 1 + (chunk_byte * 3);
} }
next_chunk: next_chunk:
@ -867,10 +873,13 @@ next_chunk:
if (control->major_version == 0 && control->minor_version > 5) { if (control->major_version == 0 && control->minor_version > 5) {
if (unlikely(read(fd_in, &control->eof, 1) != 1)) if (unlikely(read(fd_in, &control->eof, 1) != 1))
fatal("Failed to read eof in get_fileinfo\n"); fatal("Failed to read eof in get_fileinfo\n");
ofs++;
if (CHUNKED) {
if (unlikely(read(fd_in, &chunk_size, chunk_byte) != chunk_byte)) if (unlikely(read(fd_in, &chunk_size, chunk_byte) != chunk_byte))
fatal("Failed to read chunk_size in get_fileinfo\n"); fatal("Failed to read chunk_size in get_fileinfo\n");
chunk_size = le64toh(chunk_size); chunk_size = le64toh(chunk_size);
ofs += 1 + chunk_byte; ofs += chunk_byte;
}
header_length = 1 + (chunk_byte * 3); header_length = 1 + (chunk_byte * 3);
} }
} }
@ -949,6 +958,9 @@ void compress_file(rzip_control *control)
if (ENCRYPT) if (ENCRYPT)
get_hash(control, 1); get_hash(control, 1);
else if (STDOUT)
control->flags |= FLAG_CHUNKED;
memset(header, 0, sizeof(header)); memset(header, 0, sizeof(header));
if (!STDIN) { if (!STDIN) {

1
lrzip_private.h
View file

@ -158,6 +158,7 @@ typedef struct md5_ctx md5_ctx;
#define FLAG_TMP_OUTBUF (1 << 21) #define FLAG_TMP_OUTBUF (1 << 21)
#define FLAG_TMP_INBUF (1 << 22) #define FLAG_TMP_INBUF (1 << 22)
#define FLAG_ENCRYPT (1 << 23) #define FLAG_ENCRYPT (1 << 23)
#define FLAG_CHUNKED (1 << 24)
#define NO_MD5 (!(HASH_CHECK) && !(HAS_MD5)) #define NO_MD5 (!(HASH_CHECK) && !(HAS_MD5))

1
main.c
View file

@ -85,6 +85,7 @@
#define TMP_OUTBUF (control.flags & FLAG_TMP_OUTBUF) #define TMP_OUTBUF (control.flags & FLAG_TMP_OUTBUF)
#define TMP_INBUF (control.flags & FLAG_TMP_INBUF) #define TMP_INBUF (control.flags & FLAG_TMP_INBUF)
#define ENCRYPT (control.flags & FLAG_ENCRYPT) #define ENCRYPT (control.flags & FLAG_ENCRYPT)
#define CHUNKED (control.flags & FLAG_CHUNKED)
#define print_output(format, args...) do {\ #define print_output(format, args...) do {\
fprintf(control.msgout, format, ##args); \ fprintf(control.msgout, format, ##args); \

6
stream.c
View file

@ -1104,7 +1104,7 @@ void *open_stream_in(rzip_control *control, int f, int n, int chunk_bytes)
goto failed; goto failed;
} }
/* Read in the expected chunk size */ /* Read in the expected chunk size */
if (!ENCRYPT) { if (CHUNKED) {
if (unlikely(read_val(control, f, &sinfo->size, sinfo->chunk_bytes))) { if (unlikely(read_val(control, f, &sinfo->size, sinfo->chunk_bytes))) {
print_err("Failed to read in chunk size in open_stream_in\n"); print_err("Failed to read in chunk size in open_stream_in\n");
goto failed; goto failed;
@ -1323,9 +1323,9 @@ retry:
write_u8(control, ctis->fd, ctis->chunk_bytes); write_u8(control, ctis->fd, ctis->chunk_bytes);
/* Write whether this is the last chunk, followed by the size /* Write whether this is the last chunk, followed by the size
* of this chunk */ * of this chunk if working with STDOUT and !ENCRYPT */
write_u8(control, ctis->fd, control->eof); write_u8(control, ctis->fd, control->eof);
if (!ENCRYPT) if (CHUNKED)
write_val(control, ctis->fd, ctis->size, ctis->chunk_bytes); write_val(control, ctis->fd, ctis->size, ctis->chunk_bytes);
/* First chunk of this stream, write headers */ /* First chunk of this stream, write headers */