From 621e4160e25b8e1154f5e1faa314ce86424b7102 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 22 May 2014 10:26:23 +0900 Subject: [PATCH] machine: escape fields we store in /run, so that they can be properly unescaped by parse_env_file() (cherry picked from commit ca5405bb4fb1fabd1fe43e4ee23edf58914bdfae) (cherry picked from commit 0be4e0b695a297e4ad0a57860798a58053a2f916) Conflicts: src/machine/machine.c --- src/machine/machine.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/src/machine/machine.c b/src/machine/machine.c index 602aa18..3df9c45 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -120,17 +120,42 @@ int machine_save(Machine *m) { "NAME=%s\n", m->name); - if (m->scope) - fprintf(f, "SCOPE=%s\n", m->scope); + if (m->scope) { + _cleanup_free_ char *escaped; + + escaped = cescape(m->scope); + if (!escaped) { + r = -ENOMEM; + goto finish; + } + + fprintf(f, "SCOPE=%s\n", escaped); + } if (m->scope_job) fprintf(f, "SCOPE_JOB=%s\n", m->scope_job); - if (m->service) - fprintf(f, "SERVICE=%s\n", m->service); + if (m->service) { + _cleanup_free_ char *escaped; - if (m->root_directory) - fprintf(f, "ROOT=%s\n", m->root_directory); + escaped = cescape(m->service); + if (!escaped) { + r = -ENOMEM; + goto finish; + } + fprintf(f, "SERVICE=%s\n", escaped); + } + + if (m->root_directory) { + _cleanup_free_ char *escaped; + + escaped = cescape(m->root_directory); + if (!escaped) { + r = -ENOMEM; + goto finish; + } + fprintf(f, "ROOT=%s\n", escaped); + } if (!sd_id128_equal(m->id, SD_ID128_NULL)) fprintf(f, "ID=" SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(m->id));