mirror of
https://github.com/intel/isa-l.git
synced 2024-12-13 09:52:56 +01:00
igzip: Implement name/no-name option in igzip_cli
Change-Id: Ib45ef921223715cd2250eecb5dc4c6cd1d945bd0 Signed-off-by: Roy Oursler <roy.j.oursler@intel.com>
This commit is contained in:
Roy Oursler
parent
6f3599c191
commit
cd5de57f1f
@ -50,6 +50,12 @@ show version number
|
||||
\fB\-v\fR, \fB\-\-verbose\fR
|
||||
verbose mode
|
||||
.TP
|
||||
\fB\-N\fR, \fB\-\-name\fR
|
||||
save/use file name and timestamp in compress/decompress
|
||||
.TP
|
||||
\fB\-n\fR, \fB\-\-no\-name\fR
|
||||
do not save/use file name and timestamp in compress/decompress
|
||||
.TP
|
||||
\fB\-q\fR, \fB\-\-quiet\fR
|
||||
suppress warnings
|
||||
.PP
|
||||
|
||||
@ -59,8 +59,14 @@
|
||||
#define BUF_SIZE 1024
|
||||
#define BLOCK_SIZE (1024 * 1024)
|
||||
|
||||
#define MAX_FILEPATH_BUF 4096
|
||||
|
||||
#define UNIX 3
|
||||
|
||||
#define NAME_DEFAULT 0
|
||||
#define NO_NAME 1
|
||||
#define YES_NAME 2
|
||||
|
||||
#define LEVEL_DEFAULT 2
|
||||
#define DEFAULT_SUFFIX_LEN 3
|
||||
char *default_suffixes[] = { ".gz", ".z" };
|
||||
@ -152,6 +158,7 @@ struct cli_options {
|
||||
int force;
|
||||
int quiet_level;
|
||||
int verbose_level;
|
||||
int name;
|
||||
};
|
||||
|
||||
struct cli_options global_options;
|
||||
@ -172,6 +179,7 @@ void init_options(struct cli_options *options)
|
||||
options->quiet_level = 0;
|
||||
options->verbose_level = 0;
|
||||
options->verbose_level = 0;
|
||||
options->name = NAME_DEFAULT;
|
||||
};
|
||||
|
||||
int is_interactive(void)
|
||||
@ -258,6 +266,8 @@ int usage(int exit_code)
|
||||
" -S, --suffix <.suf> suffix to use while (de)compressing\n"
|
||||
" -V, --version show version number\n"
|
||||
" -v, --verbose verbose mode\n"
|
||||
" -N, --name save/use file name and timestamp in compress/decompress\n"
|
||||
" -n, --no-name do not save/use file name and timestamp in compress/decompress\n"
|
||||
" -q, --quiet suppress warnings\n\n"
|
||||
"with no infile, or when infile is - , read standard input\n\n",
|
||||
ISAL_DEF_MAX_LEVEL);
|
||||
@ -448,9 +458,11 @@ int compress_file(void)
|
||||
level_buf = malloc_safe(level_size);
|
||||
|
||||
isal_gzip_header_init(&gz_hdr);
|
||||
if (global_options.name == NAME_DEFAULT || global_options.name == YES_NAME) {
|
||||
gz_hdr.time = get_posix_filetime(in);
|
||||
gz_hdr.os = UNIX;
|
||||
gz_hdr.name = infile_name;
|
||||
}
|
||||
gz_hdr.os = UNIX;
|
||||
gz_hdr.name_buf_len = infile_name_len + 1;
|
||||
|
||||
isal_deflate_init(&stream);
|
||||
@ -524,7 +536,8 @@ int decompress_file(void)
|
||||
size_t inbuf_size, outbuf_size;
|
||||
struct inflate_state state;
|
||||
struct isal_gzip_header gz_hdr;
|
||||
int ret = 0, success = 0;
|
||||
const int terminal = 0, implicit = 1, stripped = 2;
|
||||
int ret = 0, success = 0, outfile_type = terminal;
|
||||
|
||||
char *infile_name = global_options.infile_name, *outfile_name =
|
||||
global_options.outfile_name;
|
||||
@ -541,8 +554,11 @@ int decompress_file(void)
|
||||
infile_name_len = 0;
|
||||
}
|
||||
|
||||
if (outfile_name == NULL && infile_name != NULL && !global_options.use_stdout) {
|
||||
while (suffix_index < sizeof(default_suffixes) / sizeof(*default_suffixes)) {
|
||||
if (outfile_name == NULL && !global_options.use_stdout) {
|
||||
if (infile_name != NULL) {
|
||||
outfile_type = stripped;
|
||||
while (suffix_index <
|
||||
sizeof(default_suffixes) / sizeof(*default_suffixes)) {
|
||||
if (suffix == NULL) {
|
||||
suffix = default_suffixes[suffix_index];
|
||||
suffix_len = default_suffixes_lens[suffix_index];
|
||||
@ -551,7 +567,8 @@ int decompress_file(void)
|
||||
|
||||
outfile_name_len = infile_name_len - suffix_len;
|
||||
if (infile_name_len >= suffix_len
|
||||
&& memcmp(infile_name + outfile_name_len, suffix, suffix_len) == 0)
|
||||
&& memcmp(infile_name + outfile_name_len, suffix,
|
||||
suffix_len) == 0)
|
||||
break;
|
||||
suffix = NULL;
|
||||
suffix_len = 0;
|
||||
@ -562,26 +579,21 @@ int decompress_file(void)
|
||||
infile_name);
|
||||
return 1;
|
||||
}
|
||||
|
||||
outfile_name = malloc_safe(outfile_name_len + 1);
|
||||
memcpy(outfile_name, infile_name, outfile_name_len);
|
||||
outfile_name[outfile_name_len] = 0;
|
||||
}
|
||||
if (global_options.name == YES_NAME) {
|
||||
outfile_name_len = 0;
|
||||
outfile_type = implicit;
|
||||
}
|
||||
if (outfile_type != terminal)
|
||||
outfile_name = malloc_safe(outfile_name_len >=
|
||||
MAX_FILEPATH_BUF ? outfile_name_len +
|
||||
1 : MAX_FILEPATH_BUF);
|
||||
}
|
||||
|
||||
open_in_file(&in, infile_name);
|
||||
if (in == NULL)
|
||||
goto decompress_file_cleanup;
|
||||
|
||||
if (infile_name_len != 0 && infile_name_len == outfile_name_len
|
||||
&& strncmp(infile_name, outfile_name, infile_name_len) == 0) {
|
||||
log_print(ERROR, "igzip: Error input and output file names must differ\n");
|
||||
goto decompress_file_cleanup;
|
||||
}
|
||||
|
||||
open_out_file(&out, outfile_name);
|
||||
if (out == NULL)
|
||||
goto decompress_file_cleanup;
|
||||
|
||||
file_time = get_posix_filetime(in);
|
||||
|
||||
inbuf_size = BLOCK_SIZE;
|
||||
@ -591,6 +603,11 @@ int decompress_file(void)
|
||||
outbuf = malloc_safe(outbuf_size);
|
||||
|
||||
isal_gzip_header_init(&gz_hdr);
|
||||
if (outfile_type == implicit) {
|
||||
gz_hdr.name = outfile_name;
|
||||
gz_hdr.name_buf_len = MAX_FILEPATH_BUF;
|
||||
}
|
||||
|
||||
isal_inflate_init(&state);
|
||||
state.crc_flag = IGZIP_GZIP_NO_HDR;
|
||||
state.next_in = inbuf;
|
||||
@ -603,6 +620,25 @@ int decompress_file(void)
|
||||
goto decompress_file_cleanup;
|
||||
}
|
||||
|
||||
if (outfile_type == implicit)
|
||||
file_time = gz_hdr.time;
|
||||
|
||||
if (outfile_type == stripped || (outfile_type == implicit && outfile_name[0] == 0)) {
|
||||
outfile_name_len = infile_name_len - suffix_len;
|
||||
memcpy(outfile_name, infile_name, outfile_name_len);
|
||||
outfile_name[outfile_name_len] = 0;
|
||||
}
|
||||
|
||||
if (infile_name_len != 0 && infile_name_len == outfile_name_len
|
||||
&& strncmp(infile_name, outfile_name, infile_name_len) == 0) {
|
||||
log_print(ERROR, "igzip: Error input and output file names must differ\n");
|
||||
goto decompress_file_cleanup;
|
||||
}
|
||||
|
||||
open_out_file(&out, outfile_name);
|
||||
if (out == NULL)
|
||||
goto decompress_file_cleanup;
|
||||
|
||||
do {
|
||||
if (state.avail_in == 0) {
|
||||
state.next_in = inbuf;
|
||||
@ -659,7 +695,7 @@ int decompress_file(void)
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
int c;
|
||||
char optstring[] = "hcdz0123456789o:S:kfqVv";
|
||||
char optstring[] = "hcdz0123456789o:S:kfqVvNn";
|
||||
int long_only_flag;
|
||||
int ret = 0;
|
||||
int bad_option = 0;
|
||||
@ -682,10 +718,11 @@ int main(int argc, char *argv[])
|
||||
{"quiet", no_argument, NULL, 'q'},
|
||||
{"version", no_argument, NULL, 'V'},
|
||||
{"verbose", no_argument, NULL, 'v'},
|
||||
/* Possible future extensions
|
||||
{"test", no_argument, NULL, 't'},
|
||||
{"no-name", no_argument, NULL, 'n'},
|
||||
{"name", no_argument, NULL, 'N'},
|
||||
|
||||
/* Possible future extensions
|
||||
{"test", no_argument, NULL, 't'},
|
||||
{"recursive, no_argument, NULL, 'r'},
|
||||
{"check", no_argument, NULL, 'C'},
|
||||
{"no-check", no_argument, NULL, 0},
|
||||
@ -754,6 +791,12 @@ int main(int argc, char *argv[])
|
||||
case 'V':
|
||||
print_version();
|
||||
return 0;
|
||||
case 'N':
|
||||
global_options.name = YES_NAME;
|
||||
break;
|
||||
case 'n':
|
||||
global_options.name = NO_NAME;
|
||||
break;
|
||||
case 'h':
|
||||
usage(0);
|
||||
default:
|
||||
|
||||
@ -189,5 +189,21 @@ $DIFF $TEST_FILE $file1 &> /dev/null || ret=1
|
||||
pass_check $ret "No in place decompression"
|
||||
clear_dir
|
||||
|
||||
ret=0
|
||||
$IGZIP -n $TEST_FILE -o $file1$ds && $IGZIP -Nd $file1$ds && $DIFF $file1 $TEST_FILE || ret=1
|
||||
pass_check $ret "Decompress name with no-name info"
|
||||
clear_dir
|
||||
|
||||
ret=0
|
||||
cp -p $TEST_FILE $file1 && sleep 1 &&\
|
||||
$IGZIP -N $file1 -o $file1$ds && $IGZIP -Nfqd $file1$ds || ret=1
|
||||
TIME_ORIG=$(stat --printf=\("%Y\n"\) $TEST_FILE)
|
||||
TIME_NEW=$(stat --printf=\("%Y\n"\) $file1)
|
||||
if [ "$TIME_ORIG" != "$TIME_NEW" ] ; then
|
||||
ret=1
|
||||
fi
|
||||
pass_check $ret "Decompress with name info"
|
||||
clear_dir
|
||||
|
||||
echo "Passed all cli checks"
|
||||
cleanup 0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user