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

common: Rename sh-exectool to exectool.

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

14
tools/gpgtar-list.c
View file

@ -26,7 +26,7 @@
#include "i18n.h"
#include "gpgtar.h"
#include "../common/sh-exectool.h"
#include "../common/exectool.h"
@ -64,7 +64,7 @@ parse_xoctal (const void *data, size_t length, const char *filename)
}
else
{
log_error ("%s: invalid octal number encountered - assuming 0\n",
log_error ("%s: invalid octal number encountered - assuming 0\n",
filename);
value = 0;
break;
@ -83,7 +83,7 @@ parse_header (const void *record, const char *filename)
tar_header_t header;
int use_prefix;
use_prefix = (!memcmp (raw->magic, "ustar", 5)
use_prefix = (!memcmp (raw->magic, "ustar", 5)
&& (raw->magic[5] == ' ' || !raw->magic[5]));
@ -135,7 +135,7 @@ parse_header (const void *record, const char *filename)
n = 0;
memcpy (header->name+n, raw->name, namelen);
header->name[n+namelen] = 0;
header->mode = parse_xoctal (raw->mode, sizeof raw->mode, filename);
header->uid = parse_xoctal (raw->uid, sizeof raw->uid, filename);
header->gid = parse_xoctal (raw->gid, sizeof raw->gid, filename);
@ -161,7 +161,7 @@ parse_header (const void *record, const char *filename)
header->nrecords = (header->size + RECORDSIZE-1)/RECORDSIZE;
else
header->nrecords = 0;
return header;
}
@ -325,8 +325,8 @@ gpgtar_list (const char *filename, int decrypt)
argv[i++] = NULL;
assert (i == strlist_length (opt.gpg_arguments) + 2);
err = sh_exec_tool_stream (opt.gpg_program, argv,
cipher_stream, stream);
err = gnupg_exec_tool_stream (opt.gpg_program, argv,
cipher_stream, stream);
xfree (argv);
if (err)
goto leave;