diff options
| author | Werner Koch <[email protected]> | 2015-12-14 09:16:46 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-02-13 16:06:39 +0000 |
| commit | c5d7045dafcfb569c11c90c04ea7a75328c80084 (patch) | |
| tree | 6bc883c16dc1a34d7a0aca00f4f31b835961d3b9 /g13/sh-blockdev.c | |
| parent | common: Make gnupg_exec_tool conform to spec. (diff) | |
| download | gnupg-c5d7045dafcfb569c11c90c04ea7a75328c80084.tar.gz gnupg-c5d7045dafcfb569c11c90c04ea7a75328c80084.zip | |
g13: Switch over to common/exectool.c.
* g13/sh-exectool.c: Remove. It has been replaced by common/exectool.c.
* g13/Makefile.am (g13_syshelp_SOURCES): Remove sh-exectool.c
* g13/sh-blockdev.c: Include exectool.h. Change sh_exec_tool to
gnupg_exec-tool.
* g13/sh-dmcrypt.c: Ditto.
--
With commit 2ae07f826aa551db8adf714158fce962790a6b54 the exectool code
was moved from a g13 feature branch to common/ so that it could be
used by gpgtar. With this patch we finally remove the original code
and use the one in common/.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g13/sh-blockdev.c')
| -rw-r--r-- | g13/sh-blockdev.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/g13/sh-blockdev.c b/g13/sh-blockdev.c index 2d431ea24..4b4dde464 100644 --- a/g13/sh-blockdev.c +++ b/g13/sh-blockdev.c @@ -29,6 +29,7 @@ #include "g13-syshelp.h" #include <assuan.h> #include "i18n.h" +#include "exectool.h" #include "keyblob.h" #ifndef HAVE_STRTOULL @@ -52,7 +53,7 @@ sh_blockdev_getsz (const char *name, unsigned long long *r_nblocks) argv[0] = "--getsz"; argv[1] = name; argv[2] = NULL; - err = sh_exec_tool ("/sbin/blockdev", argv, NULL, &result, NULL); + err = gnupg_exec_tool ("/sbin/blockdev", argv, NULL, &result, NULL); if (!err) { gpg_err_set_errno (0); @@ -85,7 +86,7 @@ sh_is_empty_partition (const char *name) argv[3] = "UUID"; argv[4] = name; argv[5] = NULL; - err = sh_exec_tool ("/sbin/blkid", argv, NULL, &buffer, NULL); + err = gnupg_exec_tool ("/sbin/blkid", argv, NULL, &buffer, NULL); if (err) return gpg_error (GPG_ERR_FALSE); if (*buffer) @@ -102,7 +103,7 @@ sh_is_empty_partition (const char *name) argv[3] = "PARTUUID"; argv[4] = name; argv[5] = NULL; - err = sh_exec_tool ("/sbin/blkid", argv, NULL, &buffer, NULL); + err = gnupg_exec_tool ("/sbin/blkid", argv, NULL, &buffer, NULL); if (err) return gpg_error (GPG_ERR_FALSE); if (!*buffer) |