diff options
Diffstat (limited to '')
| -rw-r--r-- | tools/ChangeLog | 4 | ||||
| -rw-r--r-- | tools/gpg-connect-agent.c | 23 |
2 files changed, 24 insertions, 3 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog index 1b0d539b3..05951f75e 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,7 @@ +2007-10-12 Werner Koch <[email protected]> + + * gpg-connect-agent.c (substitute_line): Allow ${foo} syntax. + 2007-10-11 Werner Koch <[email protected]> * gpg-connect-agent.c (get_var): Expand environment variables. diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c index 6b4cc54ff..cb3f0639d 100644 --- a/tools/gpg-connect-agent.c +++ b/tools/gpg-connect-agent.c @@ -228,6 +228,8 @@ get_var (const char *name) variable_t var; const char *s; + if (!*name) + return ""; for (var = variable_table; var; var = var->next) if (!strcmp (var->name, name)) break; @@ -264,9 +266,24 @@ substitute_line (char *buffer) line = p + 1; continue; } - for (pend=p+1; *pend && !spacep (pend) && *pend != '$' ; pend++) - ; - if (*pend) + if (p[1] == '{') + { + for (pend=p+2; *pend && *pend != '}' ; pend++) + ; + if (!*pend) + return result; /* Unclosed - don't substitute. */ + } + else + { + for (pend=p+1; *pend && !spacep (pend) && *pend != '$' ; pend++) + ; + } + if (p[1] == '{' && *pend == '}') + { + *pend++ = 0; + value = get_var (p+2); + } + else if (*pend) { int save = *pend; *pend = 0; |