From: Marcus Brinkmann <mb@g10code.com>
Date: Sun, 1 Feb 2004 14:34:54 +0000 (+0000)
Subject: 2004-02-01  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-0-4-5~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b1b57049f5b9ce5fd6aa7ca8851307e2f6a1f632;p=gpgme.git

2004-02-01  Marcus Brinkmann  <marcus@g10code.de>

	* rungpg.c (build_argv): Use --no-comment, not --comment "".
---

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 4560a38..d21819a 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,7 @@
 2004-02-01  Marcus Brinkmann  <marcus@g10code.de>
 
+	* rungpg.c (build_argv): Use --no-comment, not --comment "".
+
 	* data-compat.c (gpgme_data_new_from_filepart): Call fseeko if
 	available.
 	* data-stream.c (stream_seek): Likewise.
diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c
index 8885278..5a80f72 100644
--- a/gpgme/rungpg.c
+++ b/gpgme/rungpg.c
@@ -549,7 +549,7 @@ build_argv (engine_gpg_t gpg)
     argc++;
   if (!gpg->cmd.used)
     argc++;	/* --batch */
-  argc += 2; /* --comment */
+  argc += 1; /* --no-comment */
 
   argv = calloc (argc + 1, sizeof *argv);
   if (!argv)
@@ -608,16 +608,7 @@ build_argv (engine_gpg_t gpg)
         }
       argc++;
     }
-  argv[argc] = strdup ("--comment");
-  if (!argv[argc])
-    {
-      int saved_errno = errno;
-      free (fd_data_map);
-      free_argv (argv);
-      return gpg_error_from_errno (saved_errno);
-    }
-  argc++;
-  argv[argc] = strdup ("");
+  argv[argc] = strdup ("--no-comment");
   if (!argv[argc])
     {
       int saved_errno = errno;