diff options
| author | Marcus Brinkmann <[email protected]> | 2004-02-01 14:34:54 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2004-02-01 14:34:54 +0000 |
| commit | b1b57049f5b9ce5fd6aa7ca8851307e2f6a1f632 (patch) | |
| tree | d7425e2300d4ec122073bec14d540fe87a1b7b4e | |
| parent | 2004-01-31 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-b1b57049f5b9ce5fd6aa7ca8851307e2f6a1f632.tar.gz gpgme-b1b57049f5b9ce5fd6aa7ca8851307e2f6a1f632.zip | |
2004-02-01 Marcus Brinkmann <[email protected]>
* rungpg.c (build_argv): Use --no-comment, not --comment "".
Diffstat (limited to '')
| -rw-r--r-- | gpgme/ChangeLog | 2 | ||||
| -rw-r--r-- | gpgme/rungpg.c | 13 |
2 files changed, 4 insertions, 11 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 4560a389..d21819ad 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,5 +1,7 @@ 2004-02-01 Marcus Brinkmann <[email protected]> + * 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 8885278b..5a80f72e 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; |