From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 24 May 2018 11:38:08 +0000 (+0200)
Subject: utils: add remove_trailing_newlines()
X-Git-Tag: lxc-3.1.0~291^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ad3767052a663d6d2c4e4309cdac78ac388dca6;p=thirdparty%2Flxc.git

utils: add remove_trailing_newlines()

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

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 16182332c..fa66060db 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -2685,15 +2685,6 @@ out:
 	return bret;
 }
 
-static void strip_newline(char *p)
-{
-	size_t len = strlen(p);
-	if (len < 1)
-		return;
-	if (p[len-1] == '\n')
-		p[len-1] = '\0';
-}
-
 void mod_all_rdeps(struct lxc_container *c, bool inc)
 {
 	struct lxc_container *p;
@@ -2716,8 +2707,10 @@ void mod_all_rdeps(struct lxc_container *c, bool inc)
 			ERROR("badly formatted file %s", path);
 			goto out;
 		}
-		strip_newline(lxcpath);
-		strip_newline(lxcname);
+
+		remove_trailing_newlines(lxcpath);
+		remove_trailing_newlines(lxcname);
+
 		if ((p = lxc_container_new(lxcname, lxcpath)) == NULL) {
 			ERROR("Unable to find dependent container %s:%s",
 				lxcpath, lxcname);
diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
index 817b53633..1e754db22 100644
--- a/src/lxc/seccomp.c
+++ b/src/lxc/seccomp.c
@@ -65,16 +65,6 @@ static int parse_config_v1(FILE *f, struct lxc_conf *conf)
 }
 
 #if HAVE_DECL_SECCOMP_SYSCALL_RESOLVE_NAME_ARCH
-static void remove_trailing_newlines(char *l)
-{
-	char *p = l;
-
-	while (*p)
-		p++;
-	while (--p >= l && *p == '\n')
-		*p = '\0';
-}
-
 static uint32_t get_v2_default_action(char *line)
 {
 	uint32_t ret_action = -1;
diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index 2669a4d4b..7525346e9 100644
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -2533,3 +2533,14 @@ int lxc_set_death_signal(int signal)
 
 	return 0;
 }
+
+void remove_trailing_newlines(char *l)
+{
+	char *p = l;
+
+	while (*p)
+		p++;
+
+	while (--p >= l && *p == '\n')
+		*p = '\0';
+}
diff --git a/src/lxc/utils.h b/src/lxc/utils.h
index dd4510644..93e2a3ee4 100644
--- a/src/lxc/utils.h
+++ b/src/lxc/utils.h
@@ -453,6 +453,7 @@ extern void lxc_free_array(void **array, lxc_free_fn element_free_fn);
 extern size_t lxc_array_len(void **array);
 
 extern void **lxc_append_null_to_array(void **array, size_t count);
+extern void remove_trailing_newlines(char *l);
 
 /* initialize rand with urandom */
 extern int randseed(bool);