Make gpg's output look a little bit cleaner.

diff --git a/gnupgparse.c b/gnupgparse.c
index 5d7ed8143b9d95c38088f24a1dd19cdc00355bea..810db81f53c3f82437000a76a76974f3c94361dc 100644 (file)
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -168,7 +168,7 @@ static KEYINFO *read_ring(struct pgp_vinfo *pgp, int secret )
     if((devnull = open("/dev/null", O_RDWR)) == -1)
         return NULL;
   
-    thepid = gpg_invoke_list_keys(pgp, NULL, &fp, NULL, devnull, -1, devnull,
+    thepid = gpg_invoke_list_keys(pgp, NULL, &fp, NULL, -1, -1, devnull,
                                                        NULL, secret);
     if( thepid == -1 )
     {

diff --git a/pgpinvoke.c b/pgpinvoke.c
index 87b95a17a03b90085f6956a35fb51c7159398aae..e97640037075312f81e84d3e7679bee6b15894af 100644 (file)
--- a/pgpinvoke.c
+++ b/pgpinvoke.c
@@ -418,7 +418,7 @@ pid_t pgp_gpg_invoke_decode(struct pgp_vinfo *pgp,
   char *_fname  = mutt_quote_filename(fname);
   
   snprintf(cmd, sizeof(cmd),
-          "%s%s --no-verbose --batch --status-fd 2 -o - %s",
+          "%s%s --no-verbose --batch  -o - %s",
           NONULL(binary), need_passphrase? " --passphrase-fd 0":"",
           _fname);
 
@@ -438,7 +438,7 @@ pid_t pgp_gpg_invoke_verify(struct pgp_vinfo *pgp,
   char *_sig   = mutt_quote_filename(sigfile);
   
   snprintf(cmd, sizeof(cmd),
-          "%s --no-verbose --batch --status-fd 2 -o - "
+          "%s --no-verbose --batch  -o - "
           "--verify %s %s",
           NONULL(binary), _sig, _sign);
 
@@ -458,7 +458,7 @@ pid_t pgp_gpg_invoke_decrypt(struct pgp_vinfo *pgp,
   char *_fname  = mutt_quote_filename(fname);
   
   snprintf(cmd, sizeof(cmd),
-          "%s --passphrase-fd 0 --no-verbose --batch --status-fd 2 -o - "
+          "%s --passphrase-fd 0 --no-verbose --batch  -o - "
           "--decrypt %s",
           NONULL(binary), _fname);
 
@@ -495,7 +495,7 @@ pid_t pgp_gpg_invoke_sign(struct pgp_vinfo *pgp,
   char *_fname  = mutt_quote_filename(fname);
   
   snprintf(cmd, sizeof(cmd),
-          "%s --no-verbose --batch --status-fd 2 -o - "
+          "%s --no-verbose --batch  -o - "
           "--passphrase-fd 0 --digest-algo %s "
           "--detach-sign --textmode --armor %s%s %s",
           NONULL(binary),
@@ -524,7 +524,7 @@ pid_t pgp_gpg_invoke_encrypt(struct pgp_vinfo *pgp,
   char *_fname  = mutt_quote_filename(fname);
   
   snprintf(cmd, sizeof(cmd),
-          "%s%s --no-verbose -v --batch --status-fd 2 -o - "
+          "%s%s --no-verbose -v --batch  -o - "
           "--digest-algo %s "
           "--encrypt%s --textmode --armor --always-trust %s%s",
           NONULL(binary),