From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 24 Feb 2018 14:12:16 +0000 (+0100)
Subject: lxccontainer: create_partial()
X-Git-Tag: lxc-2.0.10~228
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de487bb3fa426914add1a9757a27b406f2bcae1e;p=thirdparty%2Flxc.git

lxccontainer: create_partial()

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

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 5884a7a7c..673b6ed2c 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -206,19 +206,21 @@ static int create_partial(struct lxc_container *c)
 
 static void remove_partial(struct lxc_container *c, int fd)
 {
-	// $lxcpath + '/' + $name + '/partial' + \0
-	int len = strlen(c->config_path) + strlen(c->name) + 10;
-	char *path = alloca(len);
 	int ret;
+	size_t len;
+	char *path;
 
 	close(fd);
+	/* $lxcpath + '/' + $name + '/partial' + \0 */
+	len = strlen(c->config_path) + strlen(c->name) + 10;
+	path = alloca(len);
 	ret = snprintf(path, len, "%s/%s/partial", c->config_path, c->name);
-	if (ret < 0 || ret >= len) {
-		ERROR("Error writing partial pathname");
+	if (ret < 0 || (size_t)ret >= len)
 		return;
-	}
-	if (unlink(path) < 0)
-		SYSERROR("Error unlink partial file %s", path);
+
+	ret = unlink(path);
+	if (ret < 0)
+		SYSERROR("Failed to remove partial file %s", path);
 }
 
 /* LOCKING