diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | gpgme/ChangeLog | 5 | ||||
| -rw-r--r-- | gpgme/Makefile.am | 2 | ||||
| -rw-r--r-- | gpgme/stpcpy.c | 50 |
6 files changed, 69 insertions, 13 deletions
@@ -1,3 +1,12 @@ +2002-08-21 Marcus Brinkmann <[email protected]> + + * Makefile.am (SUBDIRS): Remove jnlib. + * configure.ac: Don't check for unsigned short or unsigned long. + Don't check for memicmp, strlwr, strtoul, memmove, stricmp. + Make stpcpy a replaced function. + Don't define HAVE_JNLIB_LOGGING. + Don't generate jnlib/Makefile. + 2002-07-02 Werner Koch <[email protected]> * configure.ac: Bumbed version number to 0.3.9; add a comment on diff --git a/Makefile.am b/Makefile.am index 0bf354d0..ab82211c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,7 @@ else gpgmeplug = endif -SUBDIRS = ${assuan} jnlib gpgme ${tests} doc ${bonobo} ${complus} ${gpgmeplug} +SUBDIRS = ${assuan} gpgme ${tests} doc ${bonobo} ${complus} ${gpgmeplug} # Fix the version of the spec file and create a file named VERSION # to be used for patch's Prereq: feature. diff --git a/configure.ac b/configure.ac index aa0b21df..8f114336 100644 --- a/configure.ac +++ b/configure.ac @@ -138,11 +138,7 @@ GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF) GNUPG_CHECK_TYPEDEF(u16, HAVE_U16_TYPEDEF) GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF) -dnl We should not use them in this software; -dnl However jnlib/types.h needs them - so we take the easy way. -AC_CHECK_SIZEOF(unsigned short) AC_CHECK_SIZEOF(unsigned int) -AC_CHECK_SIZEOF(unsigned long) dnl dnl Checks for compiler features. @@ -155,8 +151,8 @@ fi dnl dnl Checks for library functions. dnl -dnl These are needed by libjnlib -AC_CHECK_FUNCS(memicmp stpcpy strlwr strtoul memmove stricmp) + +AC_REPLACE_FUNCS(stpcpy) # asprintf() is at least used in assuan AC_REPLACE_FUNCS(vasprintf) @@ -165,10 +161,6 @@ AC_REPLACE_FUNCS(vasprintf) AC_REPLACE_FUNCS(fopencookie) -dnl We use jnlib, so tell other modules about it -AC_DEFINE(HAVE_JNLIB_LOGGING, 1, - [Defined if jnlib style logging fucntions are available.]) - dnl dnl Checks for system services dnl @@ -258,7 +250,7 @@ dnl dnl Create config files dnl -AC_CONFIG_FILES(Makefile assuan/Makefile jnlib/Makefile gpgme/Makefile +AC_CONFIG_FILES(Makefile assuan/Makefile gpgme/Makefile tests/Makefile tests/gpg/Makefile tests/gpgsm/Makefile doc/Makefile bonobo/Makefile complus/Makefile gpgmeplug/Makefile) diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 9576c01a..43dd2afb 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2002-08-21 Marcus Brinkmann <[email protected]> + + * stpcpy.c: New file from gnulib. + * Makefile.am (assuan_libobjs): Remove jnlib. + 2002-08-20 Marcus Brinkmann <[email protected]> * gpgme.h: Add prototype for gpgme_op_import_ext. diff --git a/gpgme/Makefile.am b/gpgme/Makefile.am index 4f28440e..a2db61bc 100644 --- a/gpgme/Makefile.am +++ b/gpgme/Makefile.am @@ -32,7 +32,7 @@ libgpgme_la_LDFLAGS = -version-info \ @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@ if BUILD_ASSUAN AM_CPPFLAGS = -I$(top_srcdir)/assuan -assuan_libobjs = ../assuan/libassuan.la ../jnlib/libjnlib.la @LIBOBJS@ +assuan_libobjs = ../assuan/libassuan.la @LIBOBJS@ else assuan_libobjs = endif diff --git a/gpgme/stpcpy.c b/gpgme/stpcpy.c new file mode 100644 index 00000000..a01636cd --- /dev/null +++ b/gpgme/stpcpy.c @@ -0,0 +1,50 @@ +/* stpcpy.c -- copy a string and return pointer to end of new string + Copyright (C) 1992, 1995, 1997, 1998 Free Software Foundation, Inc. + + NOTE: The canonical source of this file is maintained with the GNU C Library. + Bugs can be reported to [email protected]. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + This program 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 copy of the GNU 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 <string.h> + +#undef __stpcpy +#undef stpcpy + +#ifndef weak_alias +# define __stpcpy stpcpy +#endif + +/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */ +char * +__stpcpy (char *dest, const char *src) +{ + register char *d = dest; + register const char *s = src; + + do + *d++ = *s; + while (*s++ != '\0'); + + return d - 1; +} +#ifdef weak_alias +weak_alias (__stpcpy, stpcpy) +#endif |