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

Merge "Use unique_ptr to call closedir."

Browse source
This commit is contained in:
Elliott Hughes 2015-03-20 23:17:55 +00:00 • committed by Gerrit Code Review
commit d5de25f819
2 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
init/bootchart.cpp
View file

@ -30,6 +30,7 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <memory>
#include <string> #include <string>
#include <base/file.h> #include <base/file.h>
@ -114,9 +115,9 @@ static void do_log_file(FILE* log, const char* procfile) {
static void do_log_procs(FILE* log) { static void do_log_procs(FILE* log) {
do_log_uptime(log); do_log_uptime(log);
DIR* dir = opendir("/proc"); std::unique_ptr<DIR, int(*)(DIR*)> dir(opendir("/proc"), closedir);
struct dirent* entry; struct dirent* entry;
while ((entry = readdir(dir)) != NULL) { while ((entry = readdir(dir.get())) != NULL) {
// Only match numeric values. // Only match numeric values.
char* end; char* end;
int pid = strtol(entry->d_name, &end, 10); int pid = strtol(entry->d_name, &end, 10);
@ -146,7 +147,6 @@ static void do_log_procs(FILE* log) {
} }
} }
} }
closedir(dir);
fputc('\n', log); fputc('\n', log);
} }

110
init/property_service.cpp
View file

@ -26,6 +26,8 @@
#include <errno.h> #include <errno.h>
#include <sys/poll.h> #include <sys/poll.h>
#include <memory>
#include <cutils/misc.h> #include <cutils/misc.h>
#include <cutils/sockets.h> #include <cutils/sockets.h>
#include <cutils/multiuser.h> #include <cutils/multiuser.h>
@ -425,64 +427,62 @@ static void load_properties_from_file(const char *fn, const char *filter)
} }
} }
static void load_persistent_properties() static void load_persistent_properties() {
{ persistent_properties_loaded = 1;
DIR* dir = opendir(PERSISTENT_PROPERTY_DIR);
int dir_fd;
struct dirent* entry;
char value[PROP_VALUE_MAX];
int fd, length;
struct stat sb;
if (dir) { std::unique_ptr<DIR, int(*)(DIR*)> dir(opendir(PERSISTENT_PROPERTY_DIR), closedir);
dir_fd = dirfd(dir); if (!dir) {
while ((entry = readdir(dir)) != NULL) { ERROR("Unable to open persistent property directory \"%s\": %s\n",
if (strncmp("persist.", entry->d_name, strlen("persist."))) PERSISTENT_PROPERTY_DIR, strerror(errno));
continue; return;
if (entry->d_type != DT_REG)
continue;
/* open the file and read the property value */
fd = openat(dir_fd, entry->d_name, O_RDONLY | O_NOFOLLOW);
if (fd < 0) {
ERROR("Unable to open persistent property file \"%s\" errno: %d\n",
entry->d_name, errno);
continue;
}
if (fstat(fd, &sb) < 0) {
ERROR("fstat on property file \"%s\" failed errno: %d\n", entry->d_name, errno);
close(fd);
continue;
}
// File must not be accessible to others, be owned by root/root, and
// not be a hard link to any other file.
if (((sb.st_mode & (S_IRWXG | S_IRWXO)) != 0)
|| (sb.st_uid != 0)
|| (sb.st_gid != 0)
|| (sb.st_nlink != 1)) {
ERROR("skipping insecure property file %s (uid=%u gid=%u nlink=%u mode=%o)\n",
entry->d_name, (unsigned int)sb.st_uid, (unsigned int)sb.st_gid,
(unsigned int)sb.st_nlink, sb.st_mode);
close(fd);
continue;
}
length = read(fd, value, sizeof(value) - 1);
if (length >= 0) {
value[length] = 0;
property_set(entry->d_name, value);
} else {
ERROR("Unable to read persistent property file %s errno: %d\n",
entry->d_name, errno);
}
close(fd);
}
closedir(dir);
} else {
ERROR("Unable to open persistent property directory %s errno: %d\n", PERSISTENT_PROPERTY_DIR, errno);
} }
persistent_properties_loaded = 1; struct dirent* entry;
while ((entry = readdir(dir.get())) != NULL) {
if (strncmp("persist.", entry->d_name, strlen("persist."))) {
continue;
}
if (entry->d_type != DT_REG) {
continue;
}
// Open the file and read the property value.
int fd = openat(dirfd(dir.get()), entry->d_name, O_RDONLY | O_NOFOLLOW);
if (fd == -1) {
ERROR("Unable to open persistent property file \"%s\": %s\n",
entry->d_name, strerror(errno));
continue;
}
struct stat sb;
if (fstat(fd, &sb) == -1) {
ERROR("fstat on property file \"%s\" failed: %s\n", entry->d_name, strerror(errno));
close(fd);
continue;
}
// File must not be accessible to others, be owned by root/root, and
// not be a hard link to any other file.
if (((sb.st_mode & (S_IRWXG | S_IRWXO)) != 0) || (sb.st_uid != 0) || (sb.st_gid != 0) ||
(sb.st_nlink != 1)) {
ERROR("skipping insecure property file %s (uid=%u gid=%u nlink=%u mode=%o)\n",
entry->d_name, (unsigned int)sb.st_uid, (unsigned int)sb.st_gid,
(unsigned int)sb.st_nlink, sb.st_mode);
close(fd);
continue;
}
char value[PROP_VALUE_MAX];
int length = read(fd, value, sizeof(value) - 1);
if (length >= 0) {
value[length] = 0;
property_set(entry->d_name, value);
} else {
ERROR("Unable to read persistent property file %s: %s\n",
entry->d_name, strerror(errno));
}
close(fd);
}
} }
void property_init(void) void property_init(void)