GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Base gpgme_get_dirinfo(uiserver-socket) on the socket dir.

Browse Source 
* src/dirinfo.c (dirname_len): New.
(parse_output): Change computation of UISRV_SOCKET.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-08-22 16:32:14 +02:00
parent 3e60788810
commit c9e7dcb100
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/dirinfo.c
View File

@ -70,6 +70,15 @@ _gpgme_dirinfo_disable_gpgconf (void)
} }
/* Return the length of the directory part including the trailing
* slash of NAME. */
static size_t
dirname_len (const char *name)
{
return _gpgme_get_basename (name) - name;
}
/* Parse the output of "gpgconf --list-dirs". This function expects /* Parse the output of "gpgconf --list-dirs". This function expects
that DIRINFO_LOCK is held by the caller. If COMPONENTS is set, the that DIRINFO_LOCK is held by the caller. If COMPONENTS is set, the
output of --list-components is expected. */ output of --list-components is expected. */
@ -77,6 +86,7 @@ static void
parse_output (char *line, int components) parse_output (char *line, int components)
{ {
char *value, *p; char *value, *p;
size_t n;
value = strchr (line, ':'); value = strchr (line, ':');
if (!value) if (!value)
@ -110,22 +120,25 @@ parse_output (char *line, int components)
else else
{ {
if (!strcmp (line, "homedir") && !dirinfo.homedir) if (!strcmp (line, "homedir") && !dirinfo.homedir)
dirinfo.homedir = strdup (value);
else if (!strcmp (line, "agent-socket") && !dirinfo.agent_socket)
{ {
const char name[] = "S.uiserver"; const char name[] = "S.uiserver";
char *buffer;
dirinfo.homedir = strdup (value); dirinfo.agent_socket = strdup (value);
if (dirinfo.homedir) if (dirinfo.agent_socket)
{ {
dirinfo.uisrv_socket = malloc (strlen (dirinfo n = dirname_len (dirinfo.agent_socket);
.homedir) buffer = malloc (n + strlen (name) + 1);
+ 1 + strlen (name) + 1); if (buffer)
if (dirinfo.uisrv_socket) {
strcpy (stpcpy (stpcpy (dirinfo.uisrv_socket, dirinfo.homedir), strncpy (buffer, dirinfo.agent_socket, n);
DIRSEP_S), name); strcpy (buffer + n, name);
dirinfo.uisrv_socket = buffer;
}
} }
} }
else if (!strcmp (line, "agent-socket") && !dirinfo.agent_socket)
dirinfo.agent_socket = strdup (value);
} }
} }