systemd-run: properly escape arguments
Spaces, quotes, and such, were not properly escaped. We should write them like we read them. https://bugs.freedesktop.org/show_bug.cgi?id=67971
This commit is contained in:
@@ -356,6 +356,43 @@ char *strv_join(char **l, const char *separator) {
|
||||
return r;
|
||||
}
|
||||
|
||||
char *strv_join_quoted(char **l) {
|
||||
char *buf = NULL;
|
||||
char **s;
|
||||
size_t allocated = 0, len = 0;
|
||||
|
||||
STRV_FOREACH(s, l) {
|
||||
/* assuming here that escaped string cannot be more
|
||||
* than twice as long, and reserving space for the
|
||||
* separator and quotes.
|
||||
*/
|
||||
_cleanup_free_ char *esc = NULL;
|
||||
size_t needed;
|
||||
|
||||
if (!GREEDY_REALLOC(buf, allocated,
|
||||
len + strlen(*s) * 2 + 3))
|
||||
goto oom;
|
||||
|
||||
esc = cescape(*s);
|
||||
if (!esc)
|
||||
goto oom;
|
||||
|
||||
needed = snprintf(buf + len, allocated - len, "%s\"%s\"",
|
||||
len > 0 ? " " : "", esc);
|
||||
assert(needed < allocated - len);
|
||||
len += needed;
|
||||
}
|
||||
|
||||
if (!buf)
|
||||
buf = malloc0(1);
|
||||
|
||||
return buf;
|
||||
|
||||
oom:
|
||||
free(buf);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char **strv_append(char **l, const char *s) {
|
||||
char **r, **k;
|
||||
|
||||
|
||||
@@ -68,6 +68,7 @@ char **strv_split_quoted(const char *s);
|
||||
char **strv_split_newlines(const char *s);
|
||||
|
||||
char *strv_join(char **l, const char *separator);
|
||||
char *strv_join_quoted(char **l);
|
||||
|
||||
char **strv_parse_nulstr(const char *s, size_t l);
|
||||
char **strv_split_nulstr(const char *s);
|
||||
|
||||
Reference in New Issue
Block a user