a4c80126ae
* src/util.h: Move some prototypes to ... * src/sys-util.h: New. * src/Makefile.am (main_sources): Add sys-util.h. * configure.ac (AH_VERBATIM): Add DIRSEP_C and DIRSEP_S. * src/dirinfo.c: Include sys-util.h. (WANT_GPG_NAME, WANT_GPGSM_NAME, WANT_G13_NAME) (WANT_UISRV_SOCKET): New. (dirinfo): Add corresponding fields. (parse_output): Add arg COMPONENTS and set new fields. (read_gpgconf_dirs): Add arg components and act upon it. (get_gpgconf_item): Call read_gpgconf_dirs two times. Add debug output. (_gpgme_get_default_gpg_name): New. (_gpgme_get_default_gpgsm_name): New. (_gpgme_get_default_g13_name): New. (_gpgme_get_default_gpgconf_name): New. (_gpgme_get_default_uisrv_socket): New. * src/engine-gpg.c, src/engine-g13.c, src/engine-gpgconf.c * src/engine-gpgsm.c, src/engine-uiserver.c: Change to use _gpgme_get_default_ instead of those from sys-util.h. * src/posix-util.c (_gpgme_get_gpg_path): Include sys-util.h. (_gpgme_get_uiserver_socket_path): Remove. * src/w32-util.c (_gpgme_get_gpg_path): Include sys-util.h. (_gpgme_get_uiserver_socket_path): Remove. -- The default engines names are now taken from the output of gpgconf. If gpgconf is not installed gpg 1 is assumed and locate the same was as gpgconf.
87 lines
1.7 KiB
C
87 lines
1.7 KiB
C
/* posix-util.c - Utility functions for Posix
|
|
Copyright (C) 2001 Werner Koch (dd9jn)
|
|
Copyright (C) 2001, 2002, 2004 g10 Code GmbH
|
|
|
|
This file is part of GPGME.
|
|
|
|
GPGME is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU Lesser General Public License as
|
|
published by the Free Software Foundation; either version 2.1 of
|
|
the License, or (at your option) any later version.
|
|
|
|
GPGME is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
02111-1307, USA. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include <config.h>
|
|
#endif
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#include "util.h"
|
|
#include "sys-util.h"
|
|
|
|
const char *
|
|
_gpgme_get_gpg_path (void)
|
|
{
|
|
#ifdef GPG_PATH
|
|
return GPG_PATH;
|
|
#else
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
const char *
|
|
_gpgme_get_gpgsm_path (void)
|
|
{
|
|
#ifdef GPGSM_PATH
|
|
return GPGSM_PATH;
|
|
#else
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
const char *
|
|
_gpgme_get_gpgconf_path (void)
|
|
{
|
|
#ifdef GPGCONF_PATH
|
|
return GPGCONF_PATH;
|
|
#else
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
const char *
|
|
_gpgme_get_g13_path (void)
|
|
{
|
|
#ifdef G13_PATH
|
|
return G13_PATH;
|
|
#else
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
|
|
/* See w32-util.c */
|
|
int
|
|
_gpgme_get_conf_int (const char *key, int *value)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
_gpgme_allow_set_foreground_window (pid_t pid)
|
|
{
|
|
(void)pid;
|
|
/* Not needed. */
|
|
}
|