]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
nspawn: Allow : characters in overlay paths
authorRichard Maw <richard.maw@codethink.co.uk>
Fri, 19 Jun 2015 15:24:38 +0000 (15:24 +0000)
committerRichard Maw <richard.maw@codethink.co.uk>
Fri, 7 Aug 2015 15:50:43 +0000 (15:50 +0000)
: characters can be entered with the \: escape sequence.

src/nspawn/nspawn.c

index 59e013d5c5157e2b62447c4e4ca49ba4358e6b35..347260013a33ad45499fd813184dae99c9a0c58d 100644 (file)
@@ -739,9 +739,13 @@ static int parse_argv(int argc, char *argv[]) {
                         unsigned n = 0;
                         char **i;
 
-                        lower = strv_split(optarg, ":");
-                        if (!lower)
+                        r = strv_split_extract(&lower, optarg, ":", EXTRACT_DONT_COALESCE_SEPARATORS);
+                        if (r == -ENOMEM)
                                 return log_oom();
+                        else if (r < 0) {
+                                log_error("Invalid overlay specification: %s", optarg);
+                                return r;
+                        }
 
                         STRV_FOREACH(i, lower) {
                                 if (!path_is_absolute(*i)) {