Add the ScopedFd that we've never quite gotten around to.
This is actually for the new change I'm working on, but let's retrofit
it first to separate any bugs in these changes from those in the new
change...
Test: treehugger
Change-Id: I890aeb61f9792810a77ad0da3f9674c9cc5db7bb
diff --git a/libc/bionic/grp_pwd_file.cpp b/libc/bionic/grp_pwd_file.cpp
index e13604e..81cf893 100644
--- a/libc/bionic/grp_pwd_file.cpp
+++ b/libc/bionic/grp_pwd_file.cpp
@@ -37,6 +37,7 @@
#include <async_safe/log.h>
#include "private/ErrnoRestorer.h"
+#include "private/ScopedFd.h"
// This file mmap's /*/etc/passwd and /*/etc/group in order to return their contents without any
// allocations. Note that these files and the strings contained within them are explicitly not
@@ -230,19 +231,16 @@
}
bool MmapFile::DoMmap() {
- int fd = open(filename_, O_CLOEXEC | O_NOFOLLOW | O_RDONLY);
+ ScopedFd fd(open(filename_, O_CLOEXEC | O_NOFOLLOW | O_RDONLY));
struct stat fd_stat;
- if (fstat(fd, &fd_stat) == -1) {
- close(fd);
+ if (fstat(fd.get(), &fd_stat) == -1) {
return false;
}
auto mmap_size = fd_stat.st_size;
- void* map_result = mmap(nullptr, mmap_size, PROT_READ, MAP_SHARED, fd, 0);
- close(fd);
-
+ void* map_result = mmap(nullptr, mmap_size, PROT_READ, MAP_SHARED, fd.get(), 0);
if (map_result == MAP_FAILED) {
return false;
}