From: Richard Maw <richard.maw@codethink.co.uk>
Date: Fri, 19 Jun 2015 15:24:38 +0000 (+0000)
Subject: nspawn: Allow : characters in overlay paths
X-Git-Tag: v225~61^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62f9f39a455204fac698f702a1369bd6fdbdbf9d;p=thirdparty%2Fsystemd.git

nspawn: Allow : characters in overlay paths

: characters can be entered with the \: escape sequence.
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 59e013d5c51..347260013a3 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -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)) {