summaryrefslogtreecommitdiffstats
path: root/lib/libarchive/archive_check_magic.c
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2009-03-05 00:44:12 +0000
committerkientzle <kientzle@FreeBSD.org>2009-03-05 00:44:12 +0000
commit1b605ed6f8f06715dccab8708ba5d26251cde30a (patch)
treeaae93d76747a9040e63fa3d425c6279ef15e366e /lib/libarchive/archive_check_magic.c
parent65384b550b781f5df9c9e0e1c49bce608f97ea1e (diff)
downloadFreeBSD-src-1b605ed6f8f06715dccab8708ba5d26251cde30a.zip
FreeBSD-src-1b605ed6f8f06715dccab8708ba5d26251cde30a.tar.gz
Merge r356 and r358 from libarchive.googlecode.com: Remove a Windows
special case from archive_entry.c, add one to archive_check_magic.c.
Diffstat (limited to 'lib/libarchive/archive_check_magic.c')
-rw-r--r--lib/libarchive/archive_check_magic.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/libarchive/archive_check_magic.c b/lib/libarchive/archive_check_magic.c
index b8934ce..e1d35c5 100644
--- a/lib/libarchive/archive_check_magic.c
+++ b/lib/libarchive/archive_check_magic.c
@@ -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. */
}
OpenPOWER on IntegriCloud