From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sun, 18 Feb 2018 22:46:37 +0000 (+0100)
Subject: start: lxc_check_inherited()
X-Git-Tag: lxc-3.0.0.beta1~22^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5a70219bca5d8bf5ef21256d7a551c80b3eba52;p=thirdparty%2Flxc.git

start: lxc_check_inherited()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/start.c b/src/lxc/start.c
index b99f2e584..413f75e0d 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -185,10 +185,10 @@ static int match_fd(int fd)
 int lxc_check_inherited(struct lxc_conf *conf, bool closeall,
 			int *fds_to_ignore, size_t len_fds)
 {
-	struct dirent *direntp;
 	int fd, fddir;
 	size_t i;
 	DIR *dir;
+	struct dirent *direntp;
 
 	if (conf && conf->close_all_fds)
 		closeall = true;
@@ -196,24 +196,26 @@ int lxc_check_inherited(struct lxc_conf *conf, bool closeall,
 restart:
 	dir = opendir("/proc/self/fd");
 	if (!dir) {
-		WARN("Failed to open directory: %s.", strerror(errno));
+		WARN("%s - Failed to open directory", strerror(errno));
 		return -1;
 	}
 
 	fddir = dirfd(dir);
 
 	while ((direntp = readdir(dir))) {
+		int ret;
 		struct lxc_list *cur;
 		bool matched = false;
 
-		if (!strcmp(direntp->d_name, "."))
+		if (strcmp(direntp->d_name, ".") == 0)
 			continue;
 
-		if (!strcmp(direntp->d_name, ".."))
+		if (strcmp(direntp->d_name, "..") == 0)
 			continue;
 
-		if (lxc_safe_int(direntp->d_name, &fd) < 0) {
-			INFO("Could not parse file descriptor for: %s", direntp->d_name);
+		ret = lxc_safe_int(direntp->d_name, &fd);
+		if (ret < 0) {
+			INFO("Could not parse file descriptor for \"%s\"", direntp->d_name);
 			continue;
 		}