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

Merge "Convert opens to use unique_fd."

Browse source
This commit is contained in:
Christopher Ferris 2017-04-05 22:47:22 +00:00 • committed by Gerrit Code Review
commit ff93b794b5
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
base/file.cpp
View file

@ -28,8 +28,9 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "android-base/macros.h" // For TEMP_FAILURE_RETRY on Darwin.
#include "android-base/logging.h" #include "android-base/logging.h"
#include "android-base/macros.h" // For TEMP_FAILURE_RETRY on Darwin.
#include "android-base/unique_fd.h"
#include "android-base/utf8.h" #include "android-base/utf8.h"
#include "utils/Compat.h" #include "utils/Compat.h"
@ -69,13 +70,11 @@ bool ReadFileToString(const std::string& path, std::string* content, bool follow
content->clear(); content->clear();
int flags = O_RDONLY | O_CLOEXEC | O_BINARY | (follow_symlinks ? 0 : O_NOFOLLOW); int flags = O_RDONLY | O_CLOEXEC | O_BINARY | (follow_symlinks ? 0 : O_NOFOLLOW);
int fd = TEMP_FAILURE_RETRY(open(path.c_str(), flags)); android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(path.c_str(), flags)));
if (fd == -1) { if (fd == -1) {
return false; return false;
} }
bool result = ReadFdToString(fd, content); return ReadFdToString(fd, content);
close(fd);
return result;
} }
bool WriteStringToFd(const std::string& content, int fd) { bool WriteStringToFd(const std::string& content, int fd) {
@ -106,7 +105,7 @@ bool WriteStringToFile(const std::string& content, const std::string& path,
bool follow_symlinks) { bool follow_symlinks) {
int flags = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_BINARY | int flags = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_BINARY |
(follow_symlinks ? 0 : O_NOFOLLOW); (follow_symlinks ? 0 : O_NOFOLLOW);
int fd = TEMP_FAILURE_RETRY(open(path.c_str(), flags, mode)); android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(path.c_str(), flags, mode)));
if (fd == -1) { if (fd == -1) {
PLOG(ERROR) << "android::WriteStringToFile open failed"; PLOG(ERROR) << "android::WriteStringToFile open failed";
return false; return false;
@ -126,7 +125,6 @@ bool WriteStringToFile(const std::string& content, const std::string& path,
PLOG(ERROR) << "android::WriteStringToFile write failed"; PLOG(ERROR) << "android::WriteStringToFile write failed";
return CleanUpAfterFailedWrite(path); return CleanUpAfterFailedWrite(path);
} }
close(fd);
return true; return true;
} }
#endif #endif
@ -135,14 +133,11 @@ bool WriteStringToFile(const std::string& content, const std::string& path,
bool follow_symlinks) { bool follow_symlinks) {
int flags = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_BINARY | int flags = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_BINARY |
(follow_symlinks ? 0 : O_NOFOLLOW); (follow_symlinks ? 0 : O_NOFOLLOW);
int fd = TEMP_FAILURE_RETRY(open(path.c_str(), flags, DEFFILEMODE)); android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(path.c_str(), flags, DEFFILEMODE)));
if (fd == -1) { if (fd == -1) {
return false; return false;
} }
return WriteStringToFd(content, fd) || CleanUpAfterFailedWrite(path);
bool result = WriteStringToFd(content, fd);
close(fd);
return result || CleanUpAfterFailedWrite(path);
} }
bool ReadFully(int fd, void* data, size_t byte_count) { bool ReadFully(int fd, void* data, size_t byte_count) {