[svn] GnuPG - r4590 - trunk/tools

[svn author wk]

Author: wk
Date: 2007-10-11 19:35:31 +0200 (Thu, 11 Oct 2007)
New Revision: 4590

Modified:
   trunk/tools/ChangeLog
   trunk/tools/gpg-connect-agent.c
Log:
* gpg-connect-agent.c (get_var): Expand environment variables.
  Suggested by Marc Mutz.
  (set_var): Return the value.
  (assign_variable): Add arg syslet.
  (main): New command /slet.
						  


Modified: trunk/tools/ChangeLog
===================================================================
--- trunk/tools/ChangeLog	2007-10-02 21:46:29 UTC (rev 4589)
+++ trunk/tools/ChangeLog	2007-10-11 17:35:31 UTC (rev 4590)
@@ -1,3 +1,11 @@
+2007-10-11  Werner Koch  <wk at g10code.com>
+
+	* gpg-connect-agent.c (get_var): Expand environment variables.
+	Suggested by Marc Mutz.
+	(set_var): Return the value.
+	(assign_variable): Add arg syslet.
+	(main): New command /slet.
+
 2007-10-02  Werner Koch  <wk at g10code.com>
 
 	* no-libgcrypt.c (gcry_malloc_secure): New.

Modified: trunk/tools/gpg-connect-agent.c
===================================================================
--- trunk/tools/gpg-connect-agent.c	2007-10-02 21:46:29 UTC (rev 4589)
+++ trunk/tools/gpg-connect-agent.c	2007-10-11 17:35:31 UTC (rev 4590)
@@ -166,7 +166,7 @@
 }
 
 
-static void
+static const char *
 set_var (const char *name, const char *value)
 {
   variable_t var;
@@ -184,6 +184,7 @@
     }
   xfree (var->value);
   var->value = value? xstrdup (value) : NULL;
+  return var->value;
 }    
 
 
@@ -196,16 +197,22 @@
   set_var (name, numbuf);
 }
 
+
 /* Return the value of a variable.  That value is valid until a
-   variable of the name is changed.  Return NULL if not found.  */
+   variable of the name is changed.  Return NULL if not found.  Note
+   that envvars are copied to our variable list at the first access
+   and not at oprogram start.  */
 static const char *
 get_var (const char *name)
 {
   variable_t var;
+  const char *s;
 
   for (var = variable_table; var; var = var->next)
     if (!strcmp (var->name, name))
       break;
+  if (!var && (s = getenv (name)))
+    return set_var (name, s);
   if (!var || !var->value)
     return NULL;
   return var->value;
@@ -282,7 +289,7 @@
 
 
 static void
-assign_variable (char *line)
+assign_variable (char *line, int syslet)
 {
   char *name, *p, *tmp;
 
@@ -297,6 +304,20 @@
 
   if (!*p)
     set_var (name, NULL); /* Remove variable.  */ 
+  else if (syslet)
+    {
+      tmp = opt.enable_varsubst? substitute_line (p) : NULL;
+      if (tmp)
+        p = tmp;
+      if (!strcmp (p, "homedir"))
+        set_var (name, opt.homedir);
+      else
+        {
+          log_error ("undefined tag `%s'\n", p);
+          log_info  ("valid tags are: homedir\n");
+        }
+      xfree (tmp);
+    }
   else 
     {
       tmp = opt.enable_varsubst? substitute_line (p) : NULL;
@@ -601,7 +622,7 @@
 
 
 static int
-getinfo_pin_cb (void *opaque, const void *buffer, size_t length)
+getinfo_pid_cb (void *opaque, const void *buffer, size_t length)
 {
   membuf_t *mb = opaque;
   put_membuf (mb, buffer, length);
@@ -617,7 +638,7 @@
   char *buffer;
   
   init_membuf (&mb, 100);
-  rc = assuan_transact (ctx, "GETINFO pid", getinfo_pin_cb, &mb,
+  rc = assuan_transact (ctx, "GETINFO pid", getinfo_pid_cb, &mb,
                         NULL, NULL, NULL, NULL);
   put_membuf (&mb, "", 1);
   buffer = get_membuf (&mb, NULL);
@@ -816,8 +837,12 @@
             p++;
           if (!strcmp (cmd, "let"))
             {
-              assign_variable (p);
+              assign_variable (p, 0);
             }
+          else if (!strcmp (cmd, "slet"))
+            {
+              assign_variable (p, 1);
+            }
           else if (!strcmp (cmd, "showvar"))
             {
               show_variables ();
@@ -929,6 +954,7 @@
 "Available commands:\n"
 "/echo ARGS             Echo ARGS.\n"
 "/let  NAME VALUE       Set variable NAME to VALUE.\n"
+"/slet NAME TAG         Set variable NAME to the value described by TAG.\n" 
 "/showvar               Show all variables.\n"
 "/definqfile NAME FILE\n"
 "    Use content of FILE for inquiries with NAME.\n"