diff options
| author | kientzle <kientzle@FreeBSD.org> | 2009-03-07 02:47:04 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2009-03-07 02:47:04 +0000 |
| commit | de0aeab80c92bfc883421689bda9e9d45a532e29 (patch) | |
| tree | 215bbd5e46e47b0cb88f319c736753b13c3c96c5 /lib/libarchive/archive_write_set_compression_program.c | |
| parent | f2d3c8136fe522dc902d10c2182f55c291159a67 (diff) | |
| download | FreeBSD-src-de0aeab80c92bfc883421689bda9e9d45a532e29.zip FreeBSD-src-de0aeab80c92bfc883421689bda9e9d45a532e29.tar.gz | |
Merge r550,584,587,609,647,674 from libarchive.googlecode.com:
Refactor the read_compression_program to add two new abilities:
* Public API: You can now include a signature string when you
register a program; the program will run only on input that
matches the signature string.
* Internal API: You can use the init() function to instantiate
an external program as part of a filter pipeline. This
can be used for graceful fallback (if zlib is unavailable, use
external gzip instead) and to use external programs with
bidders that are more sophisticated than a static signature check.
Diffstat (limited to 'lib/libarchive/archive_write_set_compression_program.c')
| -rw-r--r-- | lib/libarchive/archive_write_set_compression_program.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libarchive/archive_write_set_compression_program.c b/lib/libarchive/archive_write_set_compression_program.c index 3cd5c93..3615021 100644 --- a/lib/libarchive/archive_write_set_compression_program.c +++ b/lib/libarchive/archive_write_set_compression_program.c @@ -28,8 +28,8 @@ __FBSDID("$FreeBSD$"); /* This capability is only available on POSIX systems. */ -#if !defined(HAVE_PIPE) || !defined(HAVE_FCNTL) || \ - !(defined(HAVE_FORK) || defined(HAVE_VFORK)) +#if (!defined(HAVE_PIPE) || !defined(HAVE_FCNTL) || \ + !(defined(HAVE_FORK) || defined(HAVE_VFORK))) && !defined(_WIN32) #include "archive.h" /* |
