openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "libcutils: fs_config must use O_BINARY"

This commit is contained in:
Mark Salyzyn 2015-04-16 17:05:34 +00:00 committed by Gerrit Code Review
parent 93e16dca64 4232b378e7
commit 96647a6880
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcutils/fs_config.c
View File

@ -37,6 +37,10 @@
#include <private/android_filesystem_config.h>
#include <utils/Compat.h>
#ifndef O_BINARY
#define O_BINARY 0
#endif
/* The following structure is stored little endian */
struct fs_path_config_from_file {
uint16_t len;
@ -154,12 +158,12 @@ static int fs_config_open(int dir)
char *name = NULL;
asprintf(&name, "%s%s", out, dir ? conf_dir : conf_file);
if (name) {
fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY));
fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_BINARY));
free(name);
}
}
if (fd < 0) {
fd = TEMP_FAILURE_RETRY(open(dir ? conf_dir : conf_file, O_RDONLY));
fd = TEMP_FAILURE_RETRY(open(dir ? conf_dir : conf_file, O_RDONLY | O_BINARY));
}
return fd;
}