thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'util-self-extracting-exec' of https://github.com/ClickHouse/ClickHouse into util-self-extracting-exec

Browse Source
This commit is contained in:
Yakov Olkhovskiy 2022-08-03 13:15:06 -04:00
commit ba86959b72
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
utils/self-extracting-executable/decompressor.cpp
View File

@ -28,9 +28,6 @@
#include "types.h"
char decompressed_suffix[7] = {0};
uint64_t decompressed_umask = 0;
/// decompress part
int doDecompress(char * input, char * output, off_t & in_offset, off_t & out_offset,
off_t input_size, off_t output_size, ZSTD_DCtx* dctx)
@ -166,7 +163,7 @@ int decompress(char * input, char * output, off_t start, off_t end, size_t max_n
/// Read data about files and decomrpess them.
int decompressFiles(int input_fd, char * path, char * name, bool & have_compressed_analoge)
int decompressFiles(int input_fd, char * path, char * name, bool & have_compressed_analoge, char * decompressed_suffix, uint64_t * decompressed_umask)
{
/// Read data about output file.
/// Compressed data will replace data in file
@ -249,7 +246,7 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
}
close(fd);
strncpy(decompressed_suffix, file_name + strlen(file_name) - 6, 6);
decompressed_umask = le64toh(file_info.umask);
*decompressed_umask = le64toh(file_info.umask);
have_compressed_analoge = true;
}
@ -334,9 +331,11 @@ int main(int/* argc*/, char* argv[])
}
bool have_compressed_analoge = false;
char decompressed_suffix[7] = {0};
uint64_t decompressed_umask = 0;
/// Decompress all files
if (0 != decompressFiles(input_fd, path, name, have_compressed_analoge))
if (0 != decompressFiles(input_fd, path, name, have_compressed_analoge, decompressed_suffix, &decompressed_umask))
{
printf("Error happened during decompression.\n");
if (0 != close(input_fd))