security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

g13: Switch over to common/exectool.c.

Browse source 
* 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 2ae07f826a 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 <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-12-14 10:16:46 +01:00
parent d19d6e1856
commit c5d7045daf
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
5 changed files with 6 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

3
g13/sh-dmcrypt.c
View file

@ -34,6 +34,7 @@
#include <assuan.h>
#include "i18n.h"
#include "utils.h"
#include "exectool.h"
#include "keyblob.h"
/* The standard disk block size (logical). */
@ -104,7 +105,7 @@ check_blockdev (const char *devname)
argv[0] = "deps";
argv[1] = NULL;
err = sh_exec_tool ("/sbin/dmsetup", argv, NULL, &result, NULL);
err = gnupg_exec_tool ("/sbin/dmsetup", argv, NULL, &result, NULL);
}
if (err)
{