From 04c14b25412cdbde834e8369bd7268cbe92873c0 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Tue, 23 Jun 2015 10:57:41 +0000 Subject: strv: Add strv_shell_escape This modifies the strv in-place, replacing strings with their escaped version. It's mostly just a convenience function for when you need to join a strv together because it's passed as a string to something, and the separator needs escaping. --- src/basic/strv.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src/basic/strv.c') diff --git a/src/basic/strv.c b/src/basic/strv.c index 79a9d8d421..eaf440a4b2 100644 --- a/src/basic/strv.c +++ b/src/basic/strv.c @@ -694,6 +694,26 @@ char **strv_reverse(char **l) { return l; } +char **strv_shell_escape(char **l, const char *bad) { + char **s; + + /* Escapes every character in every string in l that is in bad, + * edits in-place, does not roll-back on error. */ + + STRV_FOREACH(s, l) { + char *v; + + v = shell_escape(*s, bad); + if (!v) + return NULL; + + free(*s); + *s = v; + } + + return l; +} + bool strv_fnmatch(char* const* patterns, const char *s, int flags) { char* const* p; -- cgit v1.2.3-54-g00ecf