aboutsummaryrefslogtreecommitdiffstats
path: root/tools/xz/patches/000-upstream-001-check_compress.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-04-03 13:19:16 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-04-03 13:19:16 +0000
commitce6942268c6f26f89189652684eb2a9f0c3d6605 (patch)
tree89fea16bdf27194b40ef39b9916bf3384a15ac9e /tools/xz/patches/000-upstream-001-check_compress.patch
parent25b2bd4e1cfcc6706b597927f7f8627bdcbd0a50 (diff)
downloadupstream-ce6942268c6f26f89189652684eb2a9f0c3d6605.tar.gz
upstream-ce6942268c6f26f89189652684eb2a9f0c3d6605.tar.bz2
upstream-ce6942268c6f26f89189652684eb2a9f0c3d6605.zip
xz: update to version 5.0.2
SVN-Revision: 26438
Diffstat (limited to 'tools/xz/patches/000-upstream-001-check_compress.patch')
-rw-r--r--tools/xz/patches/000-upstream-001-check_compress.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/tools/xz/patches/000-upstream-001-check_compress.patch b/tools/xz/patches/000-upstream-001-check_compress.patch
deleted file mode 100644
index 1b918a4f30..0000000000
--- a/tools/xz/patches/000-upstream-001-check_compress.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Lasse Collin <lasse.collin@tukaani.org>
-Date: Fri, 4 Feb 2011 09:29:47 +0000 (+0200)
-Subject: xz: Check if the file already has custom suffix when compressing.
-X-Git-Url: http://repo.or.cz/w/xz.git/commitdiff_plain/8930c7ae3f82bdae15aa129f01de08be23d7e8d7
-
-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.
----
-
-diff --git a/src/xz/suffix.c b/src/xz/suffix.c
-index ea86c1a..f795e2a 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) {