From owner-svn-src-all@FreeBSD.ORG  Mon Dec 28 06:59:36 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 69EA81065679;
	Mon, 28 Dec 2009 06:59:36 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 59CA48FC1B;
	Mon, 28 Dec 2009 06:59:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBS6xaa3081936;
	Mon, 28 Dec 2009 06:59:36 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBS6xass081934;
	Mon, 28 Dec 2009 06:59:36 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200912280659.nBS6xass081934@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Mon, 28 Dec 2009 06:59:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201112 - head/lib/libarchive
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Dec 2009 06:59:36 -0000

Author: kientzle
Date: Mon Dec 28 06:59:35 2009
New Revision: 201112
URL: http://svn.freebsd.org/changeset/base/201112

Log:
  Portability.

Modified:
  head/lib/libarchive/archive_read_support_compression_program.c

Modified: head/lib/libarchive/archive_read_support_compression_program.c
==============================================================================
--- head/lib/libarchive/archive_read_support_compression_program.c	Mon Dec 28 03:33:05 2009	(r201111)
+++ head/lib/libarchive/archive_read_support_compression_program.c	Mon Dec 28 06:59:35 2009	(r201112)
@@ -205,7 +205,7 @@ program_bidder_bid(struct archive_read_f
 		/* 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 *s
 		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 *s
 		    WTERMSIG(state->exit_status));
 		return (ARCHIVE_WARN);
 	}
+#endif /* !_WIN32 || __CYGWIN__ */
 
 	if (WIFEXITED(state->exit_status)) {
 		if (WEXITSTATUS(state->exit_status) == 0)