ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2026-01-27 10:34:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consolidate magic writing to be able to seek to read and encrypt block header data later.

Browse source
This commit is contained in:
ckolivas 2011-03-17 16:59:27 +11:00
parent d63a9a02ff
commit e78069c0d7
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lrzip.c
View file

@ -85,24 +85,28 @@ static char *make_magic(rzip_control *control)
return magic;
}
void write_stdout_header(rzip_control *control)
static i64 fdout_seekto(rzip_control *control, i64 pos)
{
char *magic = make_magic(control);
memcpy(control->tmp_outbuf, magic, MAGIC_LEN);
control->magic_written = 1;
free(magic);
if (TMP_OUTBUF) {
pos -= control->out_relofs;
control->out_ofs = pos;
if (unlikely(pos > control->out_len || pos < 0)) {
print_err("Trying to seek to %lld outside tmp outbuf in fdout_seekto\n", pos);
return -1;
}
return 0;
}
return lseek(control->fd_out, 0, SEEK_SET);
}
static void write_magic(rzip_control *control, int fd_in, int fd_out)
void write_magic(rzip_control *control)
{
char *magic = make_magic(control);
if (unlikely(lseek(fd_out, 0, SEEK_SET)))
if (unlikely(fdout_seekto(control, 0)))
fatal("Failed to seek to BOF to write Magic Header\n");
if (unlikely(write(fd_out, magic, MAGIC_LEN) != MAGIC_LEN))
if (unlikely(put_fdout(control, magic, MAGIC_LEN) != MAGIC_LEN))
fatal("Failed to write magic header\n");
control->magic_written = 1;
@ -1045,7 +1049,7 @@ void compress_file(rzip_control *control)
/* Wwrite magic at end b/c lzma does not tell us properties until it is done */
if (!STDOUT)
write_magic(control, fd_in, fd_out);
write_magic(control);
if (ENCRYPT)
release_hashes(control);

3
lrzip.h
View file

@ -21,7 +21,7 @@
#include "lrzip_private.h"
void write_magic(rzip_control *control, int fd_in, int fd_out);
void write_magic(rzip_control *control);
void read_magic(rzip_control *control, int fd_in, i64 *expected_size);
void preserve_perms(rzip_control *control, int fd_in, int fd_out);
int open_tmpoutfile(rzip_control *control);
@ -32,7 +32,6 @@ void decompress_file(rzip_control *control);
void get_header_info(rzip_control *control, int fd_in, uchar *ctype, i64 *c_len, i64 *u_len, i64 *last_head);
void get_fileinfo(rzip_control *control);
void compress_file(rzip_control *control);
void write_stdout_header(rzip_control *control);
void write_fdout(rzip_control *control, void *buf, i64 len);
void flush_tmpoutbuf(rzip_control *control);
void close_tmpoutbuf(rzip_control *control);

2
stream.c
View file

@ -1209,7 +1209,7 @@ retry:
if (TMP_OUTBUF) {
if (!control->magic_written)
write_stdout_header(control);
write_magic(control);
flush_tmpoutbuf(control);
}