aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2011-02-06 20:13:01 +0200
committerLasse Collin <lasse.collin@tukaani.org>2011-02-06 20:13:01 +0200
commit6dd061adfd2775428b079eb03d6fd47d7c0f1ffe (patch)
treed0300ef625b5ed4d5f29b53b96c90e203f1812c8
parentMerge branch 'v5.0' (diff)
parentUpdate NEWS for 5.0.1. (diff)
downloadxz-6dd061adfd2775428b079eb03d6fd47d7c0f1ffe.tar.xz
Merge commit '5fbce0b8d96dc96775aa0215e3581addc830e23d'
-rw-r--r--NEWS14
-rw-r--r--src/xz/file_io.c15
2 files changed, 21 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index d9a2f3cf..3ef11201 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,20 @@
XZ Utils User-Visible Changes
=============================
+5.0.1 (2011-01-29)
+
+ * xz --force now (de)compresses files that have setuid, setgid,
+ or sticky bit set and files that have multiple hard links.
+ The man page had it documented this way already, but the code
+ had a bug.
+
+ * gzip and bzip2 support in xzdiff was fixed.
+
+ * Portability fixes
+
+ * Minor fix to Czech translation
+
+
5.0.0 (2010-10-23)
Only the most important changes compared to 4.999.9beta are listed
diff --git a/src/xz/file_io.c b/src/xz/file_io.c
index 6e24c58a..09edcca6 100644
--- a/src/xz/file_io.c
+++ b/src/xz/file_io.c
@@ -457,15 +457,14 @@ io_open_src_real(file_pair *pair)
goto error;
}
- if (reg_files_only) {
- if (!S_ISREG(pair->src_st.st_mode)) {
- message_warning(_("%s: Not a regular file, "
- "skipping"), pair->src_name);
- goto error;
- }
+ if (reg_files_only && !S_ISREG(pair->src_st.st_mode)) {
+ message_warning(_("%s: Not a regular file, skipping"),
+ pair->src_name);
+ goto error;
+ }
- // These are meaningless on Windows.
#ifndef TUKLIB_DOSLIKE
+ if (reg_files_only && !opt_force) {
if (pair->src_st.st_mode & (S_ISUID | S_ISGID)) {
// gzip rejects setuid and setgid files even
// when --force was used. bzip2 doesn't check
@@ -495,8 +494,8 @@ io_open_src_real(file_pair *pair)
"skipping"), pair->src_name);
goto error;
}
-#endif
}
+#endif
return false;