From owner-svn-src-head@FreeBSD.ORG  Mon Dec 28 02:20:23 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E8F011065670;
	Mon, 28 Dec 2009 02:20:23 +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 D893C8FC19;
	Mon, 28 Dec 2009 02:20:23 +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 nBS2KNhl075596;
	Mon, 28 Dec 2009 02:20:23 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBS2KNe6075594;
	Mon, 28 Dec 2009 02:20:23 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200912280220.nBS2KNe6075594@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Mon, 28 Dec 2009 02:20:23 +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: r201089 - head/lib/libarchive
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Dec 2009 02:20:24 -0000

Author: kientzle
Date: Mon Dec 28 02:20:23 2009
New Revision: 201089
URL: http://svn.freebsd.org/changeset/base/201089

Log:
  Portability: terminate abnormally via abort() instead of segfault,
  watch the return value from write(), and avoid signed arithmetic on
  unsigned values.

Modified:
  head/lib/libarchive/archive_check_magic.c

Modified: head/lib/libarchive/archive_check_magic.c
==============================================================================
--- head/lib/libarchive/archive_check_magic.c	Mon Dec 28 02:18:55 2009	(r201088)
+++ head/lib/libarchive/archive_check_magic.c	Mon Dec 28 02:20:23 2009	(r201089)
@@ -50,7 +50,16 @@ __FBSDID("$FreeBSD$");
 static void
 errmsg(const char *m)
 {
-	write(2, m, strlen(m));
+	size_t s = strlen(m);
+	ssize_t written;
+
+	while (s > 0) {
+		written = write(2, m, strlen(m));
+		if (written <= 0)
+			return;
+		m += written;
+		s -= written;
+	}
 }
 
 static void
@@ -60,8 +69,7 @@ diediedie(void)
 	/* Cause a breakpoint exception  */
 	DebugBreak();
 #endif
-	*(char *)0 = 1;	/* Deliberately segfault and force a coredump. */
-	_exit(1);	/* If that didn't work, just exit with an error. */
+	abort();        /* Terminate the program abnormally. */
 }
 
 static const char *
@@ -85,7 +93,7 @@ write_all_states(unsigned int states)
 	unsigned int lowbit;
 
 	/* A trick for computing the lowest set bit. */
-	while ((lowbit = states & (-states)) != 0) {
+	while ((lowbit = states & (1 + ~states)) != 0) {
 		states &= ~lowbit;		/* Clear the low bit. */
 		errmsg(state_name(lowbit));
 		if (states != 0)