Merge "Use unique_ptr to call closedir." (d5de25f8) · Commits · e / os / android_system_core

init/bootchart.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		#include <time.h>
		#include <unistd.h>

		#include <memory>
		#include <string>

		#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) {
		do_log_uptime(log);

		DIR* dir = opendir("/proc");
		std::unique_ptr<DIR, int()(DIR)> dir(opendir("/proc"), closedir);
		struct dirent* entry;
		while ((entry = readdir(dir)) != NULL) {
		while ((entry = readdir(dir.get())) != NULL) {
		// Only match numeric values.
		char* end;
		int pid = strtol(entry->d_name, &end, 10);
		@@ -146,7 +147,6 @@ static void do_log_procs(FILE* log) {
		}
		}
		}
		closedir(dir);

		fputc('\n', log);
		}

init/property_service.cpp

+53 −53

Original line number	Diff line number	Diff line
		@@ -26,6 +26,8 @@
		#include <errno.h>
		#include <sys/poll.h>

		#include <memory>

		#include <cutils/misc.h>
		#include <cutils/sockets.h>
		#include <cutils/multiuser.h>
		@@ -425,41 +427,44 @@ static void load_properties_from_file(const char fn, const char filter)
		}
		}

		static void load_persistent_properties()
		{
		DIR* dir = opendir(PERSISTENT_PROPERTY_DIR);
		int dir_fd;
		struct dirent* entry;
		char value[PROP_VALUE_MAX];
		int fd, length;
		struct stat sb;
		static void load_persistent_properties() {
		persistent_properties_loaded = 1;

		if (dir) {
		dir_fd = dirfd(dir);
		while ((entry = readdir(dir)) != NULL) {
		if (strncmp("persist.", entry->d_name, strlen("persist.")))
		std::unique_ptr<DIR, int()(DIR)> dir(opendir(PERSISTENT_PROPERTY_DIR), closedir);
		if (!dir) {
		ERROR("Unable to open persistent property directory \"%s\": %s\n",
		PERSISTENT_PROPERTY_DIR, strerror(errno));
		return;
		}

		struct dirent* entry;
		while ((entry = readdir(dir.get())) != NULL) {
		if (strncmp("persist.", entry->d_name, strlen("persist."))) {
		continue;
		if (entry->d_type != DT_REG)
		}
		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);
		}

		// 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;
		}
		if (fstat(fd, &sb) < 0) {
		ERROR("fstat on property file \"%s\" failed errno: %d\n", entry->d_name, errno);

		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)) {
		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);
		@@ -467,22 +472,17 @@ static void load_persistent_properties()
		continue;
		}

		length = read(fd, value, sizeof(value) - 1);
		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 errno: %d\n",
		entry->d_name, errno);
		ERROR("Unable to read persistent property file %s: %s\n",
		entry->d_name, strerror(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;
		}

		void property_init(void)