Merge pull request #1209 from brauner/2016-09-25/lxc_deslashify

src/lxc/criu.c

@@ -282,7 +282,7 @@ static void exec_criu(struct criu_opts *opts)
 			}
 		}
 
-		if (!lxc_deslashify(path)) {
+		if (!lxc_deslashify(&path)) {
 			ERROR("failed to deslashify %s", path);
 			free(path);
 			goto err;

src/lxc/utils.c

@@ -716,21 +716,40 @@ char **lxc_normalize_path(const char *path)
 	return components;
 }
 
-bool lxc_deslashify(char *path)
+bool lxc_deslashify(char **path)
 {
-	char **parts = NULL, *path2;
+	char *p;
+	char **parts = NULL;
+	size_t n, len;
 
-	parts = lxc_normalize_path(path);
+	parts = lxc_normalize_path(*path);
 	if (!parts)
 		return false;
 
-	path2 = lxc_string_join("/", (const char **) parts, *path == '/');
-	lxc_free_array((void **) parts, free);
-	if (!path2)
+	/* We'll end up here if path == "///" or path == "". */
+	if (!*parts) {
+		len = strlen(*path);
+		if (!len)
+			return true;
+		n = strcspn(*path, "/");
+		if (n == len) {
+			p = strdup("/");
+			if (!p)
+				return false;
+			free(*path);
+			*path = p;
+			return true;
+		}
+	}
+
+	p = lxc_string_join("/", (const char **)parts, **path == '/');
+	lxc_free_array((void **)parts, free);
+	if (!p)
 		return false;
 
-	strncpy(path, path2, strlen(path));
-	free(path2);
+	free(*path);
+	*path = p;
+
 	return true;
 }
 

src/lxc/utils.h

@@ -249,7 +249,7 @@ extern char *lxc_string_join(const char *sep, const char **parts, bool use_as_pr
  */
 extern char **lxc_normalize_path(const char *path);
 /* remove multiple slashes from the path, e.g. ///foo//bar -> /foo/bar */
-extern bool lxc_deslashify(char *path);
+extern bool lxc_deslashify(char **path);
 extern char *lxc_append_paths(const char *first, const char *second);
 /* Note: the following two functions use strtok(), so they will never
  *       consider an empty element, even if two delimiters are next to

src/tests/lxc-test-utils.c

@@ -21,6 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,6 +29,37 @@
 #include "lxctest.h"
 #include "utils.h"
 
+void test_lxc_deslashify(void)
+{
+	char *s = strdup("/A///B//C/D/E/");
+	if (!s)
+		exit(EXIT_FAILURE);
+	lxc_test_assert_abort(lxc_deslashify(&s));
+	lxc_test_assert_abort(strcmp(s, "/A/B/C/D/E") == 0);
+	free(s);
+
+	s = strdup("/A");
+	if (!s)
+		exit(EXIT_FAILURE);
+	lxc_test_assert_abort(lxc_deslashify(&s));
+	lxc_test_assert_abort(strcmp(s, "/A") == 0);
+	free(s);
+
+	s = strdup("");
+	if (!s)
+		exit(EXIT_FAILURE);
+	lxc_test_assert_abort(lxc_deslashify(&s));
+	lxc_test_assert_abort(strcmp(s, "") == 0);
+	free(s);
+
+	s = strdup("//");
+	if (!s)
+		exit(EXIT_FAILURE);
+	lxc_test_assert_abort(lxc_deslashify(&s));
+	lxc_test_assert_abort(strcmp(s, "/") == 0);
+	free(s);
+}
+
 void test_lxc_string_replace(void)
 {
 	char *s;
@@ -84,6 +116,7 @@ int main(int argc, char *argv[])
 {
 	test_lxc_string_replace();
 	test_lxc_string_in_array();
+	test_lxc_deslashify();
 
 	exit(EXIT_SUCCESS);
 }