Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-01-06 14:01:15 +00:00
11 changed files with 259 additions and 129 deletions

2
cmd.c
View File

@ -691,7 +691,7 @@ cmd_template_replace(const char *template, const char *s, int idx)
buf = xrealloc(buf, len + (strlen(s) * 2) + 1);
for (cp = s; *cp != '\0'; cp++) {
if (quoted && *cp == '"')
if (quoted && (*cp == '"' || *cp == '$'))
buf[len++] = '\\';
buf[len++] = *cp;
}