security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +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

7
g13/sh-blockdev.c
View file

@ -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)