[svn] GnuPG - r3864 - in branches/GNUPG-1-9-BRANCH: . agent

[svn author wk]

Author: wk
Date: 2005-08-16 11:15:09 +0200 (Tue, 16 Aug 2005)
New Revision: 3864

Modified:
   branches/GNUPG-1-9-BRANCH/NEWS
   branches/GNUPG-1-9-BRANCH/agent/ChangeLog
   branches/GNUPG-1-9-BRANCH/agent/gpg-agent.c
Log:
Use a default argument for --write-env-file.

Modified: branches/GNUPG-1-9-BRANCH/NEWS
===================================================================
--- branches/GNUPG-1-9-BRANCH/NEWS	2005-08-11 16:57:29 UTC (rev 3863)
+++ branches/GNUPG-1-9-BRANCH/NEWS	2005-08-16 09:15:09 UTC (rev 3864)
@@ -1,3 +1,7 @@
+Noteworthy changes in version 1.9.19
+-------------------------------------------------
+
+
 Noteworthy changes in version 1.9.18 (2005-08-01)
 -------------------------------------------------
 

Modified: branches/GNUPG-1-9-BRANCH/agent/ChangeLog
===================================================================
--- branches/GNUPG-1-9-BRANCH/agent/ChangeLog	2005-08-11 16:57:29 UTC (rev 3863)
+++ branches/GNUPG-1-9-BRANCH/agent/ChangeLog	2005-08-16 09:15:09 UTC (rev 3864)
@@ -1,3 +1,7 @@
+2005-08-16  Werner Koch  <wk at g10code.com>
+
+	* gpg-agent.c (main): Use a default file name for --write-env-file.
+
 2005-07-25  Werner Koch  <wk at g10code.com>
 
 	* findkey.c (agent_public_key_from_file): Fixed array assignment.

Modified: branches/GNUPG-1-9-BRANCH/agent/gpg-agent.c
===================================================================
--- branches/GNUPG-1-9-BRANCH/agent/gpg-agent.c	2005-08-11 16:57:29 UTC (rev 3863)
+++ branches/GNUPG-1-9-BRANCH/agent/gpg-agent.c	2005-08-16 09:15:09 UTC (rev 3864)
@@ -152,7 +152,7 @@
   { oAllowPresetPassphrase, "allow-preset-passphrase", 0,
                              N_("allow presetting passphrase")},
   { oSSHSupport, "enable-ssh-support", 0, N_("enable ssh-agent emulation") },
-  { oWriteEnvFile, "write-env-file", 2,
+  { oWriteEnvFile, "write-env-file", 2|8,
             N_("|FILE|write environment settings also to FILE")},
   {0}
 };
@@ -633,7 +633,12 @@
         case oKeepDISPLAY: opt.keep_display = 1; break;
 
 	case oSSHSupport:  opt.ssh_support = 1; break;
-        case oWriteEnvFile: env_file_name = pargs.r.ret_str; break;
+        case oWriteEnvFile:
+          if (pargs.r_type)
+            env_file_name = pargs.r.ret_str;
+          else
+            env_file_name = make_filename ("~/.gpg-agent-info", NULL);
+          break;
 
         default : pargs.err = configfp? 1:2; break;
 	}