First set of changes to backport the new card code from 2.0.

For compatibility reasons a few new files had to be added.
Also added estream-printf as this is now used in app-openpgp.c and provides
a better and generic asprintf implementation than the hack we used for the
W32 code in ttyio.c.  Card code is not yet finished.

include/ChangeLog

@@ -1,3 +1,15 @@
+2009-07-21  Werner Koch  <wk@g10code.com>
+
+	* estream-printf.h: New.  Taken from libestream.x
+
+2009-07-20  Werner Koch  <wk@g10code.com>
+
+	* types.h (strlist_t): Add new alias for STRLIST.
+
+	* memory.h (xtrymalloc,xtrystrdup): New.
+
+	* util.h: Add prototypes for util/convert.c.
+
 2009-05-26  David Shaw  <dshaw@jabberwocky.com>
 
 	* http.h: Pass in a STRLIST for additional headers on http_open

include/distfiles

@@ -15,5 +15,6 @@ dynload.h
 assuan.h
 compat.h
 srv.h
+estream-printf.h
 
 ChangeLog

include/estream-printf.h

@@ -0,0 +1,110 @@
+/* estream-printf.h - Versatile C-99 compliant printf formatting.
+ * Copyright (C) 2007 g10 Code GmbH
+ *
+ * This file is part of Libestream.
+ *
+ * Libestream 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 of the License,
+ * or (at your option) any later version.
+ *
+ * Libestream 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 Libestream; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ESTREAM_PRINTF_H
+#define ESTREAM_PRINTF_H
+
+#include <stdarg.h>
+#include <stdio.h>
+
+/* To use this file with libraries the following macro is useful:
+
+     #define _ESTREAM_EXT_SYM_PREFIX _foo_
+   
+       This prefixes all external symbols with "_foo_".
+
+   For the implementation of the code (estream-printf.c) the following
+   macros may be used to tune the implementation for certain systems:
+
+     #define _ESTREAM_PRINTF_MALLOC foo_malloc
+     #define _ESTREAM_PRINTF_FREE   foo_free
+
+       Make estream_asprintf and estream_vasprintf use foo_malloc and
+       foo_free instead of the standard malloc and free functions to
+       allocate the memory returned to the caller.
+
+     #define  _ESTREAM_PRINTF_EXTRA_INCLUDE "foo.h"
+
+       This includes the file "foo.h" which may provide prototypes for
+       the custom memory allocation functions.
+ */
+
+
+#ifdef _ESTREAM_EXT_SYM_PREFIX
+#ifndef _ESTREAM_PREFIX
+#define _ESTREAM_PREFIX1(x,y)  x ## y
+#define _ESTREAM_PREFIX2(x,y) _ESTREAM_PREFIX1(x,y)
+#define _ESTREAM_PREFIX(x)    _ESTREAM_PREFIX2(_ESTREAM_EXT_SYM_PREFIX,x)
+#endif /*_ESTREAM_PREFIX*/
+#define estream_printf_out_t  _ESTREAM_PREFIX(estream_printf_out_t)
+#define estream_format        _ESTREAM_PREFIX(estream_format)
+#define estream_printf        _ESTREAM_PREFIX(estream_printf)
+#define estream_fprintf       _ESTREAM_PREFIX(estream_fprintf)
+#define estream_vfprintf      _ESTREAM_PREFIX(estream_vfprintf)
+#define estream_snprintf      _ESTREAM_PREFIX(estream_snprintf)
+#define estream_vsnprintf     _ESTREAM_PREFIX(estream_vsnprintf)
+#define estream_asprintf      _ESTREAM_PREFIX(estream_asprintf)
+#define estream_vasprintf     _ESTREAM_PREFIX(estream_vasprintf)
+#endif /*_ESTREAM_EXT_SYM_PREFIX*/
+
+#ifndef _ESTREAM_GCC_A_PRINTF
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
+# define _ESTREAM_GCC_A_PRINTF( f, a )  __attribute__ ((format (printf,f,a)))
+#else
+# define _ESTREAM_GCC_A_PRINTF( f, a )
+#endif
+#endif /*_ESTREAM_GCC_A_PRINTF*/
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#if 0
+}
+#endif
+#endif
+
+
+typedef int (*estream_printf_out_t)
+     (void *outfncarg,  const char *buf, size_t buflen);
+
+int estream_format (estream_printf_out_t outfnc, void *outfncarg,
+                    const char *format, va_list vaargs) 
+     _ESTREAM_GCC_A_PRINTF(3,0);
+int estream_printf (const char *format, ...) 
+     _ESTREAM_GCC_A_PRINTF(1,2);
+int estream_fprintf (FILE *fp, const char *format, ... )
+     _ESTREAM_GCC_A_PRINTF(2,3);
+int estream_vfprintf (FILE *fp, const char *format, va_list arg_ptr)
+     _ESTREAM_GCC_A_PRINTF(2,0);
+int estream_snprintf (char *buf, size_t bufsize, const char *format, ...)
+     _ESTREAM_GCC_A_PRINTF(3,4);
+int estream_vsnprintf (char *buf,size_t bufsize, 
+                       const char *format, va_list arg_ptr) 
+     _ESTREAM_GCC_A_PRINTF(3,0);
+int estream_asprintf (char **bufp, const char *format, ...)
+     _ESTREAM_GCC_A_PRINTF(2,3);
+int estream_vasprintf (char **bufp, const char *format, va_list arg_ptr)
+     _ESTREAM_GCC_A_PRINTF(2,0);
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /*ESTREAM_PRINTF_H*/

include/memory.h

@@ -30,6 +30,7 @@
 #define M_DBGINFO(a)	     "["__FILE__ ":"  STR(a) "]"
 #endif /* __riscos__ */
 #define xmalloc(n)		m_debug_alloc((n), M_DBGINFO( __LINE__ ) )
+#define xtrymalloc(n)		m_debug_trymalloc ((n), M_DBGINFO( __LINE__ ))
 #define xmalloc_clear(n)	m_debug_alloc_clear((n), M_DBGINFO(__LINE__) )
 #define xmalloc_secure(n)	m_debug_alloc_secure(n), M_DBGINFO(__LINE__) )
 #define xmalloc_secure_clear(n) m_debug_alloc_secure_clear((n), M_DBGINFO(__LINE__) )
@@ -38,8 +39,10 @@
 #define m_check(n)		m_debug_check((n), M_DBGINFO(__LINE__) )
 /*#define m_copy(a)		  m_debug_copy((a), M_DBGINFO(__LINE__) )*/
 #define xstrdup(a)		m_debug_strdup((a), M_DBGINFO(__LINE__) )
+#define xtrystrdup(a)		m_debug_trystrdup((a), M_DBGINFO(__LINE__) )
 
 void *m_debug_alloc( size_t n, const char *info );
+void *m_debug_trymalloc (size_t n, const char *info);
 void *m_debug_alloc_clear( size_t n, const char *info  );
 void *m_debug_alloc_secure( size_t n, const char *info	);
 void *m_debug_alloc_secure_clear( size_t n, const char *info  );
@@ -48,9 +51,11 @@ void m_debug_free( void *p, const char *info  );
 void m_debug_check( const void *a, const char *info );
 /*void *m_debug_copy( const void *a, const char *info );*/
 char *m_debug_strdup( const char *a, const char *info );
+char *m_debug_trystrdup (const char *a, const char *info);
 
 #else
 void *xmalloc( size_t n );
+void *xtrymalloc (size_t n);
 void *xmalloc_clear( size_t n );
 void *xmalloc_secure( size_t n );
 void *xmalloc_secure_clear( size_t n );
@@ -59,6 +64,7 @@ void xfree( void *p );
 void m_check( const void *a );
 /*void *m_copy( const void *a );*/
 char *xstrdup( const char * a);
+char *xtrystrdup (const char *a);
 #endif
 
 size_t m_size( const void *a );

include/types.h

@@ -131,10 +131,12 @@ typedef union {
     double g;
 } PROPERLY_ALIGNED_TYPE;
 
-typedef struct string_list {
+struct string_list {
     struct string_list *next;
     unsigned int flags;
     char d[1];
-} *STRLIST;
+};
+typedef struct string_list *STRLIST;
+typedef struct string_list *strlist_t;
 
 #endif /*G10_TYPES_H*/

include/util.h

@@ -240,11 +240,13 @@ char *read_w32_registry_string( const char *root,
 int write_w32_registry_string(const char *root, const char *dir,
                               const char *name, const char *value);
 
-/*-- strgutil.c --*/
-int vasprintf (char **result, const char *format, va_list args);
-int asprintf (char **buf, const char *fmt, ...);
 #endif /*_WIN32*/
 
+/*-- strgutil.c --*/
+char *xasprintf (const char *fmt, ...);
+char *xtryasprintf (const char *fmt, ...);
+
+
 /*-- pka.c --*/
 char *get_pka_info (const char *address, unsigned char *fpr);
 
@@ -252,6 +254,16 @@ char *get_pka_info (const char *address, unsigned char *fpr);
 int get_cert(const char *name,size_t max_size,IOBUF *iobuf,
 	     unsigned char **fpr,size_t *fpr_len,char **url);
 
+/*-- convert.c --*/
+int hex2bin (const char *string, void *buffer, size_t length);
+int hexcolon2bin (const char *string, void *buffer, size_t length);
+char *bin2hex (const void *buffer, size_t length, char *stringbuf);
+char *bin2hexcolon (const void *buffer, size_t length, char *stringbuf);
+const char *hex2str (const char *hexstring,
+                     char *buffer, size_t bufsize, size_t *buflen);
+char *hex2str_alloc (const char *hexstring, size_t *r_count);
+
+
 /**** other missing stuff ****/
 #ifndef HAVE_ATEXIT  /* For SunOS */
 #define atexit(a)    (on_exit((a),0))