svn commit: r201103 - head/lib/libarchive

[Tim Kientzle]

Author: kientzle
Date: Mon Dec 28 03:13:49 2009
New Revision: 201103
URL: http://svn.freebsd.org/changeset/base/201103

Log:
  O_BINARY for Windows.

Modified:
  head/lib/libarchive/archive_read_open_fd.c

Modified: head/lib/libarchive/archive_read_open_fd.c
==============================================================================
--- head/lib/libarchive/archive_read_open_fd.c	Mon Dec 28 03:11:36 2009	(r201102)
+++ head/lib/libarchive/archive_read_open_fd.c	Mon Dec 28 03:13:49 2009	(r201103)
@@ -32,6 +32,12 @@ __FBSDID("$FreeBSD$");
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
@@ -95,6 +101,9 @@ archive_read_open_fd(struct archive *a, 
 		mine->can_skip = 1;
 	} else
 		mine->can_skip = 0;
+#if defined(__CYGWIN__) || defined(_WIN32)
+	setmode(mine->fd, O_BINARY);
+#endif
 
 	return (archive_read_open2(a, mine,
 		NULL, file_read, file_skip, file_close));