diff options
| author | Justus Winter <[email protected]> | 2015-11-25 13:57:14 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2015-11-25 13:57:14 +0000 |
| commit | 89e104eb38c3a6896892ff09db11cb1bae2bb0d3 (patch) | |
| tree | d358f3dd64fd3426d4bb4ddd51b6997b7246ca8e /tools/gpgtar.c | |
| parent | tools/gpgtar: Improve error handling. (diff) | |
| download | gnupg-89e104eb38c3a6896892ff09db11cb1bae2bb0d3.tar.gz gnupg-89e104eb38c3a6896892ff09db11cb1bae2bb0d3.zip | |
tools/gpgtar: Handle '--gpg' argument.
* tools/gpgtar-create.c (gpgtar_create): Use given gpg program.
* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
* tools/gpgtar-list.c (gpgtar_list): Likewise.
* tools/gpgtar.c (enum cmd_and_opt_values): New constant.
(opts): Add argument.
(main): Handle argument.
* tools/gpgtar.h (opt): Add field 'gpg_program'.
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'tools/gpgtar.c')
| -rw-r--r-- | tools/gpgtar.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/gpgtar.c b/tools/gpgtar.c index 714b216d2..c4bf855cd 100644 --- a/tools/gpgtar.c +++ b/tools/gpgtar.c @@ -64,6 +64,7 @@ enum cmd_and_opt_values oNoVerbose = 500, aSignEncrypt, + oGpgProgram, oSkipCrypto, oOpenPGP, oCMS, @@ -90,6 +91,7 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_s (oOutput, "output", N_("|FILE|write output to FILE")), ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")), ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")), + ARGPARSE_s_s (oGpgProgram, "gpg", "@"), ARGPARSE_s_n (oSkipCrypto, "skip-crypto", N_("skip the crypto processing")), ARGPARSE_s_s (oSetFilename, "set-filename", "@"), ARGPARSE_s_s (oFilesFrom, "files-from", @@ -221,6 +223,10 @@ main (int argc, char **argv) opt.symmetric = 1; break; + case oGpgProgram: + opt.gpg_program = pargs.r.ret_str; + break; + case oSkipCrypto: skip_crypto = 1; break; |