mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-01 22:28:02 +02:00
17bcd08708
* common/libjnlib-config.h: Remove. * common/common-defs.h (getenv) [HAVE_GETENV]: New. From removed header. (getpid) [HAVE_W32CE_SYSTEM]: New. From removed header. * common/argparse.c: Include util.h and common-defs.h. Replace jnlib_ macro names for non-GNUPG builds by x* names. * common/dotlock.c: Ditto. * common/logging.c: Include util.h and common-defs.h. Replace jnlib_ symbol names by x* names. * common/strlist.c: Ditto. * common/utf8conv.c: Ditto. * common/w32-reg.c: Ditto. * common/mischelp.c: Ditto. Also remove _jnlib_free. * common/stringhelp.c: Ditto. (JNLIB_LOG_WITH_PREFIX): Do not depend on this macro. * common/logging.h (JNLIB_LOG_WITH_PREFIX): Do not depend on this macro. -- This is part 1 of the patches to merge the jnlib files into common/. It does not make much sense to keep jnlib/ files separate. They are not often use elsewhere and maintaining the complex marcos stuff is too troublesome for the future. Signed-off-by: Werner Koch <wk@gnupg.org>
98 lines
2.2 KiB
C
98 lines
2.2 KiB
C
/* dynload.h - Wrapper functions for run-time dynamic loading
|
|
* Copyright (C) 2003, 2010 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of JNLIB, which is a subsystem of GnuPG.
|
|
*
|
|
* JNLIB is free software; you can redistribute it and/or modify it
|
|
* under the terms of either
|
|
*
|
|
* - the GNU Lesser General Public License as published by the Free
|
|
* Software Foundation; either version 3 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* or
|
|
*
|
|
* - the GNU General Public License as published by the Free
|
|
* Software Foundation; either version 2 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* or both in parallel, as here.
|
|
*
|
|
* JNLIB 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
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copies of the GNU General Public License
|
|
* and the GNU Lesser General Public License along with this program;
|
|
* if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef LIBJNLIB_DYNLOAD_H
|
|
#define LIBJNLIB_DYNLOAD_H
|
|
|
|
#ifndef __MINGW32__
|
|
# include <dlfcn.h>
|
|
#else
|
|
# include <windows.h>
|
|
# include "utf8conv.h"
|
|
# include "mischelp.h"
|
|
# define RTLD_LAZY 0
|
|
|
|
static inline void *
|
|
dlopen (const char *name, int flag)
|
|
{
|
|
void *hd;
|
|
#ifdef HAVE_W32CE_SYSTEM
|
|
wchar_t *wname = utf8_to_wchar (name);
|
|
hd = wname? LoadLibrary (wname) : NULL;
|
|
xfree (wname);
|
|
#else
|
|
hd = LoadLibrary (name);
|
|
#endif
|
|
(void)flag;
|
|
return hd;
|
|
}
|
|
|
|
static inline void *
|
|
dlsym (void *hd, const char *sym)
|
|
{
|
|
if (hd && sym)
|
|
{
|
|
#ifdef HAVE_W32CE_SYSTEM
|
|
wchar_t *wsym = utf8_to_wchar (sym);
|
|
void *fnc = wsym? GetProcAddress (hd, wsym) : NULL;
|
|
xfree (wsym);
|
|
#else
|
|
void *fnc = GetProcAddress (hd, sym);
|
|
#endif
|
|
if (!fnc)
|
|
return NULL;
|
|
return fnc;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
|
|
static inline const char *
|
|
dlerror (void)
|
|
{
|
|
static char buf[32];
|
|
snprintf (buf, sizeof buf, "ec=%lu", GetLastError ());
|
|
return buf;
|
|
}
|
|
|
|
|
|
static inline int
|
|
dlclose (void * hd)
|
|
{
|
|
if (hd)
|
|
{
|
|
CloseHandle (hd);
|
|
return 0;
|
|
}
|
|
return -1;
|
|
}
|
|
# endif /*__MINGW32__*/
|
|
#endif /*LIBJNLIB_DYNLOAD_H*/
|