common,tools: Always escape newlines when escaping data.

[gnupg2.git] / tools / gpgconf-comp.c

diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index cdd2586b712b4c9abfb3fa5ac07c247d3d535faa..9358e2efac0d4fd943973517481c9d58012fbd9c 100644 (file)
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -747,6 +747,8 @@ static gc_option_t gc_options_gpg[] =
    { "auto-key-locate", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
      "gnupg", N_("|MECHANISMS|use MECHANISMS to locate keys by mail address"),
      GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
+   { "auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
+     NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
 
 
    GC_OPTION_NULL
@@ -1488,6 +1490,13 @@ gc_percent_escape (const char *src)
          *(dst++) = '2';
          *(dst++) = 'c';
        }
+      else if (*src == '\n')
+       {
+         /* The newline is problematic in a line-based format.  */
+         *(dst++) = '%';
+         *(dst++) = '0';
+         *(dst++) = 'a';
+       }
       else
        *(dst++) = *(src);
       src++;