ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Use O_BINARY in base/file for Windows."

Browse source
This commit is contained in:
Elliott Hughes 2015-09-01 21:13:33 +00:00 • committed by Gerrit Code Review
commit 78ea165ea2
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
base/file.cpp
View file

@ -28,6 +28,10 @@
#include "cutils/log.h" #include "cutils/log.h"
#include "utils/Compat.h" #include "utils/Compat.h"
#if !defined(_WIN32)
#define O_BINARY 0
#endif
namespace android { namespace android {
namespace base { namespace base {
@ -45,8 +49,7 @@ bool ReadFdToString(int fd, std::string* content) {
bool ReadFileToString(const std::string& path, std::string* content) { bool ReadFileToString(const std::string& path, std::string* content) {
content->clear(); content->clear();
int fd = int fd = TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_CLOEXEC | O_NOFOLLOW | O_BINARY));
TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_CLOEXEC | O_NOFOLLOW));
if (fd == -1) { if (fd == -1) {
return false; return false;
} }
@ -80,9 +83,8 @@ static bool CleanUpAfterFailedWrite(const std::string& path) {
#if !defined(_WIN32) #if !defined(_WIN32)
bool WriteStringToFile(const std::string& content, const std::string& path, bool WriteStringToFile(const std::string& content, const std::string& path,
mode_t mode, uid_t owner, gid_t group) { mode_t mode, uid_t owner, gid_t group) {
int fd = TEMP_FAILURE_RETRY( int flags = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_NOFOLLOW | O_BINARY;
open(path.c_str(), O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_NOFOLLOW, int fd = TEMP_FAILURE_RETRY(open(path.c_str(), flags, mode));
mode));
if (fd == -1) { if (fd == -1) {
ALOGE("android::WriteStringToFile open failed: %s", strerror(errno)); ALOGE("android::WriteStringToFile open failed: %s", strerror(errno));
return false; return false;
@ -108,9 +110,8 @@ bool WriteStringToFile(const std::string& content, const std::string& path,
#endif #endif
bool WriteStringToFile(const std::string& content, const std::string& path) { bool WriteStringToFile(const std::string& content, const std::string& path) {
int fd = TEMP_FAILURE_RETRY( int flags = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_NOFOLLOW | O_BINARY;
open(path.c_str(), O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_NOFOLLOW, int fd = TEMP_FAILURE_RETRY(open(path.c_str(), flags, DEFFILEMODE));
DEFFILEMODE));
if (fd == -1) { if (fd == -1) {
return false; return false;
} }