isa/make_ext4fs_old
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove references to O_BINARY

Browse Source 
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
Jo-Philipp Wich 2015-04-04 23:11:29 +02:00
parent fe3bfde910
commit fe8f2ce6f4
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libsparse/output_file.c
View File

@ -24,6 +24,7 @@
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
@ -34,13 +35,6 @@
#include "sparse_crc32.h"
#include "sparse_format.h"
#ifndef USE_MINGW
#include <sys/mman.h>
#define O_BINARY 0
#else
#define ftruncate64 ftruncate
#endif
#if defined(__APPLE__) && defined(__MACH__)
#define lseek64 lseek
#define ftruncate64 ftruncate
@ -748,7 +742,7 @@ int write_file_chunk(struct output_file *out, unsigned int len,
{
int ret;
int file_fd = open(file, O_RDONLY | O_BINARY);
int file_fd = open(file, O_RDONLY);
if (file_fd < 0) {
return -errno;
}

8
make_ext4fs.c
View File

@ -35,12 +35,6 @@
#include <sys/stat.h>
#include <sys/types.h>
#ifndef USE_MINGW
#define O_BINARY 0
#endif
/* TODO: Not implemented:
Allocating blocks in the same block group as the file inode
Hash or binary tree directories
@ -364,7 +358,7 @@ int make_ext4fs(const char *filename, long long len,
reset_ext4fs_info();
info.len = len;
fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644);
fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);
if (fd < 0) {
error_errno("open");
return EXIT_FAILURE;

6
make_ext4fs_main.c
View File

@ -33,10 +33,6 @@
#include "ext4_utils.h"
#include "canned_fs_config.h"
#ifndef USE_MINGW /* O_BINARY is windows-specific flag */
#define O_BINARY 0
#endif
extern struct fs_info info;
@ -181,7 +177,7 @@ int main(int argc, char **argv)
}
if (strcmp(filename, "-")) {
fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644);
fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);
if (fd < 0) {
perror("open");
return EXIT_FAILURE;