aboutsummaryrefslogtreecommitdiffstats
path: root/tools/gpgtar-create.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-12-14 08:38:46 +0000
committerWerner Koch <[email protected]>2015-12-14 15:21:19 +0000
commitd80e1bc430bf64debdb6b08f0b7e5c42836781fa (patch)
treef84c394ab4fa41265400524849c77bce16285670 /tools/gpgtar-create.c
parentgpg: Print ownertrust in TOFU+PGP trust model. (diff)
downloadgnupg-d80e1bc430bf64debdb6b08f0b7e5c42836781fa.tar.gz
gnupg-d80e1bc430bf64debdb6b08f0b7e5c42836781fa.zip
common: Rename sh-exectool to exectool.
* common/sh-exectool.c: Rename to exectool.c. * common/sh-exectool.h: Rename to exectool.h. * common/Makefile.am (common_sources): Adjust for rename. * common/exectool.c (sh_exec_tool_stream): Rename to gnupg_exec-tool-stream. (sh_exec_tool): Rename to gnupg_exec_tool. * tools/gpgtar-create.c (gpgtar_create): Adjust for changes. * tools/gpgtar-extract.c: Adjust for changes. * tools/gpgtar-list.c: Adjust for changes. -- The "sh-" presifx is used by g13 for system helpers which are used by processes created via userv. A generic function in common/ should also have a generic name. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'tools/gpgtar-create.c')
-rw-r--r--tools/gpgtar-create.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index d8d1d54f1..2fd70190c 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -36,7 +36,7 @@
#include <assert.h>
#include "i18n.h"
-#include "../common/sh-exectool.h"
+#include "../common/exectool.h"
#include "../common/sysutils.h"
#include "gpgtar.h"
@@ -937,8 +937,8 @@ gpgtar_create (char **inpattern, int encrypt, int sign)
+ 1 + !!encrypt + !!sign + 2 * !!opt.user
+ !!opt.symmetric);
- err = sh_exec_tool_stream (opt.gpg_program, argv,
- outstream, cipher_stream);
+ err = gnupg_exec_tool_stream (opt.gpg_program, argv,
+ outstream, cipher_stream);
xfree (argv);
if (err)
goto leave;