gpgsm does now build and a dummy server can be started.

3 files changed, 80 insertions, 2 deletions

diff --git a/assuan/Makefile.am b/assuan/Makefile.am
index c7f449520..ad415afe5 100644
--- a/assuan/Makefile.am
+++ b/assuan/Makefile.am
@@ -20,6 +20,7 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = -I.. -I$(top_srcdir)/include
+BUILT_SOURCES = assuan-errors.c
 
 noinst_LIBRARIES = libassuan.a
 
@@ -29,7 +30,11 @@ libassuan_a_SOURCES = \
 	assuan.h \
 	assuan-defs.h \
 	assuan-util.c \
+	assuan-errors.c \
 	assuan-buffer.c \
 	assuan-handler.c \
 	assuan-pipe-server.c 
 
+
+assuan-errors.c : assuan.h
+	$(srcdir)/mkerrors < $(srcdir)/assuan.h > assuan-errors.c
diff --git a/assuan/assuan.h b/assuan/assuan.h
index 6fa0952a7..b70b1613d 100644
--- a/assuan/assuan.h
+++ b/assuan/assuan.h
@@ -76,8 +76,8 @@ int assuan_register_command (ASSUAN_CONTEXT ctx,
 
 
 /*-- assuan-pipe-server.c --*/
-
-
+int assuan_init_pipe_server (ASSUAN_CONTEXT *r_ctx, int filedes[2]);
+void assuan_deinit_pipe_server (ASSUAN_CONTEXT ctx);
 
 
 /*-- assuan-util.c --*/
@@ -85,6 +85,8 @@ void assuan_set_malloc_hooks ( void *(*new_alloc_func)(size_t n),
                                void *(*new_realloc_func)(void *p, size_t n),
                                void (*new_free_func)(void*) );
 
+/*-- assuan-errors.c (built) --*/
+const char *assuan_strerror (AssuanError err);
 
 
 #ifdef __cplusplus
diff --git a/assuan/mkerrors b/assuan/mkerrors
new file mode 100755
index 000000000..0906cdae1
--- /dev/null
+++ b/assuan/mkerrors
@@ -0,0 +1,71 @@
+#!/bin/sh
+# mkerrors - Extract error strings from assuan.h
+#            and create C source for assuan_strerror
+#	Copyright (C) 2001 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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
+
+cat <<EOF
+/* Generated automatically by mkerrors */
+/* Do not edit! */
+
+#include <stdio.h>
+#include "assuan.h"
+
+/**
+ * assuan_strerror:
+ * @err:  Error code 
+ * 
+ * This function returns a textual representaion of the given
+ * errorcode. If this is an unknown value, a string with the value
+ * is returned (Beware: it is hold in a static buffer).
+ * 
+ * Return value: String with the error description.
+ **/
+const char *
+assuan_strerror (AssuanError err)
+{
+  const char *s;
+  static char buf[25];
+
+  switch (err)
+    {
+EOF
+
+awk '
+/ASSUAN_No_Error/    { okay=1 }
+!okay              {next}
+/}/                { exit 0 }
+/ASSUAN_[A-Za-z_]*/ { print_code($1) }
+
+
+function print_code( s )
+{
+printf "    case %s: s=\"", s ;
+gsub(/_/, " ", s );
+printf "%s\"; break;\n", substr(s,8);
+}
+'
+
+cat <<EOF
+    default:  sprintf (buf, "ec=%d", err ); s=buf; break;
+    }
+
+  return s;
+}
+
+EOF
\ No newline at end of file