jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-28 06:52:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Portability: Set the file descriptor to binary mode on Win32

Browse Source
This commit is contained in:
Tim Kientzle 2009-12-28 02:28:44 +00:00
parent c0840e91d3
commit 2866e9d5d0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=201093
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libarchive/archive_read_open_file.c
View File

@ -35,6 +35,9 @@ __FBSDID("$FreeBSD$");
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
#ifdef HAVE_IO_H
#include <io.h>
#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@ -94,6 +97,10 @@ archive_read_open_FILE(struct archive *a, FILE *f)
} else
mine->can_skip = 0;
#if defined(__CYGWIN__) || defined(_WIN32)
setmode(fileno(mine->f), O_BINARY);
#endif
return (archive_read_open2(a, mine, NULL, file_read,
file_skip, file_close));
}

6
lib/libarchive/archive_read_open_filename.c
View File

@ -35,6 +35,9 @@ __FBSDID("$FreeBSD$");
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
#ifdef HAVE_IO_H
#include <io.h>
#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@ -96,6 +99,9 @@ archive_read_open_filename(struct archive *a, const char *filename,
*/
filename = ""; /* Normalize NULL to "" */
fd = 0;
#if defined(__CYGWIN__) || defined(_WIN32)
setmode(0, O_BINARY);
#endif
} else {
fd = open(filename, O_RDONLY | O_BINARY);
if (fd < 0) {

9
lib/libarchive/archive_write_open_fd.c
View File

@ -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
@ -64,6 +70,9 @@ archive_write_open_fd(struct archive *a, int fd)
return (ARCHIVE_FATAL);
}
mine->fd = fd;
#if defined(__CYGWIN__) || defined(_WIN32)
setmode(mine->fd, O_BINARY);
#endif
return (archive_write_open(a, mine,
file_open, file_write, file_close));
}