mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-04 22:57:47 +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>
122 lines
3.9 KiB
C
122 lines
3.9 KiB
C
/* mischelp.h - Miscellaneous helper macros and functions
|
|
* Copyright (C) 1999, 2000, 2001, 2002, 2003,
|
|
* 2006, 2007, 2009 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_MISCHELP_H
|
|
#define LIBJNLIB_MISCHELP_H
|
|
|
|
|
|
/* Check whether the files NAME1 and NAME2 are identical. This is for
|
|
example achieved by comparing the inode numbers of the files. */
|
|
int same_file_p (const char *name1, const char *name2);
|
|
|
|
|
|
#ifndef HAVE_TIMEGM
|
|
#include <time.h>
|
|
time_t timegm (struct tm *tm);
|
|
#endif /*!HAVE_TIMEGM*/
|
|
|
|
|
|
#define DIM(v) (sizeof(v)/sizeof((v)[0]))
|
|
#define DIMof(type,member) DIM(((type *)0)->member)
|
|
|
|
|
|
#undef JNLIB_GCC_HAVE_PUSH_PRAGMA
|
|
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
|
|
# define JNLIB_GCC_M_FUNCTION 1
|
|
# define JNLIB_GCC_A_NR __attribute__ ((noreturn))
|
|
# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4 )
|
|
# define JNLIB_GCC_HAVE_PUSH_PRAGMA 1
|
|
# define JNLIB_GCC_A_PRINTF( f, a ) \
|
|
__attribute__ ((format (__gnu_printf__,f,a)))
|
|
# define JNLIB_GCC_A_NR_PRINTF( f, a ) \
|
|
__attribute__ ((noreturn, format (__gnu_printf__,f,a)))
|
|
# else
|
|
# define JNLIB_GCC_A_PRINTF( f, a ) __attribute__ ((format (printf,f,a)))
|
|
# define JNLIB_GCC_A_NR_PRINTF( f, a ) \
|
|
__attribute__ ((noreturn, format (printf,f,a)))
|
|
# endif
|
|
#else
|
|
# define JNLIB_GCC_A_NR
|
|
# define JNLIB_GCC_A_PRINTF( f, a )
|
|
# define JNLIB_GCC_A_NR_PRINTF( f, a )
|
|
#endif
|
|
|
|
|
|
/* To avoid that a compiler optimizes certain memset calls away, these
|
|
macros may be used instead. */
|
|
#define wipememory2(_ptr,_set,_len) do { \
|
|
volatile char *_vptr=(volatile char *)(_ptr); \
|
|
size_t _vlen=(_len); \
|
|
while(_vlen) { *_vptr=(_set); _vptr++; _vlen--; } \
|
|
} while(0)
|
|
#define wipememory(_ptr,_len) wipememory2(_ptr,0,_len)
|
|
|
|
|
|
/* Include hacks which are mainly required for Slowaris. */
|
|
#ifdef JNLIB_NEED_AFLOCAL
|
|
#ifndef HAVE_W32_SYSTEM
|
|
# include <sys/socket.h>
|
|
# include <sys/un.h>
|
|
#else
|
|
# ifdef HAVE_WINSOCK2_H
|
|
# include <winsock2.h>
|
|
# endif
|
|
# include <windows.h>
|
|
#endif
|
|
|
|
#ifndef PF_LOCAL
|
|
# ifdef PF_UNIX
|
|
# define PF_LOCAL PF_UNIX
|
|
# else
|
|
# define PF_LOCAL AF_UNIX
|
|
# endif
|
|
#endif /*PF_LOCAL*/
|
|
#ifndef AF_LOCAL
|
|
# define AF_LOCAL AF_UNIX
|
|
#endif /*AF_UNIX*/
|
|
|
|
/* We used to avoid this macro in GnuPG and inlined the AF_LOCAL name
|
|
length computation directly with the little twist of adding 1 extra
|
|
byte. It seems that this was needed once on an old HP/UX box and
|
|
there are also rumours that 4.3 Reno and DEC systems need it. This
|
|
one-off buglet did not harm any current system until it came to Mac
|
|
OS X where the kernel (as of May 2009) exhibited a strange bug: The
|
|
systems basically froze in the connect call if the passed name
|
|
contained an invalid directory part. Ignore the old Unices. */
|
|
#ifndef SUN_LEN
|
|
# define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \
|
|
+ strlen ((ptr)->sun_path))
|
|
#endif /*SUN_LEN*/
|
|
#endif /*JNLIB_NEED_AFLOCAL*/
|
|
|
|
|
|
#endif /*LIBJNLIB_MISCHELP_H*/
|