Rocco Rutte:

[apps/madmutt.git] / pgp.c

diff --git a/pgp.c b/pgp.c
index 11d8988..5580c69 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -103,10 +103,22 @@ void pgp_forget_passphrase (void)
   mutt_message _("PGP passphrase forgotten.");
 }
 
-int pgp_use_gpg_agent (void)
-{
-  return option (OPTUSEGPGAGENT) && getenv ("GPG_TTY")
-    && getenv ("GPG_AGENT_INFO");
+int pgp_use_gpg_agent (void) {
+  char *tty;
+
+  if (!option (OPTUSEGPGAGENT) || !getenv ("GPG_AGENT_INFO"))
+    return 0;
+
+  if ((tty = ttyname(0))) {
+    char tmp[SHORT_STRING];
+    snprintf (tmp, sizeof (tmp), "GPG_TTY=%s", tty);
+    putenv (tmp);
+#if 0
+    setenv("GPG_TTY", tty, 0);
+#endif
+  }
+
+  return 1;
 }
 
 char *pgp_keyid (pgp_key_t k)
@@ -228,7 +240,7 @@ static void pgp_copy_clearsigned (FILE * fpin, STATE * s, char *charset)
 int pgp_application_pgp_handler (BODY * m, STATE * s)
 {
   int needpass = -1, pgp_keyblock = 0;
-  int c;
+  int c = 1;
   int clearsign = 0, rv, rc;
   long start_pos = 0;
   long bytes, last_pos, offset;