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

nspawn: Allow : characters in nspawn --bind paths

: characters in bind paths can be entered as the \: escape sequence.
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index fe5f3528ce8..b65b13426ff 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -655,17 +655,22 @@ static int parse_argv(int argc, char *argv[]) {
 
                 case ARG_BIND:
                 case ARG_BIND_RO: {
+                        const char *current = optarg;
                         _cleanup_free_ char *source = NULL, *destination = NULL;
                         CustomMount *m;
-                        char *e;
+                        _cleanup_strv_free_ char **strv = NULL;
 
-                        e = strchr(optarg, ':');
-                        if (e) {
-                                source = strndup(optarg, e - optarg);
-                                destination = strdup(e + 1);
-                        } else {
-                                source = strdup(optarg);
-                                destination = strdup(optarg);
+                        r = extract_many_words(&current, ":", EXTRACT_DONT_COALESCE_SEPARATORS, &source, &destination, NULL);
+                        switch (r) {
+                        case 1:
+                                destination = strdup(source);
+                        case 2:
+                                break;
+                        case -ENOMEM:
+                                return log_oom();
+                        default:
+                                log_error("Invalid bind mount specification: %s", optarg);
+                                return -EINVAL;
                         }
 
                         if (!source || !destination)