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

Revert "xz: Use pipe2() if available." 

This reverts commit 7a11c4a8e5.
It is a problem when libc has pipe2() but the kernel is too
old to have pipe2() and thus pipe2() fails. In xz it's pointless
to have a fallback for non-functioning pipe2(); it's better to
avoid pipe2() completely.

Thanks to Michael Fox for the bug report.
This commit is contained in:
Lasse Collin 2015-04-20 19:59:18 +03:00
parent eccd8155e1
commit db190a832c
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -626,8 +626,8 @@ gl_GETOPT
# Find the best function to set timestamps. # Find the best function to set timestamps.
AC_CHECK_FUNCS([futimens futimes futimesat utimes utime], [break]) AC_CHECK_FUNCS([futimens futimes futimesat utimes utime], [break])
# These are nice to have but not mandatory. # This is nice to have but not mandatory.
AC_CHECK_FUNCS([posix_fadvise pipe2]) AC_CHECK_FUNCS([posix_fadvise])
TUKLIB_PROGNAME TUKLIB_PROGNAME
TUKLIB_INTEGER TUKLIB_INTEGER

9
src/xz/file_io.c
View File

@ -82,13 +82,7 @@ io_init(void)
// we are root. // we are root.
warn_fchown = geteuid() == 0; warn_fchown = geteuid() == 0;
// Create a pipe for the self-pipe trick. If pipe2() is available, // Create a pipe for the self-pipe trick.
// we can avoid the fcntl() calls.
# ifdef HAVE_PIPE2
if (pipe2(user_abort_pipe, O_NONBLOCK))
message_fatal(_("Error creating a pipe: %s"),
strerror(errno));
# else
if (pipe(user_abort_pipe)) if (pipe(user_abort_pipe))
message_fatal(_("Error creating a pipe: %s"), message_fatal(_("Error creating a pipe: %s"),
strerror(errno)); strerror(errno));
@ -101,7 +95,6 @@ io_init(void)
message_fatal(_("Error creating a pipe: %s"), message_fatal(_("Error creating a pipe: %s"),
strerror(errno)); strerror(errno));
} }
# endif
#endif #endif
#ifdef __DJGPP__ #ifdef __DJGPP__