summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2015-05-11 19:38:07 +0200
committerWerner Koch <wk@gnupg.org>2015-05-11 19:38:22 +0200
commit26e2eb98d3d8405b335b43c8e86deacf622cd957 (patch)
tree29e05a6eedb84326011cacd4b1014e55a8bd2113
parentagent: Add option --no-allow-external-cache. (diff)
downloadgnupg2-26e2eb98d3d8405b335b43c8e86deacf622cd957.tar.xz
gnupg2-26e2eb98d3d8405b335b43c8e86deacf622cd957.zip
gpg-connect-agent: Fix quoting of internal percent+ function.
* tools/gpg-connect-agent.c (get_var_ext) <percent, percent+): Also escape '+'. -- GnuPG-bug-id: 1841 Signed-off-by: Werner Koch <wk@gnupg.org>
-rw-r--r--tools/gpg-connect-agent.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index f1d123ffa..2e00b8f7b 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -501,8 +501,8 @@ arithmetic_op (int operator, const char *operands)
percent ARGS
percent+ ARGS
Escape the args using the percent style. Tabs, formfeeds,
- linefeeds and carriage returns are also escaped.
- "percent+" also maps spaces to plus characters.
+ linefeeds, carriage return, and the plus sign are also
+ escaped. "percent+" also maps spaces to plus characters.
errcode ARG
Assuming ARG is an integer, return the gpg-error code.
@@ -594,12 +594,12 @@ get_var_ext (const char *name)
else if ( (s - name) == 7 && !strncmp (name, "percent", 7))
{
s++;
- result = percent_escape (s, "\t\r\n\f\v");
+ result = percent_escape (s, "+\t\r\n\f\v");
}
else if ( (s - name) == 8 && !strncmp (name, "percent+", 8))
{
s++;
- result = percent_escape (s, "\t\r\n\f\v");
+ result = percent_escape (s, "+\t\r\n\f\v");
for (p=result; *p; p++)
if (*p == ' ')
*p = '+';