diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2011-02-04 11:29:47 +0200 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2011-02-06 20:16:14 +0200 |
| commit | 8930c7ae3f82bdae15aa129f01de08be23d7e8d7 (patch) | |
| tree | 854fc4f817ec47580566b1fdf6d1fab5eb9ebc08 | |
| parent | Updated THANKS. (diff) | |
| download | xz-8930c7ae3f82bdae15aa129f01de08be23d7e8d7.tar.xz | |
xz: Check if the file already has custom suffix when compressing.
Now "xz -S .test foo.test" refuses to compress the
file because it already has the suffix .test. The man
page had it documented this way already.
| -rw-r--r-- | src/xz/suffix.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/xz/suffix.c b/src/xz/suffix.c index ea86c1a3..f795e2ad 100644 --- a/src/xz/suffix.c +++ b/src/xz/suffix.c @@ -183,6 +183,15 @@ compressed_name(const char *src_name, const size_t src_len) } } + if (custom_suffix != NULL) { + if (test_suffix(custom_suffix, src_name, src_len) != 0) { + message_warning(_("%s: File already has `%s' " + "suffix, skipping"), src_name, + custom_suffix); + return NULL; + } + } + // TODO: Hmm, maybe it would be better to validate this in args.c, // since the suffix handling when decoding is weird now. if (opt_format == FORMAT_RAW && custom_suffix == NULL) { |