From owner-svn-src-all@FreeBSD.ORG  Thu Mar  5 00:44:12 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 7B2801065670;
	Thu,  5 Mar 2009 00:44:12 +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 4FBA68FC1C;
	Thu,  5 Mar 2009 00:44:12 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n250iCCu057896;
	Thu, 5 Mar 2009 00:44:12 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n250iCfk057894;
	Thu, 5 Mar 2009 00:44:12 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <200903050044.n250iCfk057894@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Thu, 5 Mar 2009 00:44:12 +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: r189386 - 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: Thu, 05 Mar 2009 00:44:13 -0000

Author: kientzle
Date: Thu Mar  5 00:44:12 2009
New Revision: 189386
URL: http://svn.freebsd.org/changeset/base/189386

Log:
  Merge r356 and r358 from libarchive.googlecode.com: Remove a Windows
  special case from archive_entry.c, add one to archive_check_magic.c.

Modified:
  head/lib/libarchive/archive_check_magic.c
  head/lib/libarchive/archive_entry.c

Modified: head/lib/libarchive/archive_check_magic.c
==============================================================================
--- head/lib/libarchive/archive_check_magic.c	Thu Mar  5 00:42:50 2009	(r189385)
+++ head/lib/libarchive/archive_check_magic.c	Thu Mar  5 00:44:12 2009	(r189386)
@@ -40,6 +40,10 @@ __FBSDID("$FreeBSD$");
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef _WIN32
+#include <windows.h>
+#include <winbase.h>
+#endif
 
 #include "archive_private.h"
 
@@ -52,6 +56,10 @@ errmsg(const char *m)
 static void
 diediedie(void)
 {
+#if defined(_WIN32) && defined(_DEBUG)
+	/* 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. */
 }

Modified: head/lib/libarchive/archive_entry.c
==============================================================================
--- head/lib/libarchive/archive_entry.c	Thu Mar  5 00:42:50 2009	(r189385)
+++ head/lib/libarchive/archive_entry.c	Thu Mar  5 00:44:12 2009	(r189386)
@@ -62,9 +62,6 @@ __FBSDID("$FreeBSD$");
 #ifdef HAVE_WCHAR_H
 #include <wchar.h>
 #endif
-#ifdef _WIN32
-#include <windows.h>
-#endif
 
 #include "archive.h"
 #include "archive_entry.h"
@@ -230,13 +227,7 @@ aes_get_wcs(struct aes *aes)
 		w = (wchar_t *)malloc((wcs_length + 1) * sizeof(wchar_t));
 		if (w == NULL)
 			__archive_errx(1, "No memory for aes_get_wcs()");
-#ifndef _WIN32
 		r = mbstowcs(w, aes->aes_mbs.s, wcs_length);
-#else
-		r = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS,
-		    aes->aes_mbs.s, (int)aes->aes_mbs.length, w,
-		    (int)wcs_length);
-#endif
 		if (r > 0) {
 			w[r] = 0;
 			aes->aes_set |= AES_SET_WCS;