root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge commit '5fbce0b8d96dc96775aa0215e3581addc830e23d'

This commit is contained in:
Lasse Collin 2011-02-06 20:13:01 +02:00
parent 9d542ceebc 5fbce0b8d9
commit 6dd061adfd
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NEWS
View File

@ -2,6 +2,20 @@
XZ Utils User-Visible Changes 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) 5.0.0 (2010-10-23)
Only the most important changes compared to 4.999.9beta are listed Only the most important changes compared to 4.999.9beta are listed

15
src/xz/file_io.c
View File

@ -457,15 +457,14 @@ io_open_src_real(file_pair *pair)
goto error; goto error;
} }
if (reg_files_only) { if (reg_files_only && !S_ISREG(pair->src_st.st_mode)) {
if (!S_ISREG(pair->src_st.st_mode)) { message_warning(_("%s: Not a regular file, skipping"),
message_warning(_("%s: Not a regular file, " pair->src_name);
"skipping"), pair->src_name); goto error;
goto error; }
}
// These are meaningless on Windows.
#ifndef TUKLIB_DOSLIKE #ifndef TUKLIB_DOSLIKE
if (reg_files_only && !opt_force) {
if (pair->src_st.st_mode & (S_ISUID | S_ISGID)) { if (pair->src_st.st_mode & (S_ISUID | S_ISGID)) {
// gzip rejects setuid and setgid files even // gzip rejects setuid and setgid files even
// when --force was used. bzip2 doesn't check // when --force was used. bzip2 doesn't check
@ -495,8 +494,8 @@ io_open_src_real(file_pair *pair)
"skipping"), pair->src_name); "skipping"), pair->src_name);
goto error; goto error;
} }
#endif
} }
#endif
return false; return false;