summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2021-05-07 17:29:39 +0200
committerGitHub <noreply@github.com>2021-05-07 17:29:39 +0200
commit37ef2fc9f7709c710692081e7e3be94d7b16d9fa (patch)
tree1702f5f959125f99b9d179cc45bc34594ab6e885 /src/shared
parentd0f14a6cf410f46ccc2efcfbdd13ee2608ada317 (diff)
parent2f960b3858eeefb3d27621291b94b72809e288e4 (diff)
downloadsystemd-37ef2fc9f7709c710692081e7e3be94d7b16d9fa.tar.gz
Merge pull request #18863 from keszybz/cmdline-escaping
Escape command lines properly
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/bus-print-properties.c2
-rw-r--r--src/shared/bus-wait-for-jobs.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/bus-print-properties.c b/src/shared/bus-print-properties.c
index e4427dbced..cbd5fb087e 100644
--- a/src/shared/bus-print-properties.c
+++ b/src/shared/bus-print-properties.c
@@ -250,7 +250,7 @@ static int bus_print_property(const char *name, const char *expected_value, sd_b
while ((r = sd_bus_message_read_basic(m, SD_BUS_TYPE_STRING, &str)) > 0) {
_cleanup_free_ char *e = NULL;
- e = shell_maybe_quote(str, ESCAPE_BACKSLASH_ONELINE);
+ e = shell_maybe_quote(str, 0);
if (!e)
return -ENOMEM;
diff --git a/src/shared/bus-wait-for-jobs.c b/src/shared/bus-wait-for-jobs.c
index 8458fe8684..e4a3ab9a95 100644
--- a/src/shared/bus-wait-for-jobs.c
+++ b/src/shared/bus-wait-for-jobs.c
@@ -181,7 +181,7 @@ static void log_job_error_with_service_result(const char* service, const char *r
assert(service);
- service_shell_quoted = shell_maybe_quote(service, ESCAPE_BACKSLASH);
+ service_shell_quoted = shell_maybe_quote(service, 0);
if (!strv_isempty((char**) extra_args)) {
_cleanup_free_ char *t = NULL;