summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2009-12-28 06:59:35 +0000
committerkientzle <kientzle@FreeBSD.org>2009-12-28 06:59:35 +0000
commite86a4774129db86d226a9f1648e19bdc37030293 (patch)
tree83de978becef0f9530877f696346125caea87595
parent1a725d203e9e98949105d0404450777cad123b84 (diff)
downloadFreeBSD-src-e86a4774129db86d226a9f1648e19bdc37030293.zip
FreeBSD-src-e86a4774129db86d226a9f1648e19bdc37030293.tar.gz
Portability.
-rw-r--r--lib/libarchive/archive_read_support_compression_program.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libarchive/archive_read_support_compression_program.c b/lib/libarchive/archive_read_support_compression_program.c
index 21c2377..01552ba 100644
--- a/lib/libarchive/archive_read_support_compression_program.c
+++ b/lib/libarchive/archive_read_support_compression_program.c
@@ -205,7 +205,7 @@ program_bidder_bid(struct archive_read_filter_bidder *self,
/* No match, so don't bid. */
if (memcmp(p, state->signature, state->signature_len) != 0)
return (0);
- return (state->signature_len * 8);
+ return ((int)state->signature_len * 8);
}
/* Otherwise, bid once and then never bid again. */
@@ -251,6 +251,7 @@ child_stop(struct archive_read_filter *self, struct program_filter *state)
return (ARCHIVE_WARN);
}
+#if !defined(_WIN32) || defined(__CYGWIN__)
if (WIFSIGNALED(state->exit_status)) {
#ifdef SIGPIPE
/* If the child died because we stopped reading before
@@ -267,6 +268,7 @@ child_stop(struct archive_read_filter *self, struct program_filter *state)
WTERMSIG(state->exit_status));
return (ARCHIVE_WARN);
}
+#endif /* !_WIN32 || __CYGWIN__ */
if (WIFEXITED(state->exit_status)) {
if (WEXITSTATUS(state->exit_status) == 0)
OpenPOWER on IntegriCloud