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

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

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 4560a389bc8fedfee4e4f991137f944549985144..d21819add801fe87ade9d2172363760c1db1e799 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/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/trunk/gpgme/rungpg.c b/trunk/gpgme/rungpg.c
index 8885278b08604bf9e7f2797dcc20afc12b7633e6..5a80f72ec01542d06eb23981ae21ce0edfbbdc81 100644 (file)
--- a/trunk/gpgme/rungpg.c
+++ b/trunk/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;