[git] GnuPG - branch, master, updated. gnupg-2.1.4-18-gc672572

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  c672572bd50966187cc823585efed673b66ff942 (commit)
       via  8425db6a26bf66dad16dfbc26be9af7d272f31d3 (commit)
      from  cf508a1f7f4c8926dc554be68a2d46f5ce272ac0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c672572bd50966187cc823585efed673b66ff942
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jun 8 18:58:27 2015 +0200

    Convey envvar INSIDE_EMACS to the pinentry.
    
    * common/session-env.c (stdenvnames): Add it.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/session-env.c b/common/session-env.c
index 8f78c10..c0500ea 100644
--- a/common/session-env.c
+++ b/common/session-env.c
@@ -56,7 +56,7 @@ struct session_environment_s
 };
 
 
-/* A list of environment vribales we pass from the actual user
+/* A list of environment variables we pass from the actual user
   (e.g. gpgme) down to the pinentry.  We do not handle the locale
   settings because they do not only depend on envvars.  */
 static struct
@@ -74,6 +74,8 @@ static struct
                                     modules (eg "scim-bridge").  */
   { "QT_IM_MODULE" },            /* Used by Qt to select qt input
                                       modules (eg "xim").  */
+  { "INSIDE_EMACS" },            /* Set by Emacs before running a
+                                    process.  */
   { "PINENTRY_USER_DATA", "pinentry-user-data"}
                                  /* Used for communication with
                                     non-standard Pinentries.  */

commit 8425db6a26bf66dad16dfbc26be9af7d272f31d3
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jun 8 18:38:00 2015 +0200

    agent: Add command "getinfo std_env_names".
    
    * agent/command.c (cmd_getinfo): Add new sub-command.
    --
    
    The current output is:
    
      > getinfo std_env_names
      D GPG_TTY
      D TERM
      D DISPLAY
      D XAUTHORITY
      D XMODIFIERS
      D GTK_IM_MODULE
      D QT_IM_MODULE
      D PINENTRY_USER_DATA
      OK
    
    Note that there is an invisible \x00 at the end of each line.

diff --git a/agent/command.c b/agent/command.c
index f71325d..82d93e9 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -2756,6 +2756,7 @@ static const char hlp_getinfo[] =
   "  ssh_socket_name - Return the name of the ssh socket.\n"
   "  scd_running - Return OK if the SCdaemon is already running.\n"
   "  s2k_count   - Return the calibrated S2K count.\n"
+  "  std_env_names   - List the names of the standard environment.\n"
   "  std_session_env - List the standard session environment.\n"
   "  std_startup_env - List the standard startup environment.\n"
   "  cmd_has_option\n"
@@ -2849,6 +2850,21 @@ cmd_getinfo (assuan_context_t ctx, char *line)
     {
       rc = agent_scd_check_running ()? 0 : gpg_error (GPG_ERR_GENERAL);
     }
+  else if (!strcmp (line, "std_env_names"))
+    {
+      int iterator;
+      const char *name;
+
+      iterator = 0;
+      while ((name = session_env_list_stdenvnames (&iterator, NULL)))
+        {
+          rc = assuan_send_data (ctx, name, strlen (name)+1);
+          if (!rc)
+            rc = assuan_send_data (ctx, NULL, 0);
+          if (rc)
+            break;
+        }
+    }
   else if (!strcmp (line, "std_session_env")
            || !strcmp (line, "std_startup_env"))
     {

-----------------------------------------------------------------------

Summary of changes:
 agent/command.c      | 16 ++++++++++++++++
 common/session-env.c |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org