diff options
Diffstat (limited to 'xdelta3')
-rw-r--r-- | xdelta3/xdelta3-main.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h index 19def5d..5429ad4 100644 --- a/xdelta3/xdelta3-main.h +++ b/xdelta3/xdelta3-main.h | |||
@@ -358,9 +358,6 @@ static xd3_stream *merge_stream = NULL; | |||
358 | * false just so the program knows the mapping of IDENT->NAME. */ | 358 | * false just so the program knows the mapping of IDENT->NAME. */ |
359 | static main_extcomp extcomp_types[] = | 359 | static main_extcomp extcomp_types[] = |
360 | { | 360 | { |
361 | /* The entry for xdelta3 must be 0 because the program_name is set there. */ | ||
362 | { "xdelta3", "-cfq", "xdelta3", "-dcfq", "X", "\xd6\xc3\xc4", 3, | ||
363 | RD_NONEXTERNAL }, | ||
364 | { "bzip2", "-cf", "bzip2", "-dcf", "B", "BZh", 3, 0 }, | 361 | { "bzip2", "-cf", "bzip2", "-dcf", "B", "BZh", 3, 0 }, |
365 | { "gzip", "-cf", "gzip", "-dcf", "G", "\037\213", 2, 0 }, | 362 | { "gzip", "-cf", "gzip", "-dcf", "G", "\037\213", 2, 0 }, |
366 | { "compress", "-cf", "uncompress", "-cf", "Z", "\037\235", 2, 0 }, | 363 | { "compress", "-cf", "uncompress", "-cf", "Z", "\037\235", 2, 0 }, |
@@ -2397,6 +2394,14 @@ main_secondary_decompress_check (main_file *file, | |||
2397 | 2394 | ||
2398 | if (decompressor != NULL) | 2395 | if (decompressor != NULL) |
2399 | { | 2396 | { |
2397 | if (! option_quiet) | ||
2398 | { | ||
2399 | XPR(NT "externally compressed input: %s %s < %s\n", | ||
2400 | decompressor->decomp_cmdname, | ||
2401 | decompressor->decomp_options, | ||
2402 | file->filename); | ||
2403 | } | ||
2404 | |||
2400 | file->size_known = 0; | 2405 | file->size_known = 0; |
2401 | return main_input_decompress_setup (decompressor, file, | 2406 | return main_input_decompress_setup (decompressor, file, |
2402 | input_buf, input_size, | 2407 | input_buf, input_size, |
@@ -2811,7 +2816,7 @@ main_open_output (xd3_stream *stream, main_file *ofile) | |||
2811 | { | 2816 | { |
2812 | if (! option_quiet) | 2817 | if (! option_quiet) |
2813 | { | 2818 | { |
2814 | XPR(NT "%s %s | %s\n", | 2819 | XPR(NT "externally compressed output: %s %s > %s\n", |
2815 | ofile->compressor->recomp_cmdname, | 2820 | ofile->compressor->recomp_cmdname, |
2816 | ofile->compressor->recomp_options, | 2821 | ofile->compressor->recomp_options, |
2817 | ofile->filename); | 2822 | ofile->filename); |
@@ -4008,8 +4013,6 @@ main (int argc, char **argv) | |||
4008 | argv = env_argv; | 4013 | argv = env_argv; |
4009 | argc = env_argc; | 4014 | argc = env_argc; |
4010 | program_name = env_argv[0]; | 4015 | program_name = env_argv[0]; |
4011 | extcomp_types[0].recomp_cmdname = program_name; | ||
4012 | extcomp_types[0].decomp_cmdname = program_name; | ||
4013 | 4016 | ||
4014 | takearg: | 4017 | takearg: |
4015 | my_optarg = NULL; | 4018 | my_optarg = NULL; |