confile: do not write out trailing spaces

So far do_append_unexp_config_line() wrote out a trailing space each time the config item value was empty. This is a problem a) when we later on parse the written out config file we need to remove trailing spaces and b). Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

confile: do not write out trailing spaces
5b529381 · Christian Brauner · Stéphane Graber · 08a46538 · 5b529381
Unverified Commit 5b529381 authored May 30, 2017 by Christian Brauner Committed by Stéphane Graber Jul 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

confile.c src/lxc/confile.c +9 -3

No files found.
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2703,10 +2703,16 @@ void write_config(FILE *fout, struct lxc_conf *c)
 bool do_append_unexp_config_line(struct lxc_conf *conf, const char *key, const char *v)
 {
 	int ret;
-	size_t len = strlen(key) + strlen(v) + 4;
+	size_t len;
-	char *tmp = alloca(len);
+	char *tmp;
-	ret = snprintf(tmp, len, "%s = %s", key, v);
+	len = strlen(key) + strlen(v) + 4;
+	tmp = alloca(len);
+	if (config_value_empty(v))
+		ret = snprintf(tmp, len, "%s =", key);
+	else
+		ret = snprintf(tmp, len, "%s = %s", key, v);
 	if (ret < 0 || ret >= len)
 		return false;