Removed directories which are only used by the 1.9 branch

31 files changed, 0 insertions, 6102 deletions

diff --git a/common/ChangeLog b/common/ChangeLog
deleted file mode 100644
index 4870a4a5d..000000000
--- a/common/ChangeLog
+++ /dev/null
@@ -1,219 +0,0 @@
-2003-07-15  Werner Koch  <[email protected]>
-
-	* simple-pwquery.c, simple-pwquery.h:  New; moved from ../agent.  
-	* Makefile.am (libsimple_pwquery_a_LIBADD): New.
-
-2003-06-25  Werner Koch  <[email protected]>
-
-	* maperror.c (map_to_assuan_status): Directly map 0 to 0.
-
-2003-06-17  Werner Koch  <[email protected]>
-
-	* gettime.c (scan_isodatestr,add_days_to_timestamp,strtimevalue)
-	(strtimestamp,asctimestamp): New.  Code taken from gnupg 1.3.2
-	mischelp.c.
-
-	* yesno.c: New.  Code taken from gnupg 1.3.2 mischelp.c
-
-	* miscellaneous.c: New.
-
-	* util.h: Include utf8conf.h
-
-2003-06-16  Werner Koch  <[email protected]>
-
-	* gettime.c (make_timestamp): New.
-
-	* ttyio.c: New. Taken from gnupg 1.2.
-	* ttyio.h: Move from ../include.
-
-2003-06-13  Werner Koch  <[email protected]>
-
-	* util.h (seterr): Removed macro.
-	(xmalloc_secure,xcalloc_secure): New.
-
-2003-06-11  Werner Koch  <[email protected]>
-
-	* iobuf.c (iobuf_writebyte,iobuf_write): Return error code from
-	iobuf_flush.
-	(iobuf_writestr): Ditto.
-
-2003-06-10  Werner Koch  <[email protected]>
-
-	* iobuf.c, iobuf.h: New. Taken from current gnupg 1.3 CVS.  Run
-	indent on it and adjusted error handling to libgpg-error style.
-	Replaced IOBUF by iobuf_t. Renamed malloc functions.
-
-2003-06-04  Werner Koch  <[email protected]>
-
-	* errors.h: Removed all error codes.  We keep the status codes for
-	now.
-	* Makefile.am: Do not create errors.c anymore; remove it from the
-	sources.
-
-	* maperror.c: Don't include error.h.  Change all error codes to
-	libgpg-error style.
-	(map_assuan_err): Changed to new Assuan error code convention.
-	(map_to_assuan_status): Likewise.
-	(map_gcry_err,map_kbx_err): Not needed.  For now dummy functions.
-
-	* membuf.c, membuf.h: New.  Code taken from ../sm/call-agent.h.
-	* Makefile.am: Added above.
-
-2003-04-29  Werner Koch  <[email protected]>
-
-	* util.h (fopencokokie): Removed prototype and struct.
-
-	* fopencookie.c: Removed.
-
-	* maperror.c: Use system assuan.h
-
-2002-10-31  Neal H. Walfield  <[email protected]>
-
-	* isascii.c: New file.
-	* putc_unlocked.c: Likewise.
-
-2002-10-28  Neal H. Walfield  <[email protected]>
-
-	* signal.c (caught_fatal_sig): Remove superfluous zero
-	initializer.
-	(caught_sigusr1): Likewise.
-
-2002-09-04  Neal H. Walfield  <[email protected]>
-
-	* vasprintf.c (vasprintf) [va_copy]: Use va_copy.
-	[!va_copy && __va_copy]: Use __va_copy.
-	[!va_copy && !__va_copy]: Only now fall back to using memcpy.
-
-2002-08-21  Werner Koch  <[email protected]>
-
-	* errors.h: Added STATUS_IMPORT_PROBLEM.
-
-2002-08-20  Werner Koch  <[email protected]>
-
-	* vasprintf.c: Hack to handle NULL for %s.
-
-2002-08-09  Werner Koch  <[email protected]>
-
-	* signal.c: New. Taken from GnuPG 1.1.91.
-
-2002-07-23  Werner Koch  <[email protected]>
-
-	* util.h (_IO_cookie_io_functions_t): Fixed typo.  Noted by
-	Richard Lefebvre.
-
-2002-07-22  Werner Koch  <[email protected]>
-
-	* fseeko.c, ftello.c: New.
-
-2002-06-28  Werner Koch  <[email protected]>
-
-	* maperror.c (map_to_assuan_status): Map more errorcodes to Bad
-	Certificate.
-
-2002-06-26  Werner Koch  <[email protected]>
-
-	* maperror.c (map_to_assuan_status): Map EOF to No_Data_Available.
-
-2002-06-10  Werner Koch  <[email protected]>
-
-	* errors.h (gnupg_error_token): Add new prototype.
-	(STATUS_ERROR): New.
-
-	* mkerrtok: New.
-	* Makefile.am: Use it to create the new error token function.
-
-2002-06-04  Werner Koch  <[email protected]>
-
-	* maperror.c (map_to_assuan_status): Map Bad_CA_Certificate.
-
-2002-05-23  Werner Koch  <[email protected]>
-
-	* no-pth.c, Makefile.am: Removed.
-
-2002-05-22  Werner Koch  <[email protected]>
-
-	* mkdtemp.c: Replaced byte by unsigned char because it is no longer
-	defined in gcrypt.h.
-
-2002-05-21  Werner Koch  <[email protected]>
-
-	* maperror.c (map_gcry_err): Add libgcrypt's new S-expression errors.
-	(map_ksba_err): Add a few mappings.
-
-2002-05-14  Werner Koch  <[email protected]>
-
-	* gettime.c: New.
-
-2002-05-03  Werner Koch  <[email protected]>
-
-	* errors.h: Added STARUS_EXPSIG and STATUS_EXPKEYSIG.
-
-2002-04-15  Werner Koch  <[email protected]>
-
-	* cryptmiss.c: New.
-
-2002-02-14  Werner Koch  <[email protected]>
-
-	* maperror.c: Add more assuan<->gnupg mappings.
-
-2002-02-12  Werner Koch  <[email protected]>
-
-	* fopencookie.c: Dummy function.
-
-	* vasprintf.c: New.  Taken from binutils-2.9.1 and dropped all non
-	ANSI-C stuff.  Merged with asprintf version.
-
-	* no-pth.c: New.
-
-2002-01-23  Werner Koch  <[email protected]>
-
-	* mkdtemp.c: Copied from gnupg-1.0.6c and changed to use libgcrypt.
-
-2002-01-19  Werner Koch  <[email protected]>
-
-	* sysutils.c: New.  This is the misc.c file from gnupg 1.0.6 with
-	the OpenPGP stuff removed.
-	* sysutils.h: New.
-	
-2002-01-15  Werner Koch  <[email protected]>
-
-	* maperror.c: Add mapping for Not_Trusted. 
-
-2002-01-11  Werner Koch  <[email protected]>
-
-	* maperror.c (map_assuan_err): Codes for CRL
-
-2002-01-08  Werner Koch  <[email protected]>
-
-	* util.h (spacep): New.
-
-2002-01-02  Werner Koch  <[email protected]>
-
-	* maperror.c (map_to_assuan_status): New.  Merged from ../agent
-	and ../sm.
-
-2001-12-20  Werner Koch  <[email protected]>
-
-	* maperror.c (map_gcry_err): Add some mappings.
-
-2001-12-18  Werner Koch  <[email protected]>
-
-	* Makefile.am (AM_CPPFLAGS): Include flags for gcrypt and ksba
-
-2001-12-14  Werner Koch  <[email protected]>
-
-	* util.h (digitp, hexdigitp): New ctype like macros.
-	(atoi_1,atoi_2,atoi_4,xtoi_1,xtoi_2): New.
-	
-	
- Copyright 2001, 2002 Free Software Foundation, Inc.
-
- This file is free software; as a special exception the author gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
-
- This file is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-		
-
diff --git a/common/Makefile.am b/common/Makefile.am
deleted file mode 100644
index 2b99a19eb..000000000
--- a/common/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-# Makefile for common gnupg modules
-# Copyright (C) 2001, 2003 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
-
-## Process this file with automake to produce Makefile.in
-
-EXTRA_DIST = mkerrors mkerrtok
-#INCLUDES = 
-
-noinst_LIBRARIES = libcommon.a libsimple-pwquery.a
-
-AM_CPPFLAGS =  $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
-
-libcommon_a_SOURCES = \
-	util.h i18n.h \
-	errors.h \
-	maperror.c \
-	sysutils.c sysutils.h \
-	cryptmiss.c \
-	gettime.c \
-	yesno.c \
-	miscellaneous.c \
-	membuf.c membuf.h \
-	iobuf.c iobuf.h \
-	ttyio.c ttyio.h \
-	signal.c
-
-
-libcommon_a_LIBADD = @LIBOBJS@
-
-libsimple_pwquery_a_SOURCES = \
-	simple-pwquery.c simple-pwquery.h
-
-libsimple_pwquery_a_LIBADD = @LIBOBJS@
-
-
-
-
-
-
-
-
-
diff --git a/common/README b/common/README
deleted file mode 100644
index a90224bab..000000000
--- a/common/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Stuff used by several modules of GnuPG.
-
-These directories use it:
-
-gpg
-sm
-agent
-
-These directories don't use it:
-
-kbx
\ No newline at end of file
diff --git a/common/cryptmiss.c b/common/cryptmiss.c
deleted file mode 100644
index ae639db1d..000000000
--- a/common/cryptmiss.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* cryptmiss.c - Missing functions in libgcrypt
- *	Copyright (C) 2002 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
- */
-
-#include <config.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "util.h"
-
-char *
-gcry_strdup (const char *string)
-{
-  char *p;
-
-  p = gcry_malloc (strlen (string)+1);
-  if (p)
-    strcpy (p, string);
-  return p;
-}
diff --git a/common/errors.h b/common/errors.h
deleted file mode 100644
index a5643f08a..000000000
--- a/common/errors.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* errors.h - Globally used error codes
- *	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
- */
-
-#ifndef GNUPG_COMMON_ERRORS_H
-#define GNUPG_COMMON_ERRORS_H
-
-#include "util.h"
-
-/* Status codes - fixme: should go into another file */
-enum {
-  STATUS_ENTER,
-  STATUS_LEAVE,
-  STATUS_ABORT,
-  STATUS_GOODSIG,
-  STATUS_BADSIG,
-  STATUS_ERRSIG,
-  STATUS_BADARMOR,
-  STATUS_RSA_OR_IDEA,
-  STATUS_SIGEXPIRED,
-  STATUS_KEYREVOKED,
-  STATUS_TRUST_UNDEFINED,
-  STATUS_TRUST_NEVER,
-  STATUS_TRUST_MARGINAL,
-  STATUS_TRUST_FULLY,
-  STATUS_TRUST_ULTIMATE,
-  
-  STATUS_SHM_INFO,
-  STATUS_SHM_GET,
-  STATUS_SHM_GET_BOOL,
-  STATUS_SHM_GET_HIDDEN,
-  
-  STATUS_NEED_PASSPHRASE,
-  STATUS_VALIDSIG,
-  STATUS_SIG_ID,
-  STATUS_ENC_TO,
-  STATUS_NODATA,
-  STATUS_BAD_PASSPHRASE,
-  STATUS_NO_PUBKEY,
-  STATUS_NO_SECKEY,
-  STATUS_NEED_PASSPHRASE_SYM,
-  STATUS_DECRYPTION_FAILED,
-  STATUS_DECRYPTION_OKAY,
-  STATUS_MISSING_PASSPHRASE,
-  STATUS_GOOD_PASSPHRASE,
-  STATUS_GOODMDC,
-  STATUS_BADMDC,
-  STATUS_ERRMDC,
-  STATUS_IMPORTED,
-  STATUS_IMPORT_PROBLEM,
-  STATUS_IMPORT_RES,
-  STATUS_FILE_START,
-  STATUS_FILE_DONE,
-  STATUS_FILE_ERROR,
-  
-  STATUS_BEGIN_DECRYPTION,
-  STATUS_END_DECRYPTION,
-  STATUS_BEGIN_ENCRYPTION,
-  STATUS_END_ENCRYPTION,
-  
-  STATUS_DELETE_PROBLEM,
-  STATUS_GET_BOOL,
-  STATUS_GET_LINE,
-  STATUS_GET_HIDDEN,
-  STATUS_GOT_IT,
-  STATUS_PROGRESS,
-  STATUS_SIG_CREATED,
-  STATUS_SESSION_KEY,
-  STATUS_NOTATION_NAME,
-  STATUS_NOTATION_DATA,
-  STATUS_POLICY_URL,
-  STATUS_BEGIN_STREAM,
-  STATUS_END_STREAM,
-  STATUS_KEY_CREATED,
-  STATUS_USERID_HIN,
-  STATUS_UNEXPECTED,
-  STATUS_INV_RECP,
-  STATUS_NO_RECP,
-  STATUS_ALREADY_SIGNED,
-
-  STATUS_EXPSIG,
-  STATUS_EXPKEYSIG,
-
-  STATUS_TRUNCATED,
-  STATUS_ERROR
-};
-
-
-/*-- errors.c (build by mkerror and mkerrtok) --*/
-const char *gnupg_strerror (int err);
-const char *gnupg_error_token (int err);
-
-
-#endif /*GNUPG_COMMON_ERRORS_H*/
diff --git a/common/fopencookie.c b/common/fopencookie.c
deleted file mode 100644
index 7862b9a0d..000000000
--- a/common/fopencookie.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* fopencookie.c - Dummy glibc replacement
- * Copyright (C) 2002 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
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdio.h>
-#include <errno.h>
-
-#include "util.h"
-
-FILE * 
-fopencookie (void *cookie, const char *opentype,
-             cookie_io_functions_t funclist)
-{
-  errno = ENOSYS;
-  return NULL;
-}
-
-
diff --git a/common/fseeko.c b/common/fseeko.c
deleted file mode 100644
index f151b09ec..000000000
--- a/common/fseeko.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* fseeko.c - libc replacement function
- * 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
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdio.h>
-
-int
-fseeko (FILE *stream, off_t off, int whence)
-{
-  return fseek (stream, off, whence);
-}
-
-
-
-
-
-
-
-
-
-
diff --git a/common/ftello.c b/common/ftello.c
deleted file mode 100644
index e3141900d..000000000
--- a/common/ftello.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ftello.c - libc replacement function
- * 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
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdio.h>
-
-off_t
-ftello (FILE *stream)
-{
-  long int off;
-
-  off = ftell (stream);
-  if (off == -1)
-    return (off_t)-1;
-  return off;
-}
-
-
-
-
-
-
-
-
-
-
diff --git a/common/gettime.c b/common/gettime.c
deleted file mode 100644
index a7914d348..000000000
--- a/common/gettime.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/* gettime.c - Wrapper for time functions
- *	Copyright (C) 1998, 2002 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
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <time.h>
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
-
-#include "util.h"
-
-static unsigned long timewarp;
-static enum { NORMAL = 0, FROZEN, FUTURE, PAST } timemode;
-
-/* Wrapper for the time(3).  We use this here so we can fake the time
-   for tests */
-time_t 
-gnupg_get_time () 
-{
-  time_t current = time (NULL);
-  if (timemode == NORMAL)
-    return current;
-  else if (timemode == FROZEN)
-    return timewarp;
-  else if (timemode == FUTURE)
-    return current + timewarp;
-  else
-    return current - timewarp;
-}
-
-/* set the time to NEWTIME so that gnupg_get_time returns a time
-   starting with this one.  With FREEZE set to 1 the returned time
-   will never change.  Just for completeness, a value of (time_t)-1
-   for NEWTIME gets you back to rality. Note that this is obviously
-   not thread-safe but this is not required. */
-void
-gnupg_set_time (time_t newtime, int freeze)
-{
-  time_t current = time (NULL);
-
-  if ( newtime == (time_t)-1 || current == newtime)
-    {
-      timemode = NORMAL;
-      timewarp = 0;
-    }
-  else if (freeze)
-    {
-      timemode = FROZEN;
-      timewarp = current;
-    }
-  else if (newtime > current)
-    {
-      timemode = FUTURE;
-      timewarp = newtime - current;
-    }
-  else
-    {
-      timemode = PAST;
-      timewarp = current - newtime;
-    }
-}
-
-/* Returns true when we are in timewarp mode */
-int
-gnupg_faked_time_p (void)
-{
-  return timemode;
-}
-
-
-/* This function is used by gpg because OpenPGP defines the timestamp
-   as an unsigned 32 bit value. */
-u32 
-make_timestamp (void)
-{
-  time_t t = gnupg_get_time ();
-
-  if (t == (time_t)-1)
-    log_fatal ("gnupg_get_time() failed\n");
-  return (u32)t;
-}
-
-
-
-/****************
- * Scan a date string and return a timestamp.
- * The only supported format is "yyyy-mm-dd"
- * Returns 0 for an invalid date.
- */
-u32
-scan_isodatestr( const char *string )
-{
-    int year, month, day;
-    struct tm tmbuf;
-    time_t stamp;
-    int i;
-
-    if( strlen(string) != 10 || string[4] != '-' || string[7] != '-' )
-	return 0;
-    for( i=0; i < 4; i++ )
-	if( !digitp (string+i) )
-	    return 0;
-    if( !digitp (string+5) || !digitp(string+6) )
-	return 0;
-    if( !digitp(string+8) || !digitp(string+9) )
-	return 0;
-    year = atoi(string);
-    month = atoi(string+5);
-    day = atoi(string+8);
-    /* some basic checks */
-    if( year < 1970 || month < 1 || month > 12 || day < 1 || day > 31 )
-	return 0;
-    memset( &tmbuf, 0, sizeof tmbuf );
-    tmbuf.tm_mday = day;
-    tmbuf.tm_mon = month-1;
-    tmbuf.tm_year = year - 1900;
-    tmbuf.tm_isdst = -1;
-    stamp = mktime( &tmbuf );
-    if( stamp == (time_t)-1 )
-	return 0;
-    return stamp;
-}
-
-
-u32
-add_days_to_timestamp( u32 stamp, u16 days )
-{
-    return stamp + days*86400L;
-}
-
-
-/****************
- * Return a string with a time value in the form: x Y, n D, n H
- */
-
-const char *
-strtimevalue( u32 value )
-{
-    static char buffer[30];
-    unsigned int years, days, hours, minutes;
-
-    value /= 60;
-    minutes = value % 60;
-    value /= 60;
-    hours = value % 24;
-    value /= 24;
-    days = value % 365;
-    value /= 365;
-    years = value;
-
-    sprintf(buffer,"%uy%ud%uh%um", years, days, hours, minutes );
-    if( years )
-	return buffer;
-    if( days )
-	return strchr( buffer, 'y' ) + 1;
-    return strchr( buffer, 'd' ) + 1;
-}
-
-
-/****************
- * Note: this function returns GMT
- */
-const char *
-strtimestamp( u32 stamp )
-{
-    static char buffer[11+5];
-    struct tm *tp;
-    time_t atime = stamp;
-    
-    if (atime < 0) {
-        strcpy (buffer, "????" "-??" "-??");
-    }
-    else {
-        tp = gmtime( &atime );
-        sprintf(buffer,"%04d-%02d-%02d",
-                1900+tp->tm_year, tp->tm_mon+1, tp->tm_mday );
-    }
-    return buffer;
-}
-
-/****************
- * Note: this function returns local time
- */
-const char *
-asctimestamp( u32 stamp )
-{
-    static char buffer[50];
-#if defined (HAVE_STRFTIME) && defined (HAVE_NL_LANGINFO)
-      static char fmt[50];
-#endif
-    struct tm *tp;
-    time_t atime = stamp;
-
-    if (atime < 0) {
-        strcpy (buffer, "????" "-??" "-??");
-        return buffer;
-    }
-
-    tp = localtime( &atime );
-#ifdef HAVE_STRFTIME
-#if defined(HAVE_NL_LANGINFO)
-      mem2str( fmt, nl_langinfo(D_T_FMT), DIM(fmt)-3 );
-      if( strstr( fmt, "%Z" ) == NULL )
-	strcat( fmt, " %Z");
-      strftime( buffer, DIM(buffer)-1, fmt, tp );
-#else
-      /* fixme: we should check whether the locale appends a " %Z"
-       * These locales from glibc don't put the " %Z":
-       * fi_FI hr_HR ja_JP lt_LT lv_LV POSIX ru_RU ru_SU sv_FI sv_SE zh_CN
-       */
-      strftime( buffer, DIM(buffer)-1, "%c %Z", tp );
-#endif
-    buffer[DIM(buffer)-1] = 0;
-#else
-    mem2str( buffer, asctime(tp), DIM(buffer) );
-#endif
-    return buffer;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/common/i18n.h b/common/i18n.h
deleted file mode 100644
index 0e13dca4d..000000000
--- a/common/i18n.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* i18n.h
- *	Copyright (C) 1998, 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
- */
-
-#ifndef GNUPG_COMMON_I18N_H
-#define GNUPG_COMMON_I18N_H
-
-#ifdef USE_SIMPLE_GETTEXT
-  int set_gettext_file( const char *filename );
-  const char *gettext( const char *msgid );
-# define _(a) gettext (a)
-# define N_(a) (a)
-#else
-# ifdef HAVE_LOCALE_H
-#  include <locale.h>	
-# endif
-# ifdef ENABLE_NLS
-#  include <libintl.h>
-#  define _(a) gettext (a)
-#  ifdef gettext_noop
-#   define N_(a) gettext_noop (a)
-#  else
-#   define N_(a) (a)
-#  endif
-# else
-#  define _(a) (a)
-#  define N_(a) (a)
-# endif
-#endif /*!USE_SIMPLE_GETTEXT*/
-
-#endif /*GNUPG_COMMON_I18N_H*/
diff --git a/common/iobuf.c b/common/iobuf.c
deleted file mode 100644
index 773e2993b..000000000
--- a/common/iobuf.c
+++ /dev/null
@@ -1,2415 +0,0 @@
-/* iobuf.c  -  file handling
- * Copyright (C) 1998, 1999, 2000, 2001, 2003 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
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <assert.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#ifdef HAVE_DOSISH_SYSTEM
-#include <windows.h>
-#endif
-#ifdef __riscos__
-#include <kernel.h>
-#include <swis.h>
-#endif /* __riscos__ */
-
-#include "memory.h"
-#include "util.h"
-#include "iobuf.h"
-
-#undef FILE_FILTER_USES_STDIO
-
-#ifdef HAVE_DOSISH_SYSTEM
-#define USE_SETMODE 1
-#endif
-
-#ifdef FILE_FILTER_USES_STDIO
-#define my_fileno(a)  fileno ((a))
-#define my_fopen_ro(a,b) fopen ((a),(b))
-#define my_fopen(a,b)    fopen ((a),(b))
-typedef FILE *FILEP_OR_FD;
-#define INVALID_FP    NULL
-#define FILEP_OR_FD_FOR_STDIN  (stdin)
-#define FILEP_OR_FD_FOR_STDOUT  (stdout)
-typedef struct
-{
-  FILE *fp;			/* open file handle */
-  int keep_open;
-  int no_cache;
-  int print_only_name;		/* flags indicating that fname is not a real file */
-  char fname[1];		/* name of the file */
-}
-file_filter_ctx_t;
-#else
-#define my_fileno(a)  (a)
-#define my_fopen_ro(a,b) fd_cache_open ((a),(b))
-#define my_fopen(a,b) direct_open ((a),(b))
-#ifdef HAVE_DOSISH_SYSTEM
-typedef HANDLE FILEP_OR_FD;
-#define INVALID_FP  ((HANDLE)-1)
-#define FILEP_OR_FD_FOR_STDIN  (GetStdHandle (STD_INPUT_HANDLE))
-#define FILEP_OR_FD_FOR_STDOUT (GetStdHandle (STD_OUTPUT_HANDLE))
-#undef USE_SETMODE
-#else
-typedef int FILEP_OR_FD;
-#define INVALID_FP  (-1)
-#define FILEP_OR_FD_FOR_STDIN  (0)
-#define FILEP_OR_FD_FOR_STDOUT (1)
-#endif
-typedef struct
-{
-  FILEP_OR_FD fp;		/* open file handle */
-  int keep_open;
-  int no_cache;
-  int eof_seen;
-  int print_only_name;		/* flags indicating that fname is not a real file */
-  char fname[1];		/* name of the file */
-}
-file_filter_ctx_t;
-
-struct close_cache_s
-{
-  struct close_cache_s *next;
-  FILEP_OR_FD fp;
-  char fname[1];
-};
-typedef struct close_cache_s *CLOSE_CACHE;
-static CLOSE_CACHE close_cache;
-#endif
-
-#ifdef __MINGW32__
-typedef struct
-{
-  int sock;
-  int keep_open;
-  int no_cache;
-  int eof_seen;
-  int print_only_name;		/* flags indicating that fname is not a real file */
-  char fname[1];		/* name of the file */
-}
-sock_filter_ctx_t;
-#endif /*__MINGW32__*/
-
-/* The first partial length header block must be of size 512
- * to make it easier (and efficienter) we use a min. block size of 512
- * for all chunks (but the last one) */
-#define OP_MIN_PARTIAL_CHUNK	  512
-#define OP_MIN_PARTIAL_CHUNK_2POW 9
-
-typedef struct
-{
-  int use;
-  size_t size;
-  size_t count;
-  int partial;			/* 1 = partial header, 2 in last partial packet */
-  char *buffer;			/* used for partial header */
-  size_t buflen;		/* used size of buffer */
-  int first_c;			/* of partial header (which is > 0) */
-  int eof;
-}
-block_filter_ctx_t;
-
-static int special_names_enabled;
-
-static int underflow (iobuf_t a);
-static int translate_file_handle (int fd, int for_write);
-
-#ifndef FILE_FILTER_USES_STDIO
-
-/*
- * Invalidate (i.e. close) a cached iobuf
- */
-static void
-fd_cache_invalidate (const char *fname)
-{
-  CLOSE_CACHE cc;
-
-  assert (fname);
-  if (DBG_IOBUF)
-    log_debug ("fd_cache_invalidate (%s)\n", fname);
-
-  for (cc = close_cache; cc; cc = cc->next)
-    {
-      if (cc->fp != INVALID_FP && !strcmp (cc->fname, fname))
-	{
-	  if (DBG_IOBUF)
-	    log_debug ("                did (%s)\n", cc->fname);
-#ifdef HAVE_DOSISH_SYSTEM
-	  CloseHandle (cc->fp);
-#else
-	  close (cc->fp);
-#endif
-	  cc->fp = INVALID_FP;
-	}
-    }
-}
-
-
-
-static FILEP_OR_FD
-direct_open (const char *fname, const char *mode)
-{
-#ifdef HAVE_DOSISH_SYSTEM
-  unsigned long da, cd, sm;
-  HANDLE hfile;
-
-  /* Note, that we do not handle all mode combinations */
-
-  /* According to the ReactOS source it seems that open() of the
-   * standard MSW32 crt does open the file in share mode which is
-   * something new for MS applications ;-)
-   */
-  if (strchr (mode, '+'))
-    {
-      fd_cache_invalidate (fname);
-      da = GENERIC_READ | GENERIC_WRITE;
-      cd = OPEN_EXISTING;
-      sm = FILE_SHARE_READ | FILE_SHARE_WRITE;
-    }
-  else if (strchr (mode, 'w'))
-    {
-      fd_cache_invalidate (fname);
-      da = GENERIC_WRITE;
-      cd = CREATE_ALWAYS;
-      sm = FILE_SHARE_WRITE;
-    }
-  else
-    {
-      da = GENERIC_READ;
-      cd = OPEN_EXISTING;
-      sm = FILE_SHARE_READ;
-    }
-
-  hfile = CreateFile (fname, da, sm, NULL, cd, FILE_ATTRIBUTE_NORMAL, NULL);
-  return hfile;
-#else
-  int oflag;
-  int cflag = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
-
-  /* Note, that we do not handle all mode combinations */
-  if (strchr (mode, '+'))
-    {
-      fd_cache_invalidate (fname);
-      oflag = O_RDWR;
-    }
-  else if (strchr (mode, 'w'))
-    {
-      fd_cache_invalidate (fname);
-      oflag = O_WRONLY | O_CREAT | O_TRUNC;
-    }
-  else
-    {
-      oflag = O_RDONLY;
-    }
-#ifdef O_BINARY
-  if (strchr (mode, 'b'))
-    oflag |= O_BINARY;
-#endif
-#ifndef __riscos__
-  return open (fname, oflag, cflag);
-#else
-  {
-    struct stat buf;
-    int rc = stat (fname, &buf);
-
-    /* Don't allow iobufs on directories */
-    if (!rc && S_ISDIR (buf.st_mode) && !S_ISREG (buf.st_mode))
-      return __set_errno (EISDIR);
-    else
-      return open (fname, oflag, cflag);
-  }
-#endif
-#endif
-}
-
-
-/*
- * Instead of closing an FD we keep it open and cache it for later reuse 
- * Note that this caching strategy only works if the process does not chdir.
- */
-static void
-fd_cache_close (const char *fname, FILEP_OR_FD fp)
-{
-  CLOSE_CACHE cc;
-
-  assert (fp);
-  if (!fname || !*fname)
-    {
-#ifdef HAVE_DOSISH_SYSTEM
-      CloseHandle (fp);
-#else
-      close (fp);
-#endif
-      if (DBG_IOBUF)
-	log_debug ("fd_cache_close (%p) real\n", (void *) fp);
-      return;
-    }
-  /* try to reuse a slot */
-  for (cc = close_cache; cc; cc = cc->next)
-    {
-      if (cc->fp == INVALID_FP && !strcmp (cc->fname, fname))
-	{
-	  cc->fp = fp;
-	  if (DBG_IOBUF)
-	    log_debug ("fd_cache_close (%s) used existing slot\n", fname);
-	  return;
-	}
-    }
-  /* add a new one */
-  if (DBG_IOBUF)
-    log_debug ("fd_cache_close (%s) new slot created\n", fname);
-  cc = xcalloc (1, sizeof *cc + strlen (fname));
-  strcpy (cc->fname, fname);
-  cc->fp = fp;
-  cc->next = close_cache;
-  close_cache = cc;
-}
-
-/*
- * Do an direct_open on FNAME but first try to reuse one from the fd_cache
- */
-static FILEP_OR_FD
-fd_cache_open (const char *fname, const char *mode)
-{
-  CLOSE_CACHE cc;
-
-  assert (fname);
-  for (cc = close_cache; cc; cc = cc->next)
-    {
-      if (cc->fp != INVALID_FP && !strcmp (cc->fname, fname))
-	{
-	  FILEP_OR_FD fp = cc->fp;
-	  cc->fp = INVALID_FP;
-	  if (DBG_IOBUF)
-	    log_debug ("fd_cache_open (%s) using cached fp\n", fname);
-#ifdef HAVE_DOSISH_SYSTEM
-	  if (SetFilePointer (fp, 0, NULL, FILE_BEGIN) == 0xffffffff)
-	    {
-	      log_error ("rewind file failed on handle %p: ec=%d\n",
-			 fp, (int) GetLastError ());
-	      fp = INVALID_FP;
-	    }
-#else
-	  if (lseek (fp, 0, SEEK_SET) == (off_t) - 1)
-	    {
-	      log_error ("can't rewind fd %d: %s\n", fp, strerror (errno));
-	      fp = INVALID_FP;
-	    }
-#endif
-	  return fp;
-	}
-    }
-  if (DBG_IOBUF)
-    log_debug ("fd_cache_open (%s) not cached\n", fname);
-  return direct_open (fname, mode);
-}
-
-
-#endif /*FILE_FILTER_USES_STDIO */
-
-
-/****************
- * Read data from a file into buf which has an allocated length of *LEN.
- * return the number of read bytes in *LEN. OPAQUE is the FILE * of
- * the stream. A is not used.
- * control may be:
- * IOBUFCTRL_INIT: called just before the function is linked into the
- *		   list of function. This can be used to prepare internal
- *		   data structures of the function.
- * IOBUFCTRL_FREE: called just before the function is removed from the
- *		    list of functions and can be used to release internal
- *		    data structures or close a file etc.
- * IOBUFCTRL_UNDERFLOW: called by iobuf_underflow to fill the buffer
- *		    with new stuff. *RET_LEN is the available size of the
- *		    buffer, and should be set to the number of bytes
- *		    which were put into the buffer. The function
- *		    returns 0 to indicate success, -1 on EOF and
- *		    GPG_ERR_xxxxx for other errors.
- *
- * IOBUFCTRL_FLUSH: called by iobuf_flush() to write out the collected stuff.
- *		    *RET_LAN is the number of bytes in BUF.
- *
- * IOBUFCTRL_CANCEL: send to all filters on behalf of iobuf_cancel.  The
- *		    filter may take appropriate action on this message.
- */
-static int
-file_filter (void *opaque, int control, iobuf_t chain, byte * buf,
-	     size_t * ret_len)
-{
-  file_filter_ctx_t *a = opaque;
-  FILEP_OR_FD f = a->fp;
-  size_t size = *ret_len;
-  size_t nbytes = 0;
-  int rc = 0;
-
-#ifdef FILE_FILTER_USES_STDIO
-  if (control == IOBUFCTRL_UNDERFLOW)
-    {
-      assert (size);		/* need a buffer */
-      if (feof (f))
-	{			/* On terminals you could easiely read as many EOFs as you call         */
-	  rc = -1;		/* fread() or fgetc() repeatly. Every call will block until you press   */
-	  *ret_len = 0;		/* CTRL-D. So we catch this case before we call fread() again.          */
-	}
-      else
-	{
-	  clearerr (f);
-	  nbytes = fread (buf, 1, size, f);
-	  if (feof (f) && !nbytes)
-	    {
-	      rc = -1;		/* okay: we can return EOF now. */
-	    }
-	  else if (ferror (f) && errno != EPIPE)
-	    {
-	      rc = gpg_error_from_errno (errno);
-	      log_error ("%s: read error: %s\n", a->fname, strerror (errno));
-	    }
-	  *ret_len = nbytes;
-	}
-    }
-  else if (control == IOBUFCTRL_FLUSH)
-    {
-      if (size)
-	{
-	  clearerr (f);
-	  nbytes = fwrite (buf, 1, size, f);
-	  if (ferror (f))
-	    {
-	      rc = gpg_error_from_errno (errno);
-	      log_error ("%s: write error: %s\n", a->fname, strerror (errno));
-	    }
-	}
-      *ret_len = nbytes;
-    }
-  else if (control == IOBUFCTRL_INIT)
-    {
-      a->keep_open = a->no_cache = 0;
-    }
-  else if (control == IOBUFCTRL_DESC)
-    {
-      *(char **) buf = "file_filter";
-    }
-  else if (control == IOBUFCTRL_FREE)
-    {
-      if (f != stdin && f != stdout)
-	{
-	  if (DBG_IOBUF)
-	    log_debug ("%s: close fd %d\n", a->fname, fileno (f));
-	  if (!a->keep_open)
-	    fclose (f);
-	}
-      f = NULL;
-      xfree (a);		/* we can free our context now */
-    }
-#else /* !stdio implementation */
-
-  if (control == IOBUFCTRL_UNDERFLOW)
-    {
-      assert (size);		/* need a buffer */
-      if (a->eof_seen)
-	{
-	  rc = -1;
-	  *ret_len = 0;
-	}
-      else
-	{
-#ifdef HAVE_DOSISH_SYSTEM
-	  unsigned long nread;
-
-	  nbytes = 0;
-	  if (!ReadFile (f, buf, size, &nread, NULL))
-	    {
-	      int ec = (int) GetLastError ();
-	      if (ec != ERROR_BROKEN_PIPE)
-		{
-		  rc = gpg_error_from_errno (ec);
-		  log_error ("%s: read error: ec=%d\n", a->fname, ec);
-		}
-	    }
-	  else if (!nread)
-	    {
-	      a->eof_seen = 1;
-	      rc = -1;
-	    }
-	  else
-	    {
-	      nbytes = nread;
-	    }
-
-#else
-
-	  int n;
-
-	  nbytes = 0;
-	  do
-	    {
-	      n = read (f, buf, size);
-	    }
-	  while (n == -1 && errno == EINTR);
-	  if (n == -1)
-	    {			/* error */
-	      if (errno != EPIPE)
-		{
-		  rc = gpg_error_from_errno (errno);
-		  log_error ("%s: read error: %s\n",
-			     a->fname, strerror (errno));
-		}
-	    }
-	  else if (!n)
-	    {			/* eof */
-	      a->eof_seen = 1;
-	      rc = -1;
-	    }
-	  else
-	    {
-	      nbytes = n;
-	    }
-#endif
-	  *ret_len = nbytes;
-	}
-    }
-  else if (control == IOBUFCTRL_FLUSH)
-    {
-      if (size)
-	{
-#ifdef HAVE_DOSISH_SYSTEM
-	  byte *p = buf;
-	  unsigned long n;
-
-	  nbytes = size;
-	  do
-	    {
-	      if (size && !WriteFile (f, p, nbytes, &n, NULL))
-		{
-		  int ec = (int) GetLastError ();
-		  rc = gpg_error_from_errno (ec);
-		  log_error ("%s: write error: ec=%d\n", a->fname, ec);
-		  break;
-		}
-	      p += n;
-	      nbytes -= n;
-	    }
-	  while (nbytes);
-	  nbytes = p - buf;
-#else
-	  byte *p = buf;
-	  int n;
-
-	  nbytes = size;
-	  do
-	    {
-	      do
-		{
-		  n = write (f, p, nbytes);
-		}
-	      while (n == -1 && errno == EINTR);
-	      if (n > 0)
-		{
-		  p += n;
-		  nbytes -= n;
-		}
-	    }
-	  while (n != -1 && nbytes);
-	  if (n == -1)
-	    {
-	      rc = gpg_error_from_errno (errno);
-	      log_error ("%s: write error: %s\n", a->fname, strerror (errno));
-	    }
-	  nbytes = p - buf;
-#endif
-	}
-      *ret_len = nbytes;
-    }
-  else if (control == IOBUFCTRL_INIT)
-    {
-      a->eof_seen = 0;
-      a->keep_open = 0;
-      a->no_cache = 0;
-    }
-  else if (control == IOBUFCTRL_DESC)
-    {
-      *(char **) buf = "file_filter(fd)";
-    }
-  else if (control == IOBUFCTRL_FREE)
-    {
-#ifdef HAVE_DOSISH_SYSTEM
-      if (f != FILEP_OR_FD_FOR_STDIN && f != FILEP_OR_FD_FOR_STDOUT)
-	{
-	  if (DBG_IOBUF)
-	    log_debug ("%s: close handle %p\n", a->fname, f);
-	  if (!a->keep_open)
-	    fd_cache_close (a->no_cache ? NULL : a->fname, f);
-	}
-#else
-      if ((int) f != 0 && (int) f != 1)
-	{
-	  if (DBG_IOBUF)
-	    log_debug ("%s: close fd %d\n", a->fname, f);
-	  if (!a->keep_open)
-	    fd_cache_close (a->no_cache ? NULL : a->fname, f);
-	}
-      f = INVALID_FP;
-#endif
-      xfree (a);		/* we can free our context now */
-    }
-#endif /* !stdio implementation */
-  return rc;
-}
-
-#ifdef __MINGW32__
-/* Becuase sockets are an special object under Lose32 we have to
- * use a special filter */
-static int
-sock_filter (void *opaque, int control, iobuf_t chain, byte * buf,
-	     size_t * ret_len)
-{
-  sock_filter_ctx_t *a = opaque;
-  size_t size = *ret_len;
-  size_t nbytes = 0;
-  int rc = 0;
-
-  if (control == IOBUFCTRL_UNDERFLOW)
-    {
-      assert (size);		/* need a buffer */
-      if (a->eof_seen)
-	{
-	  rc = -1;
-	  *ret_len = 0;
-	}
-      else
-	{
-	  int nread;
-
-	  nread = recv (a->sock, buf, size, 0);
-	  if (nread == SOCKET_ERROR)
-	    {
-	      int ec = (int) WSAGetLastError ();
-	      rc = gpg_error_from_errno (ec);
-	      log_error ("socket read error: ec=%d\n", ec);
-	    }
-	  else if (!nread)
-	    {
-	      a->eof_seen = 1;
-	      rc = -1;
-	    }
-	  else
-	    {
-	      nbytes = nread;
-	    }
-	  *ret_len = nbytes;
-	}
-    }
-  else if (control == IOBUFCTRL_FLUSH)
-    {
-      if (size)
-	{
-	  byte *p = buf;
-	  int n;
-
-	  nbytes = size;
-	  do
-	    {
-	      n = send (a->sock, p, nbytes, 0);
-	      if (n == SOCKET_ERROR)
-		{
-		  int ec = (int) WSAGetLastError ();
-		  rc = gpg_error_from_errno (ec);
-		  log_error ("socket write error: ec=%d\n", ec);
-		  break;
-		}
-	      p += n;
-	      nbytes -= n;
-	    }
-	  while (nbytes);
-	  nbytes = p - buf;
-	}
-      *ret_len = nbytes;
-    }
-  else if (control == IOBUFCTRL_INIT)
-    {
-      a->eof_seen = 0;
-      a->keep_open = 0;
-      a->no_cache = 0;
-    }
-  else if (control == IOBUFCTRL_DESC)
-    {
-      *(char **) buf = "sock_filter";
-    }
-  else if (control == IOBUFCTRL_FREE)
-    {
-      if (!a->keep_open)
-	closesocket (a->sock);
-      xfree (a);		/* we can free our context now */
-    }
-  return rc;
-}
-#endif /*__MINGW32__*/
-
-/****************
- * This is used to implement the block write mode.
- * Block reading is done on a byte by byte basis in readbyte(),
- * without a filter
- */
-static int
-block_filter (void *opaque, int control, iobuf_t chain, byte * buf,
-	      size_t * ret_len)
-{
-  block_filter_ctx_t *a = opaque;
-  size_t size = *ret_len;
-  int c, needed, rc = 0;
-  char *p;
-
-  if (control == IOBUFCTRL_UNDERFLOW)
-    {
-      size_t n = 0;
-
-      p = buf;
-      assert (size);		/* need a buffer */
-      if (a->eof)		/* don't read any further */
-	rc = -1;
-      while (!rc && size)
-	{
-	  if (!a->size)
-	    {			/* get the length bytes */
-	      if (a->partial == 2)
-		{
-		  a->eof = 1;
-		  if (!n)
-		    rc = -1;
-		  break;
-		}
-	      else if (a->partial)
-		{
-		  /* These OpenPGP introduced huffman like encoded length
-		   * bytes are really a mess :-( */
-		  if (a->first_c)
-		    {
-		      c = a->first_c;
-		      a->first_c = 0;
-		    }
-		  else if ((c = iobuf_get (chain)) == -1)
-		    {
-		      log_error ("block_filter: 1st length byte missing\n");
-		      rc = GPG_ERR_BAD_DATA;
-		      break;
-		    }
-		  if (c < 192)
-		    {
-		      a->size = c;
-		      a->partial = 2;
-		      if (!a->size)
-			{
-			  a->eof = 1;
-			  if (!n)
-			    rc = -1;
-			  break;
-			}
-		    }
-		  else if (c < 224)
-		    {
-		      a->size = (c - 192) * 256;
-		      if ((c = iobuf_get (chain)) == -1)
-			{
-			  log_error
-			    ("block_filter: 2nd length byte missing\n");
-			  rc = GPG_ERR_BAD_DATA;
-			  break;
-			}
-		      a->size += c + 192;
-		      a->partial = 2;
-		      if (!a->size)
-			{
-			  a->eof = 1;
-			  if (!n)
-			    rc = -1;
-			  break;
-			}
-		    }
-		  else if (c == 255)
-		    {
-		      a->size = iobuf_get (chain) << 24;
-		      a->size |= iobuf_get (chain) << 16;
-		      a->size |= iobuf_get (chain) << 8;
-		      if ((c = iobuf_get (chain)) == -1)
-			{
-			  log_error ("block_filter: invalid 4 byte length\n");
-			  rc = GPG_ERR_BAD_DATA;
-			  break;
-			}
-		      a->size |= c;
-		    }
-		  else
-		    {		/* next partial body length */
-		      a->size = 1 << (c & 0x1f);
-		    }
-		  /*  log_debug("partial: ctx=%p c=%02x size=%u\n", a, c, a->size); */
-		}
-	      else
-		{		/* the gnupg partial length scheme - much better :-) */
-		  c = iobuf_get (chain);
-		  a->size = c << 8;
-		  c = iobuf_get (chain);
-		  a->size |= c;
-		  if (c == -1)
-		    {
-		      log_error ("block_filter: error reading length info\n");
-		      rc = GPG_ERR_BAD_DATA;
-		    }
-		  if (!a->size)
-		    {
-		      a->eof = 1;
-		      if (!n)
-			rc = -1;
-		      break;
-		    }
-		}
-	    }
-
-	  while (!rc && size && a->size)
-	    {
-	      needed = size < a->size ? size : a->size;
-	      c = iobuf_read (chain, p, needed);
-	      if (c < needed)
-		{
-		  if (c == -1)
-		    c = 0;
-		  log_error
-		    ("block_filter %p: read error (size=%lu,a->size=%lu)\n",
-		     a, (ulong) size + c, (ulong) a->size + c);
-		  rc = GPG_ERR_BAD_DATA;
-		}
-	      else
-		{
-		  size -= c;
-		  a->size -= c;
-		  p += c;
-		  n += c;
-		}
-	    }
-	}
-      *ret_len = n;
-    }
-  else if (control == IOBUFCTRL_FLUSH)
-    {
-      if (a->partial)
-	{			/* the complicated openpgp scheme */
-	  size_t blen, n, nbytes = size + a->buflen;
-
-	  assert (a->buflen <= OP_MIN_PARTIAL_CHUNK);
-	  if (nbytes < OP_MIN_PARTIAL_CHUNK)
-	    {
-	      /* not enough to write a partial block out; so we store it */
-	      if (!a->buffer)
-		a->buffer = xmalloc (OP_MIN_PARTIAL_CHUNK);
-	      memcpy (a->buffer + a->buflen, buf, size);
-	      a->buflen += size;
-	    }
-	  else
-	    {			/* okay, we can write out something */
-	      /* do this in a loop to use the most efficient block lengths */
-	      p = buf;
-	      do
-		{
-		  /* find the best matching block length - this is limited
-		   * by the size of the internal buffering */
-		  for (blen = OP_MIN_PARTIAL_CHUNK * 2,
-		       c = OP_MIN_PARTIAL_CHUNK_2POW + 1; blen <= nbytes;
-		       blen *= 2, c++)
-		    ;
-		  blen /= 2;
-		  c--;
-		  /* write the partial length header */
-		  assert (c <= 0x1f);	/*;-) */
-		  c |= 0xe0;
-		  iobuf_put (chain, c);
-		  if ((n = a->buflen))
-		    {		/* write stuff from the buffer */
-		      assert (n == OP_MIN_PARTIAL_CHUNK);
-		      if (iobuf_write (chain, a->buffer, n))
-			rc = gpg_error_from_errno (errno);
-		      a->buflen = 0;
-		      nbytes -= n;
-		    }
-		  if ((n = nbytes) > blen)
-		    n = blen;
-		  if (n && iobuf_write (chain, p, n))
-		    rc = gpg_error_from_errno (errno);
-		  p += n;
-		  nbytes -= n;
-		}
-	      while (!rc && nbytes >= OP_MIN_PARTIAL_CHUNK);
-	      /* store the rest in the buffer */
-	      if (!rc && nbytes)
-		{
-		  assert (!a->buflen);
-		  assert (nbytes < OP_MIN_PARTIAL_CHUNK);
-		  if (!a->buffer)
-		    a->buffer = xmalloc (OP_MIN_PARTIAL_CHUNK);
-		  memcpy (a->buffer, p, nbytes);
-		  a->buflen = nbytes;
-		}
-	    }
-	}
-      else
-	{			/* the gnupg scheme (which is not openpgp compliant) */
-	  size_t avail, n;
-
-	  for (p = buf; !rc && size;)
-	    {
-	      n = size;
-	      avail = a->size - a->count;
-	      if (!avail)
-		{
-		  if (n > a->size)
-		    {
-		      iobuf_put (chain, (a->size >> 8) & 0xff);
-		      iobuf_put (chain, a->size & 0xff);
-		      avail = a->size;
-		      a->count = 0;
-		    }
-		  else
-		    {
-		      iobuf_put (chain, (n >> 8) & 0xff);
-		      iobuf_put (chain, n & 0xff);
-		      avail = n;
-		      a->count = a->size - n;
-		    }
-		}
-	      if (n > avail)
-		n = avail;
-	      if (iobuf_write (chain, p, n))
-		rc = gpg_error_from_errno (errno);
-	      a->count += n;
-	      p += n;
-	      size -= n;
-	    }
-	}
-    }
-  else if (control == IOBUFCTRL_INIT)
-    {
-      if (DBG_IOBUF)
-	log_debug ("init block_filter %p\n", a);
-      if (a->partial)
-	a->count = 0;
-      else if (a->use == 1)
-	a->count = a->size = 0;
-      else
-	a->count = a->size;	/* force first length bytes */
-      a->eof = 0;
-      a->buffer = NULL;
-      a->buflen = 0;
-    }
-  else if (control == IOBUFCTRL_DESC)
-    {
-      *(char **) buf = "block_filter";
-    }
-  else if (control == IOBUFCTRL_FREE)
-    {
-      if (a->use == 2)
-	{			/* write the end markers */
-	  if (a->partial)
-	    {
-	      u32 len;
-	      /* write out the remaining bytes without a partial header
-	       * the length of this header may be 0 - but if it is
-	       * the first block we are not allowed to use a partial header
-	       * and frankly we can't do so, because this length must be
-	       * a power of 2. This is _really_ complicated because we
-	       * have to check the possible length of a packet prior
-	       * to it's creation: a chain of filters becomes complicated
-	       * and we need a lot of code to handle compressed packets etc.
-	       *   :-(((((((
-	       */
-	      /* construct header */
-	      len = a->buflen;
-	      /*log_debug("partial: remaining length=%u\n", len ); */
-	      if (len < 192)
-		rc = iobuf_put (chain, len);
-	      else if (len < 8384)
-		{
-		  if (!(rc = iobuf_put (chain, ((len - 192) / 256) + 192)))
-		    rc = iobuf_put (chain, ((len - 192) % 256));
-		}
-	      else
-		{		/* use a 4 byte header */
-		  if (!(rc = iobuf_put (chain, 0xff)))
-		    if (!(rc = iobuf_put (chain, (len >> 24) & 0xff)))
-		      if (!(rc = iobuf_put (chain, (len >> 16) & 0xff)))
-			if (!(rc = iobuf_put (chain, (len >> 8) & 0xff)))
-			  rc = iobuf_put (chain, len & 0xff);
-		}
-	      if (!rc && len)
-		rc = iobuf_write (chain, a->buffer, len);
-	      if (rc)
-		{
-		  log_error ("block_filter: write error: %s\n",
-			     strerror (errno));
-		  rc = gpg_error_from_errno (errno);
-		}
-	      xfree (a->buffer);
-	      a->buffer = NULL;
-	      a->buflen = 0;
-	    }
-	  else
-	    {
-	      iobuf_writebyte (chain, 0);
-	      iobuf_writebyte (chain, 0);
-	    }
-	}
-      else if (a->size)
-	{
-	  log_error ("block_filter: pending bytes!\n");
-	}
-      if (DBG_IOBUF)
-	log_debug ("free block_filter %p\n", a);
-      xfree (a);		/* we can free our context now */
-    }
-
-  return rc;
-}
-
-
-static void
-print_chain (iobuf_t a)
-{
-  if (!DBG_IOBUF)
-    return;
-  for (; a; a = a->chain)
-    {
-      size_t dummy_len = 0;
-      const char *desc = "[none]";
-
-      if (a->filter)
-	a->filter (a->filter_ov, IOBUFCTRL_DESC, NULL,
-		   (byte *) & desc, &dummy_len);
-
-      log_debug ("iobuf chain: %d.%d `%s' filter_eof=%d start=%d len=%d\n",
-		 a->no, a->subno, desc, a->filter_eof,
-		 (int) a->d.start, (int) a->d.len);
-    }
-}
-
-int
-iobuf_print_chain (iobuf_t a)
-{
-  print_chain (a);
-  return 0;
-}
-
-/****************
- * Allocate a new io buffer, with no function assigned.
- * Use is the desired usage: 1 for input, 2 for output, 3 for temp buffer
- * BUFSIZE is a suggested buffer size.
- */
-iobuf_t
-iobuf_alloc (int use, size_t bufsize)
-{
-  iobuf_t a;
-  static int number = 0;
-
-  a = xcalloc (1, sizeof *a);
-  a->use = use;
-  a->d.buf = xmalloc (bufsize);
-  a->d.size = bufsize;
-  a->no = ++number;
-  a->subno = 0;
-  a->opaque = NULL;
-  a->real_fname = NULL;
-  return a;
-}
-
-int
-iobuf_close (iobuf_t a)
-{
-  iobuf_t a2;
-  size_t dummy_len = 0;
-  int rc = 0;
-
-  if (a && a->directfp)
-    {
-      fclose (a->directfp);
-      xfree (a->real_fname);
-      if (DBG_IOBUF)
-	log_debug ("iobuf_close -> %p\n", a->directfp);
-      return 0;
-    }
-
-  for (; a && !rc; a = a2)
-    {
-      a2 = a->chain;
-      if (a->use == 2 && (rc = iobuf_flush (a)))
-	log_error ("iobuf_flush failed on close: %s\n", gpg_strerror (rc));
-
-      if (DBG_IOBUF)
-	log_debug ("iobuf-%d.%d: close `%s'\n", a->no, a->subno, a->desc);
-      if (a->filter && (rc = a->filter (a->filter_ov, IOBUFCTRL_FREE,
-					a->chain, NULL, &dummy_len)))
-	log_error ("IOBUFCTRL_FREE failed on close: %s\n", gpg_strerror (rc));
-      xfree (a->real_fname);
-      if (a->d.buf)
-	{
-	  memset (a->d.buf, 0, a->d.size);	/* erase the buffer */
-	  xfree (a->d.buf);
-	}
-      xfree (a);
-    }
-  return rc;
-}
-
-int
-iobuf_cancel (iobuf_t a)
-{
-  const char *s;
-  iobuf_t a2;
-  int rc;
-#if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__)
-  char *remove_name = NULL;
-#endif
-
-  if (a && a->use == 2)
-    {
-      s = iobuf_get_real_fname (a);
-      if (s && *s)
-	{
-#if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__)
-	  remove_name = m_strdup (s);
-#else
-	  remove (s);
-#endif
-	}
-    }
-
-  /* send a cancel message to all filters */
-  for (a2 = a; a2; a2 = a2->chain)
-    {
-      size_t dummy;
-      if (a2->filter)
-	a2->filter (a2->filter_ov, IOBUFCTRL_CANCEL, a2->chain, NULL, &dummy);
-    }
-
-  rc = iobuf_close (a);
-#if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__)
-  if (remove_name)
-    {
-      /* Argg, MSDOS does not allow to remove open files.  So
-       * we have to do it here */
-      remove (remove_name);
-      xfree (remove_name);
-    }
-#endif
-  return rc;
-}
-
-
-/****************
- * create a temporary iobuf, which can be used to collect stuff
- * in an iobuf and later be written by iobuf_write_temp() to another
- * iobuf.
- */
-iobuf_t
-iobuf_temp ()
-{
-  iobuf_t a;
-
-  a = iobuf_alloc (3, 8192);
-
-  return a;
-}
-
-iobuf_t
-iobuf_temp_with_content (const char *buffer, size_t length)
-{
-  iobuf_t a;
-
-  a = iobuf_alloc (3, length);
-  memcpy (a->d.buf, buffer, length);
-  a->d.len = length;
-
-  return a;
-}
-
-void
-iobuf_enable_special_filenames (int yes)
-{
-  special_names_enabled = yes;
-}
-
-/*
- * see whether the filename has the for "-&nnnn", where n is a
- * non-zero number.
- * Returns this number or -1 if it is not the case.
- */
-static int
-check_special_filename (const char *fname)
-{
-  if (special_names_enabled && fname && *fname == '-' && fname[1] == '&')
-    {
-      int i;
-
-      fname += 2;
-      for (i = 0; isdigit (fname[i]); i++)
-	;
-      if (!fname[i])
-	return atoi (fname);
-    }
-  return -1;
-}
-
-/****************
- * Create a head iobuf for reading from a file
- * returns: NULL if an error occures and sets errno
- */
-iobuf_t
-iobuf_open (const char *fname)
-{
-  iobuf_t a;
-  FILEP_OR_FD fp;
-  file_filter_ctx_t *fcx;
-  size_t len;
-  int print_only = 0;
-  int fd;
-
-  if (!fname || (*fname == '-' && !fname[1]))
-    {
-      fp = FILEP_OR_FD_FOR_STDIN;
-#ifdef USE_SETMODE
-      setmode (my_fileno (fp), O_BINARY);
-#endif
-      fname = "[stdin]";
-      print_only = 1;
-    }
-  else if ((fd = check_special_filename (fname)) != -1)
-    return iobuf_fdopen (translate_file_handle (fd, 0), "rb");
-  else if ((fp = my_fopen_ro (fname, "rb")) == INVALID_FP)
-    return NULL;
-  a = iobuf_alloc (1, 8192);
-  fcx = xmalloc (sizeof *fcx + strlen (fname));
-  fcx->fp = fp;
-  fcx->print_only_name = print_only;
-  strcpy (fcx->fname, fname);
-  if (!print_only)
-    a->real_fname = xstrdup (fname);
-  a->filter = file_filter;
-  a->filter_ov = fcx;
-  file_filter (fcx, IOBUFCTRL_DESC, NULL, (byte *) & a->desc, &len);
-  file_filter (fcx, IOBUFCTRL_INIT, NULL, NULL, &len);
-  if (DBG_IOBUF)
-    log_debug ("iobuf-%d.%d: open `%s' fd=%d\n",
-	       a->no, a->subno, fname, (int) my_fileno (fcx->fp));
-
-  return a;
-}
-
-/****************
- * Create a head iobuf for reading from a file
- * returns: NULL if an error occures and sets errno
- */
-iobuf_t
-iobuf_fdopen (int fd, const char *mode)
-{
-  iobuf_t a;
-  FILEP_OR_FD fp;
-  file_filter_ctx_t *fcx;
-  size_t len;
-
-#ifdef FILE_FILTER_USES_STDIO
-  if (!(fp = fdopen (fd, mode)))
-    return NULL;
-#else
-  fp = (FILEP_OR_FD) fd;
-#endif
-  a = iobuf_alloc (strchr (mode, 'w') ? 2 : 1, 8192);
-  fcx = xmalloc (sizeof *fcx + 20);
-  fcx->fp = fp;
-  fcx->print_only_name = 1;
-  sprintf (fcx->fname, "[fd %d]", fd);
-  a->filter = file_filter;
-  a->filter_ov = fcx;
-  file_filter (fcx, IOBUFCTRL_DESC, NULL, (byte *) & a->desc, &len);
-  file_filter (fcx, IOBUFCTRL_INIT, NULL, NULL, &len);
-  if (DBG_IOBUF)
-    log_debug ("iobuf-%d.%d: fdopen `%s'\n", a->no, a->subno, fcx->fname);
-  iobuf_ioctl (a, 3, 1, NULL);	/* disable fd caching */
-  return a;
-}
-
-
-iobuf_t
-iobuf_sockopen (int fd, const char *mode)
-{
-  iobuf_t a;
-#ifdef __MINGW32__
-  sock_filter_ctx_t *scx;
-  size_t len;
-
-  a = iobuf_alloc (strchr (mode, 'w') ? 2 : 1, 8192);
-  scx = m_alloc (sizeof *scx + 25);
-  scx->sock = fd;
-  scx->print_only_name = 1;
-  sprintf (scx->fname, "[sock %d]", fd);
-  a->filter = sock_filter;
-  a->filter_ov = scx;
-  sock_filter (scx, IOBUFCTRL_DESC, NULL, (byte *) & a->desc, &len);
-  sock_filter (scx, IOBUFCTRL_INIT, NULL, NULL, &len);
-  if (DBG_IOBUF)
-    log_debug ("iobuf-%d.%d: sockopen `%s'\n", a->no, a->subno, scx->fname);
-  iobuf_ioctl (a, 3, 1, NULL);	/* disable fd caching */
-#else
-  a = iobuf_fdopen (fd, mode);
-#endif
-  return a;
-}
-
-/****************
- * create an iobuf for writing to a file; the file will be created.
- */
-iobuf_t
-iobuf_create (const char *fname)
-{
-  iobuf_t a;
-  FILEP_OR_FD fp;
-  file_filter_ctx_t *fcx;
-  size_t len;
-  int print_only = 0;
-  int fd;
-
-  if (!fname || (*fname == '-' && !fname[1]))
-    {
-      fp = FILEP_OR_FD_FOR_STDOUT;
-#ifdef USE_SETMODE
-      setmode (my_fileno (fp), O_BINARY);
-#endif
-      fname = "[stdout]";
-      print_only = 1;
-    }
-  else if ((fd = check_special_filename (fname)) != -1)
-    return iobuf_fdopen (translate_file_handle (fd, 1), "wb");
-  else if ((fp = my_fopen (fname, "wb")) == INVALID_FP)
-    return NULL;
-  a = iobuf_alloc (2, 8192);
-  fcx = xmalloc (sizeof *fcx + strlen (fname));
-  fcx->fp = fp;
-  fcx->print_only_name = print_only;
-  strcpy (fcx->fname, fname);
-  if (!print_only)
-    a->real_fname = xstrdup (fname);
-  a->filter = file_filter;
-  a->filter_ov = fcx;
-  file_filter (fcx, IOBUFCTRL_DESC, NULL, (byte *) & a->desc, &len);
-  file_filter (fcx, IOBUFCTRL_INIT, NULL, NULL, &len);
-  if (DBG_IOBUF)
-    log_debug ("iobuf-%d.%d: create `%s'\n", a->no, a->subno, a->desc);
-
-  return a;
-}
-
-/****************
- * append to an iobuf; if the file does not exist, create it.
- * cannot be used for stdout.
- * Note: This is not used.
- */
-#if 0				/* not used */
-iobuf_t
-iobuf_append (const char *fname)
-{
-  iobuf_t a;
-  FILE *fp;
-  file_filter_ctx_t *fcx;
-  size_t len;
-
-  if (!fname)
-    return NULL;
-  else if (!(fp = my_fopen (fname, "ab")))
-    return NULL;
-  a = iobuf_alloc (2, 8192);
-  fcx = m_alloc (sizeof *fcx + strlen (fname));
-  fcx->fp = fp;
-  strcpy (fcx->fname, fname);
-  a->real_fname = m_strdup (fname);
-  a->filter = file_filter;
-  a->filter_ov = fcx;
-  file_filter (fcx, IOBUFCTRL_DESC, NULL, (byte *) & a->desc, &len);
-  file_filter (fcx, IOBUFCTRL_INIT, NULL, NULL, &len);
-  if (DBG_IOBUF)
-    log_debug ("iobuf-%d.%d: append `%s'\n", a->no, a->subno, a->desc);
-
-  return a;
-}
-#endif
-
-iobuf_t
-iobuf_openrw (const char *fname)
-{
-  iobuf_t a;
-  FILEP_OR_FD fp;
-  file_filter_ctx_t *fcx;
-  size_t len;
-
-  if (!fname)
-    return NULL;
-  else if ((fp = my_fopen (fname, "r+b")) == INVALID_FP)
-    return NULL;
-  a = iobuf_alloc (2, 8192);
-  fcx = xmalloc (sizeof *fcx + strlen (fname));
-  fcx->fp = fp;
-  strcpy (fcx->fname, fname);
-  a->real_fname = xstrdup (fname);
-  a->filter = file_filter;
-  a->filter_ov = fcx;
-  file_filter (fcx, IOBUFCTRL_DESC, NULL, (byte *) & a->desc, &len);
-  file_filter (fcx, IOBUFCTRL_INIT, NULL, NULL, &len);
-  if (DBG_IOBUF)
-    log_debug ("iobuf-%d.%d: openrw `%s'\n", a->no, a->subno, a->desc);
-
-  return a;
-}
-
-
-int
-iobuf_ioctl (iobuf_t a, int cmd, int intval, void *ptrval)
-{
-  if (cmd == 1)
-    {				/* keep system filepointer/descriptor open */
-      if (DBG_IOBUF)
-	log_debug ("iobuf-%d.%d: ioctl `%s' keep=%d\n",
-		   a ? a->no : -1, a ? a->subno : -1, a ? a->desc : "?",
-		   intval);
-      for (; a; a = a->chain)
-	if (!a->chain && a->filter == file_filter)
-	  {
-	    file_filter_ctx_t *b = a->filter_ov;
-	    b->keep_open = intval;
-	    return 0;
-	  }
-#ifdef __MINGW32__
-	else if (!a->chain && a->filter == sock_filter)
-	  {
-	    sock_filter_ctx_t *b = a->filter_ov;
-	    b->keep_open = intval;
-	    return 0;
-	  }
-#endif
-    }
-  else if (cmd == 2)
-    {				/* invalidate cache */
-      if (DBG_IOBUF)
-	log_debug ("iobuf-*.*: ioctl `%s' invalidate\n",
-		   ptrval ? (char *) ptrval : "?");
-      if (!a && !intval && ptrval)
-	{
-#ifndef FILE_FILTER_USES_STDIO
-	  fd_cache_invalidate (ptrval);
-#endif
-	  return 0;
-	}
-    }
-  else if (cmd == 3)
-    {				/* disallow/allow caching */
-      if (DBG_IOBUF)
-	log_debug ("iobuf-%d.%d: ioctl `%s' no_cache=%d\n",
-		   a ? a->no : -1, a ? a->subno : -1, a ? a->desc : "?",
-		   intval);
-      for (; a; a = a->chain)
-	if (!a->chain && a->filter == file_filter)
-	  {
-	    file_filter_ctx_t *b = a->filter_ov;
-	    b->no_cache = intval;
-	    return 0;
-	  }
-#ifdef __MINGW32__
-	else if (!a->chain && a->filter == sock_filter)
-	  {
-	    sock_filter_ctx_t *b = a->filter_ov;
-	    b->no_cache = intval;
-	    return 0;
-	  }
-#endif
-    }
-
-  return -1;
-}
-
-
-/****************
- * Register an i/o filter.
- */
-int
-iobuf_push_filter (iobuf_t a,
-		   int (*f) (void *opaque, int control,
-			     iobuf_t chain, byte * buf, size_t * len),
-                   void *ov)
-{
-  return iobuf_push_filter2 (a, f, ov, 0);
-}
-
-int
-iobuf_push_filter2 (iobuf_t a,
-		    int (*f) (void *opaque, int control,
-			      iobuf_t chain, byte * buf, size_t * len),
-		    void *ov, int rel_ov)
-{
-  iobuf_t b;
-  size_t dummy_len = 0;
-  int rc = 0;
-
-  if (a->directfp)
-    BUG ();
-
-  if (a->use == 2 && (rc = iobuf_flush (a)))
-    return rc;
-  /* make a copy of the current stream, so that
-   * A is the new stream and B the original one.
-   * The contents of the buffers are transferred to the
-   * new stream.
-   */
-  b = xmalloc (sizeof *b);
-  memcpy (b, a, sizeof *b);
-  /* fixme: it is stupid to keep a copy of the name at every level
-   * but we need the name somewhere because the name known by file_filter
-   * may have been released when we need the name of the file */
-  b->real_fname = a->real_fname ? xstrdup (a->real_fname) : NULL;
-  /* remove the filter stuff from the new stream */
-  a->filter = NULL;
-  a->filter_ov = NULL;
-  a->filter_ov_owner = 0;
-  a->filter_eof = 0;
-  if (a->use == 3)
-    a->use = 2;			/* make a write stream from a temp stream */
-
-  if (a->use == 2)
-    {				/* allocate a fresh buffer for the
-                                   original stream */
-      b->d.buf = xmalloc (a->d.size);
-      b->d.len = 0;
-      b->d.start = 0;
-    }
-  else
-    {				/* allocate a fresh buffer for the new
-                                   stream */
-      a->d.buf = xmalloc (a->d.size);
-      a->d.len = 0;
-      a->d.start = 0;
-    }
-  /* disable nlimit for the new stream */
-  a->ntotal = b->ntotal + b->nbytes;
-  a->nlimit = a->nbytes = 0;
-  a->nofast &= ~1;
-  /* make a link from the new stream to the original stream */
-  a->chain = b;
-  a->opaque = b->opaque;
-
-  /* setup the function on the new stream */
-  a->filter = f;
-  a->filter_ov = ov;
-  a->filter_ov_owner = rel_ov;
-
-  a->subno = b->subno + 1;
-  f (ov, IOBUFCTRL_DESC, NULL, (byte *) & a->desc, &dummy_len);
-
-  if (DBG_IOBUF)
-    {
-      log_debug ("iobuf-%d.%d: push `%s'\n", a->no, a->subno, a->desc);
-      print_chain (a);
-    }
-
-  /* now we can initialize the new function if we have one */
-  if (a->filter && (rc = a->filter (a->filter_ov, IOBUFCTRL_INIT, a->chain,
-				    NULL, &dummy_len)))
-    log_error ("IOBUFCTRL_INIT failed: %s\n", gpg_strerror (rc));
-  return rc;
-}
-
-/****************
- * Remove an i/o filter.
- */
-int
-pop_filter (iobuf_t a, int (*f) (void *opaque, int control,
-			       iobuf_t chain, byte * buf, size_t * len),
-	    void *ov)
-{
-  iobuf_t b;
-  size_t dummy_len = 0;
-  int rc = 0;
-
-  if (a->directfp)
-    BUG ();
-
-  if (DBG_IOBUF)
-    log_debug ("iobuf-%d.%d: pop `%s'\n", a->no, a->subno, a->desc);
-  if (!a->filter)
-    {				/* this is simple */
-      b = a->chain;
-      assert (b);
-      xfree (a->d.buf);
-      xfree (a->real_fname);
-      memcpy (a, b, sizeof *a);
-      xfree (b);
-      return 0;
-    }
-  for (b = a; b; b = b->chain)
-    if (b->filter == f && (!ov || b->filter_ov == ov))
-      break;
-  if (!b)
-    log_bug ("pop_filter(): filter function not found\n");
-
-  /* flush this stream if it is an output stream */
-  if (a->use == 2 && (rc = iobuf_flush (b)))
-    {
-      log_error ("iobuf_flush failed in pop_filter: %s\n", gpg_strerror (rc));
-      return rc;
-    }
-  /* and tell the filter to free it self */
-  if (b->filter && (rc = b->filter (b->filter_ov, IOBUFCTRL_FREE, b->chain,
-				    NULL, &dummy_len)))
-    {
-      log_error ("IOBUFCTRL_FREE failed: %s\n", gpg_strerror (rc));
-      return rc;
-    }
-  if (b->filter_ov && b->filter_ov_owner)
-    {
-      xfree (b->filter_ov);
-      b->filter_ov = NULL;
-    }
-
-
-  /* and see how to remove it */
-  if (a == b && !b->chain)
-    log_bug ("can't remove the last filter from the chain\n");
-  else if (a == b)
-    {				/* remove the first iobuf from the chain */
-      /* everything from b is copied to a. This is save because
-       * a flush has been done on the to be removed entry
-       */
-      b = a->chain;
-      xfree (a->d.buf);
-      xfree (a->real_fname);
-      memcpy (a, b, sizeof *a);
-      xfree (b);
-      if (DBG_IOBUF)
-	log_debug ("iobuf-%d.%d: popped filter\n", a->no, a->subno);
-    }
-  else if (!b->chain)
-    {				/* remove the last iobuf from the chain */
-      log_bug ("Ohh jeee, trying to remove a head filter\n");
-    }
-  else
-    {				/* remove an intermediate iobuf from the chain */
-      log_bug ("Ohh jeee, trying to remove an intermediate filter\n");
-    }
-
-  return rc;
-}
-
-
-/****************
- * read underflow: read more bytes into the buffer and return
- * the first byte or -1 on EOF.
- */
-static int
-underflow (iobuf_t a)
-{
-  size_t len;
-  int rc;
-
-  assert (a->d.start == a->d.len);
-  if (a->use == 3)
-    return -1;			/* EOF because a temp buffer can't do an underflow */
-
-  if (a->filter_eof)
-    {
-      if (a->chain)
-	{
-	  iobuf_t b = a->chain;
-	  if (DBG_IOBUF)
-	    log_debug ("iobuf-%d.%d: pop `%s' in underflow\n",
-		       a->no, a->subno, a->desc);
-	  xfree (a->d.buf);
-	  xfree (a->real_fname);
-	  memcpy (a, b, sizeof *a);
-	  xfree (b);
-	  print_chain (a);
-	}
-      else
-	a->filter_eof = 0;	/* for the top level filter */
-      if (DBG_IOBUF)
-	log_debug ("iobuf-%d.%d: underflow: eof (due to filter eof)\n",
-		   a->no, a->subno);
-      return -1;		/* return one(!) EOF */
-    }
-  if (a->error)
-    {
-      if (DBG_IOBUF)
-	log_debug ("iobuf-%d.%d: error\n", a->no, a->subno);
-      return -1;
-    }
-
-  if (a->directfp)
-    {
-      FILE *fp = a->directfp;
-
-      len = fread (a->d.buf, 1, a->d.size, fp);
-      if (len < a->d.size)
-	{
-	  if (ferror (fp))
-	    a->error = gpg_error_from_errno (errno);
-	}
-      a->d.len = len;
-      a->d.start = 0;
-      return len ? a->d.buf[a->d.start++] : -1;
-    }
-
-
-  if (a->filter)
-    {
-      len = a->d.size;
-      if (DBG_IOBUF)
-	log_debug ("iobuf-%d.%d: underflow: req=%lu\n",
-		   a->no, a->subno, (ulong) len);
-      rc = a->filter (a->filter_ov, IOBUFCTRL_UNDERFLOW, a->chain,
-		      a->d.buf, &len);
-      if (DBG_IOBUF)
-	{
-	  log_debug ("iobuf-%d.%d: underflow: got=%lu rc=%d\n",
-		     a->no, a->subno, (ulong) len, rc);
-/*  	    if( a->no == 1 ) */
-/*                   log_hexdump ("     data:", a->d.buf, len); */
-	}
-      if (a->use == 1 && rc == -1)
-	{			/* EOF: we can remove the filter */
-	  size_t dummy_len = 0;
-
-	  /* and tell the filter to free itself */
-	  if ((rc = a->filter (a->filter_ov, IOBUFCTRL_FREE, a->chain,
-			       NULL, &dummy_len)))
-	    log_error ("IOBUFCTRL_FREE failed: %s\n", gpg_strerror (rc));
-	  if (a->filter_ov && a->filter_ov_owner)
-	    {
-	      xfree (a->filter_ov);
-	      a->filter_ov = NULL;
-	    }
-	  a->filter = NULL;
-	  a->desc = NULL;
-	  a->filter_ov = NULL;
-	  a->filter_eof = 1;
-	  if (!len && a->chain)
-	    {
-	      iobuf_t b = a->chain;
-	      if (DBG_IOBUF)
-		log_debug ("iobuf-%d.%d: pop `%s' in underflow (!len)\n",
-			   a->no, a->subno, a->desc);
-	      xfree (a->d.buf);
-	      xfree (a->real_fname);
-	      memcpy (a, b, sizeof *a);
-	      xfree (b);
-	      print_chain (a);
-	    }
-	}
-      else if (rc)
-	a->error = rc;
-
-      if (!len)
-	{
-	  if (DBG_IOBUF)
-	    log_debug ("iobuf-%d.%d: underflow: eof\n", a->no, a->subno);
-	  return -1;
-	}
-      a->d.len = len;
-      a->d.start = 0;
-      return a->d.buf[a->d.start++];
-    }
-  else
-    {
-      if (DBG_IOBUF)
-	log_debug ("iobuf-%d.%d: underflow: eof (no filter)\n",
-		   a->no, a->subno);
-      return -1;		/* no filter; return EOF */
-    }
-}
-
-
-int
-iobuf_flush (iobuf_t a)
-{
-  size_t len;
-  int rc;
-
-  if (a->directfp)
-    return 0;
-
-  if (a->use == 3)
-    {				/* increase the temp buffer */
-      char *newbuf;
-      size_t newsize = a->d.size + 8192;
-
-      if (DBG_IOBUF)
-	log_debug ("increasing temp iobuf from %lu to %lu\n",
-		   (ulong) a->d.size, (ulong) newsize);
-      newbuf = xmalloc (newsize);
-      memcpy (newbuf, a->d.buf, a->d.len);
-      xfree (a->d.buf);
-      a->d.buf = newbuf;
-      a->d.size = newsize;
-      return 0;
-    }
-  else if (a->use != 2)
-    log_bug ("flush on non-output iobuf\n");
-  else if (!a->filter)
-    log_bug ("iobuf_flush: no filter\n");
-  len = a->d.len;
-  rc = a->filter (a->filter_ov, IOBUFCTRL_FLUSH, a->chain, a->d.buf, &len);
-  if (!rc && len != a->d.len)
-    {
-      log_info ("iobuf_flush did not write all!\n");
-      rc = GPG_ERR_INTERNAL;
-    }
-  else if (rc)
-    a->error = rc;
-  a->d.len = 0;
-
-  return rc;
-}
-
-
-/****************
- * Read a byte from the iobuf; returns -1 on EOF
- */
-int
-iobuf_readbyte (iobuf_t a)
-{
-  int c;
-
-  /* nlimit does not work together with unget */
-  /* nbytes is also not valid! */
-  if (a->unget.buf)
-    {
-      if (a->unget.start < a->unget.len)
-	return a->unget.buf[a->unget.start++];
-      xfree (a->unget.buf);
-      a->unget.buf = NULL;
-      a->nofast &= ~2;
-    }
-
-  if (a->nlimit && a->nbytes >= a->nlimit)
-    return -1;			/* forced EOF */
-
-  if (a->d.start < a->d.len)
-    {
-      c = a->d.buf[a->d.start++];
-    }
-  else if ((c = underflow (a)) == -1)
-    return -1;			/* EOF */
-
-  a->nbytes++;
-  return c;
-}
-
-
-int
-iobuf_read (iobuf_t a, byte * buf, unsigned buflen)
-{
-  int c, n;
-
-  if (a->unget.buf || a->nlimit)
-    {
-      /* handle special cases */
-      for (n = 0; n < buflen; n++)
-	{
-	  if ((c = iobuf_readbyte (a)) == -1)
-	    {
-	      if (!n)
-		return -1;	/* eof */
-	      break;
-	    }
-	  else if (buf)
-	    *buf = c;
-	  if (buf)
-	    buf++;
-	}
-      return n;
-    }
-
-  n = 0;
-  do
-    {
-      if (n < buflen && a->d.start < a->d.len)
-	{
-	  unsigned size = a->d.len - a->d.start;
-	  if (size > buflen - n)
-	    size = buflen - n;
-	  if (buf)
-	    memcpy (buf, a->d.buf + a->d.start, size);
-	  n += size;
-	  a->d.start += size;
-	  if (buf)
-	    buf += size;
-	}
-      if (n < buflen)
-	{
-	  if ((c = underflow (a)) == -1)
-	    {
-	      a->nbytes += n;
-	      return n ? n : -1 /*EOF*/;
-	    }
-	  if (buf)
-	    *buf++ = c;
-	  n++;
-	}
-    }
-  while (n < buflen);
-  a->nbytes += n;
-  return n;
-}
-
-
-/****************
- * Have a look at the iobuf.
- * NOTE: This only works in special cases.
- */
-int
-iobuf_peek (iobuf_t a, byte * buf, unsigned buflen)
-{
-  int n = 0;
-
-  if (a->filter_eof)
-    return -1;
-
-  if (!(a->d.start < a->d.len))
-    {
-      if (underflow (a) == -1)
-	return -1;
-      /* and unget this character */
-      assert (a->d.start == 1);
-      a->d.start = 0;
-    }
-
-  for (n = 0; n < buflen && (a->d.start + n) < a->d.len; n++, buf++)
-    *buf = a->d.buf[n];
-  return n;
-}
-
-
-
-
-int
-iobuf_writebyte (iobuf_t a, unsigned c)
-{
-  int rc;
-
-  if (a->directfp)
-    BUG ();
-
-  if (a->d.len == a->d.size)
-    if ((rc=iobuf_flush (a)))
-      return rc;
-
-  assert (a->d.len < a->d.size);
-  a->d.buf[a->d.len++] = c;
-  return 0;
-}
-
-
-int
-iobuf_write (iobuf_t a, byte * buf, unsigned buflen)
-{
-  int rc;
-
-  if (a->directfp)
-    BUG ();
-
-  do
-    {
-      if (buflen && a->d.len < a->d.size)
-	{
-	  unsigned size = a->d.size - a->d.len;
-	  if (size > buflen)
-	    size = buflen;
-	  memcpy (a->d.buf + a->d.len, buf, size);
-	  buflen -= size;
-	  buf += size;
-	  a->d.len += size;
-	}
-      if (buflen)
-	{
-	  rc = iobuf_flush (a);
-          if (rc)
-	    return rc;
-	}
-    }
-  while (buflen);
-  return 0;
-}
-
-
-int
-iobuf_writestr (iobuf_t a, const char *buf)
-{
-  int rc;
-
-  for (; *buf; buf++)
-    if ((rc=iobuf_writebyte (a, *buf)))
-      return rc;
-  return 0;
-}
-
-
-
-/****************
- * copy the contents of TEMP to A.
- */
-int
-iobuf_write_temp (iobuf_t a, iobuf_t temp)
-{
-  while (temp->chain)
-    pop_filter (temp, temp->filter, NULL);
-  return iobuf_write (a, temp->d.buf, temp->d.len);
-}
-
-/****************
- * copy the contents of the temp io stream to BUFFER.
- */
-size_t
-iobuf_temp_to_buffer (iobuf_t a, byte * buffer, size_t buflen)
-{
-  size_t n = a->d.len;
-
-  if (n > buflen)
-    n = buflen;
-  memcpy (buffer, a->d.buf, n);
-  return n;
-}
-
-
-/****************
- * Call this function to terminate processing of the temp stream
- * without closing it.	This removes all filters from the stream
- * makes sure that iobuf_get_temp_{buffer,length}() returns correct
- * values.
- */
-void
-iobuf_flush_temp (iobuf_t temp)
-{
-  while (temp->chain)
-    pop_filter (temp, temp->filter, NULL);
-}
-
-
-/****************
- * Set a limit on how many bytes may be read from the input stream A.
- * Setting the limit to 0 disables this feature.
- */
-void
-iobuf_set_limit (iobuf_t a, off_t nlimit)
-{
-  if (nlimit)
-    a->nofast |= 1;
-  else
-    a->nofast &= ~1;
-  a->nlimit = nlimit;
-  a->ntotal += a->nbytes;
-  a->nbytes = 0;
-}
-
-
-
-/****************
- * Return the length of an open file
- */
-off_t
-iobuf_get_filelength (iobuf_t a)
-{
-  struct stat st;
-
-  if (a->directfp)
-    {
-      FILE *fp = a->directfp;
-
-      if (!fstat (fileno (fp), &st))
-	return st.st_size;
-      log_error ("fstat() failed: %s\n", strerror (errno));
-      return 0;
-    }
-
-  /* Hmmm: file_filter may have already been removed */
-  for (; a; a = a->chain)
-    if (!a->chain && a->filter == file_filter)
-      {
-	file_filter_ctx_t *b = a->filter_ov;
-	FILEP_OR_FD fp = b->fp;
-
-#if defined(HAVE_DOSISH_SYSTEM) && !defined(FILE_FILTER_USES_STDIO)
-	ulong size;
-
-	if ((size = GetFileSize (fp, NULL)) != 0xffffffff)
-	  return size;
-	log_error ("GetFileSize for handle %p failed: ec=%d\n",
-		   fp, (int) GetLastError ());
-#else
-	if (!fstat (my_fileno (fp), &st))
-	  return st.st_size;
-	log_error ("fstat() failed: %s\n", strerror (errno));
-#endif
-	break;
-      }
-
-  return 0;
-}
-
-/****************
- * Tell the file position, where the next read will take place
- */
-off_t
-iobuf_tell (iobuf_t a)
-{
-  return a->ntotal + a->nbytes;
-}
-
-
-#if !defined(HAVE_FSEEKO) && !defined(fseeko)
-
-#ifdef HAVE_LIMITS_H
-# include <limits.h>
-#endif
-#ifndef LONG_MAX
-# define LONG_MAX ((long) ((unsigned long) -1 >> 1))
-#endif
-#ifndef LONG_MIN
-# define LONG_MIN (-1 - LONG_MAX)
-#endif
-
-/****************
- * A substitute for fseeko, for hosts that don't have it.
- */
-static int
-fseeko (FILE * stream, off_t newpos, int whence)
-{
-  while (newpos != (long) newpos)
-    {
-      long pos = newpos < 0 ? LONG_MIN : LONG_MAX;
-      if (fseek (stream, pos, whence) != 0)
-	return -1;
-      newpos -= pos;
-      whence = SEEK_CUR;
-    }
-  return fseek (stream, (long) newpos, whence);
-}
-#endif
-
-/****************
- * This is a very limited implementation. It simply discards all internal
- * buffering and removes all filters but the first one.
- */
-int
-iobuf_seek (iobuf_t a, off_t newpos)
-{
-  file_filter_ctx_t *b = NULL;
-
-  if (a->directfp)
-    {
-      FILE *fp = a->directfp;
-      if (fseeko (fp, newpos, SEEK_SET))
-	{
-	  log_error ("can't seek: %s\n", strerror (errno));
-	  return -1;
-	}
-      clearerr (fp);
-    }
-  else
-    {
-      for (; a; a = a->chain)
-	{
-	  if (!a->chain && a->filter == file_filter)
-	    {
-	      b = a->filter_ov;
-	      break;
-	    }
-	}
-      if (!a)
-	return -1;
-#ifdef FILE_FILTER_USES_STDIO
-      if (fseeko (b->fp, newpos, SEEK_SET))
-	{
-	  log_error ("can't fseek: %s\n", strerror (errno));
-	  return -1;
-	}
-#else
-#ifdef HAVE_DOSISH_SYSTEM
-      if (SetFilePointer (b->fp, newpos, NULL, FILE_BEGIN) == 0xffffffff)
-	{
-	  log_error ("SetFilePointer failed on handle %p: ec=%d\n",
-		     b->fp, (int) GetLastError ());
-	  return -1;
-	}
-#else
-      if (lseek (b->fp, newpos, SEEK_SET) == (off_t) - 1)
-	{
-	  log_error ("can't lseek: %s\n", strerror (errno));
-	  return -1;
-	}
-#endif
-#endif
-    }
-  a->d.len = 0;			/* discard buffer */
-  a->d.start = 0;
-  a->nbytes = 0;
-  a->nlimit = 0;
-  a->nofast &= ~1;
-  a->ntotal = newpos;
-  a->error = 0;
-  /* remove filters, but the last */
-  if (a->chain)
-    log_debug ("pop_filter called in iobuf_seek - please report\n");
-  while (a->chain)
-    pop_filter (a, a->filter, NULL);
-
-  return 0;
-}
-
-
-
-
-
-
-/****************
- * Retrieve the real filename
- */
-const char *
-iobuf_get_real_fname (iobuf_t a)
-{
-  if (a->real_fname)
-    return a->real_fname;
-
-  /* the old solution */
-  for (; a; a = a->chain)
-    if (!a->chain && a->filter == file_filter)
-      {
-	file_filter_ctx_t *b = a->filter_ov;
-	return b->print_only_name ? NULL : b->fname;
-      }
-
-  return NULL;
-}
-
-
-/****************
- * Retrieve the filename
- */
-const char *
-iobuf_get_fname (iobuf_t a)
-{
-  for (; a; a = a->chain)
-    if (!a->chain && a->filter == file_filter)
-      {
-	file_filter_ctx_t *b = a->filter_ov;
-	return b->fname;
-      }
-
-  return NULL;
-}
-
-/****************
- * Start the block write mode, see rfc1991.new for details.
- * A value of 0 for N stops this mode (flushes and writes
- * the end marker)
- */
-void
-iobuf_set_block_mode (iobuf_t a, size_t n)
-{
-  block_filter_ctx_t *ctx = xcalloc (1, sizeof *ctx);
-
-  assert (a->use == 1 || a->use == 2);
-  ctx->use = a->use;
-  if (!n)
-    {
-      if (a->use == 1)
-	log_debug ("pop_filter called in set_block_mode - please report\n");
-      pop_filter (a, block_filter, NULL);
-    }
-  else
-    {
-      ctx->size = n;		/* only needed for use 2 */
-      iobuf_push_filter (a, block_filter, ctx);
-    }
-}
-
-/****************
- * enable partial block mode as described in the OpenPGP draft.
- * LEN is the first length byte on read, but ignored on writes.
- */
-void
-iobuf_set_partial_block_mode (iobuf_t a, size_t len)
-{
-  block_filter_ctx_t *ctx = xcalloc (1, sizeof *ctx);
-
-  assert (a->use == 1 || a->use == 2);
-  ctx->use = a->use;
-  if (!len)
-    {
-      if (a->use == 1)
-	log_debug ("pop_filter called in set_partial_block_mode"
-		   " - please report\n");
-      pop_filter (a, block_filter, NULL);
-    }
-  else
-    {
-      ctx->partial = 1;
-      ctx->size = 0;
-      ctx->first_c = len;
-      iobuf_push_filter (a, block_filter, ctx);
-    }
-}
-
-
-/****************
- * Checks whether the stream is in block mode
- * Note: This does not work if other filters are pushed on the stream.
- */
-int
-iobuf_in_block_mode (iobuf_t a)
-{
-  if (a && a->filter == block_filter)
-    return 1;			/* yes */
-  return 0;			/* no */
-}
-
-
-/****************
- * Same as fgets() but if the buffer is too short a larger one will
- * be allocated up to some limit *max_length.
- * A line is considered a byte stream ending in a LF.
- * Returns the length of the line. EOF is indicated by a line of
- * length zero. The last LF may be missing due to an EOF.
- * is max_length is zero on return, the line has been truncated.
- *
- * Note: The buffer is allocated with enough space to append a CR,LF,EOL
- */
-unsigned int
-iobuf_read_line (iobuf_t a, byte ** addr_of_buffer,
-		 unsigned *length_of_buffer, unsigned *max_length)
-{
-  int c;
-  char *buffer = *addr_of_buffer;
-  unsigned length = *length_of_buffer;
-  unsigned nbytes = 0;
-  unsigned maxlen = *max_length;
-  char *p;
-
-  if (!buffer)
-    {				/* must allocate a new buffer */
-      length = 256;
-      buffer = xmalloc (length);
-      *addr_of_buffer = buffer;
-      *length_of_buffer = length;
-    }
-
-  length -= 3;			/* reserve 3 bytes (cr,lf,eol) */
-  p = buffer;
-  while ((c = iobuf_get (a)) != -1)
-    {
-      if (nbytes == length)
-	{			/* increase the buffer */
-	  if (length > maxlen)
-	    {			/* this is out limit */
-	      /* skip the rest of the line */
-	      while (c != '\n' && (c = iobuf_get (a)) != -1)
-		;
-	      *p++ = '\n';	/* always append a LF (we have reserved space) */
-	      nbytes++;
-	      *max_length = 0;	/* indicate truncation */
-	      break;
-	    }
-	  length += 3;		/* correct for the reserved byte */
-	  length += length < 1024 ? 256 : 1024;
-	  buffer = xrealloc (buffer, length);
-	  *addr_of_buffer = buffer;
-	  *length_of_buffer = length;
-	  length -= 3;		/* and reserve again */
-	  p = buffer + nbytes;
-	}
-      *p++ = c;
-      nbytes++;
-      if (c == '\n')
-	break;
-    }
-  *p = 0;			/* make sure the line is a string */
-
-  return nbytes;
-}
-
-/* This is the non iobuf specific function */
-int
-iobuf_translate_file_handle (int fd, int for_write)
-{
-#ifdef __MINGW32__
-  {
-    int x;
-
-    if (fd <= 2)
-      return fd;		/* do not do this for error, stdin, stdout, stderr */
-
-    x = _open_osfhandle (fd, for_write ? 1 : 0);
-    if (x == -1)
-      log_error ("failed to translate osfhandle %p\n", (void *) fd);
-    else
-      {
-	/*log_info ("_open_osfhandle %p yields %d%s\n",
-	   (void*)fd, x, for_write? " for writing":"" ); */
-	fd = x;
-      }
-  }
-#endif
-  return fd;
-}
-
-static int
-translate_file_handle (int fd, int for_write)
-{
-#ifdef __MINGW32__
-#ifdef FILE_FILTER_USES_STDIO
-  fd = iobuf_translate_file_handle (fd, for_write);
-#else
-  {
-    int x;
-
-    if (fd == 0)
-      x = (int) GetStdHandle (STD_INPUT_HANDLE);
-    else if (fd == 1)
-      x = (int) GetStdHandle (STD_OUTPUT_HANDLE);
-    else if (fd == 2)
-      x = (int) GetStdHandle (STD_ERROR_HANDLE);
-    else
-      x = fd;
-
-    if (x == -1)
-      log_debug ("GetStdHandle(%d) failed: ec=%d\n",
-		 fd, (int) GetLastError ());
-
-    fd = x;
-  }
-#endif
-#endif
-  return fd;
-}
diff --git a/common/iobuf.h b/common/iobuf.h
deleted file mode 100644
index 0af94e22d..000000000
--- a/common/iobuf.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* iobuf.h - I/O buffer
- * Copyright (C) 1998, 1999, 2000, 2001, 2003 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
- */
-
-#ifndef GNUPG_COMMON_IOBUF_H
-#define GNUPG_COMMON_IOBUF_H
-
-#include "../include/types.h" /* fixme: should be moved elsewhere. */
-
-
-#define DBG_IOBUF   iobuf_debug_mode
-
-
-#define IOBUFCTRL_INIT	    1
-#define IOBUFCTRL_FREE	    2
-#define IOBUFCTRL_UNDERFLOW 3
-#define IOBUFCTRL_FLUSH     4
-#define IOBUFCTRL_DESC	    5
-#define IOBUFCTRL_CANCEL    6
-#define IOBUFCTRL_USER	    16
-
-typedef struct iobuf_struct *iobuf_t;
-
-/* fixme: we should hide most of this stuff */
-struct iobuf_struct
-{
-  int use;			/* 1 input , 2 output, 3 temp */
-  off_t nlimit;
-  off_t nbytes;			/* used together with nlimit */
-  off_t ntotal;			/* total bytes read (position of stream) */
-  int nofast;			/* used by the iobuf_get() */
-  void *directfp;
-  struct
-  {
-    size_t size;		/* allocated size */
-    size_t start;		/* number of invalid bytes at the begin of the buffer */
-    size_t len;			/* currently filled to this size */
-    byte *buf;
-  }
-  d;
-  int filter_eof;
-  int error;
-  int (*filter) (void *opaque, int control,
-		 iobuf_t chain, byte * buf, size_t * len);
-  void *filter_ov;		/* value for opaque */
-  int filter_ov_owner;
-  char *real_fname;
-  iobuf_t chain;			/* next iobuf used for i/o if any
-                                   (passed to filter) */
-  int no, subno;
-  const char *desc;
-  void *opaque;			/* can be used to hold any information
-                                   this value is copied to all
-                                   instances */
-  struct
-  {
-    size_t size;		/* allocated size */
-    size_t start;		/* number of invalid bytes at the
-                                   begin of the buffer */
-    size_t len;			/* currently filled to this size */
-    byte *buf;
-  }
-  unget;
-};
-
-#ifndef EXTERN_UNLESS_MAIN_MODULE
-#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
-#define EXTERN_UNLESS_MAIN_MODULE extern
-#else
-#define EXTERN_UNLESS_MAIN_MODULE
-#endif
-#endif
-EXTERN_UNLESS_MAIN_MODULE int iobuf_debug_mode;
-
-void iobuf_enable_special_filenames (int yes);
-iobuf_t iobuf_alloc (int use, size_t bufsize);
-iobuf_t iobuf_temp (void);
-iobuf_t iobuf_temp_with_content (const char *buffer, size_t length);
-iobuf_t iobuf_open (const char *fname);
-iobuf_t iobuf_fdopen (int fd, const char *mode);
-iobuf_t iobuf_sockopen (int fd, const char *mode);
-iobuf_t iobuf_create (const char *fname);
-iobuf_t iobuf_append (const char *fname);
-iobuf_t iobuf_openrw (const char *fname);
-int iobuf_ioctl (iobuf_t a, int cmd, int intval, void *ptrval);
-int iobuf_close (iobuf_t iobuf);
-int iobuf_cancel (iobuf_t iobuf);
-
-int iobuf_push_filter (iobuf_t a, int (*f) (void *opaque, int control,
-					  iobuf_t chain, byte * buf,
-					  size_t * len), void *ov);
-int iobuf_push_filter2 (iobuf_t a,
-			int (*f) (void *opaque, int control, iobuf_t chain,
-				  byte * buf, size_t * len), void *ov,
-			int rel_ov);
-int iobuf_flush (iobuf_t a);
-void iobuf_clear_eof (iobuf_t a);
-#define iobuf_set_error(a)    do { (a)->error = 1; } while(0)
-#define iobuf_error(a)	      ((a)->error)
-
-void iobuf_set_limit (iobuf_t a, off_t nlimit);
-
-off_t iobuf_tell (iobuf_t a);
-int iobuf_seek (iobuf_t a, off_t newpos);
-
-int iobuf_readbyte (iobuf_t a);
-int iobuf_read (iobuf_t a, byte * buf, unsigned buflen);
-unsigned iobuf_read_line (iobuf_t a, byte ** addr_of_buffer,
-			  unsigned *length_of_buffer, unsigned *max_length);
-int iobuf_peek (iobuf_t a, byte * buf, unsigned buflen);
-int iobuf_writebyte (iobuf_t a, unsigned c);
-int iobuf_write (iobuf_t a, byte * buf, unsigned buflen);
-int iobuf_writestr (iobuf_t a, const char *buf);
-
-void iobuf_flush_temp (iobuf_t temp);
-int iobuf_write_temp (iobuf_t a, iobuf_t temp);
-size_t iobuf_temp_to_buffer (iobuf_t a, byte * buffer, size_t buflen);
-void iobuf_unget_and_close_temp (iobuf_t a, iobuf_t temp);
-
-off_t iobuf_get_filelength (iobuf_t a);
-#define IOBUF_FILELENGTH_LIMIT 0xffffffff
-const char *iobuf_get_real_fname (iobuf_t a);
-const char *iobuf_get_fname (iobuf_t a);
-
-void iobuf_set_block_mode (iobuf_t a, size_t n);
-void iobuf_set_partial_block_mode (iobuf_t a, size_t len);
-int iobuf_in_block_mode (iobuf_t a);
-
-int iobuf_translate_file_handle (int fd, int for_write);
-
-
-/* get a byte form the iobuf; must check for eof prior to this function
- * this function returns values in the range 0 .. 255 or -1 to indicate EOF
- * iobuf_get_noeof() does not return -1 to indicate EOF, but masks the
- * returned value to be in the range 0 ..255.
- */
-#define iobuf_get(a)  \
-     (	((a)->nofast || (a)->d.start >= (a)->d.len )?  \
-	iobuf_readbyte((a)) : ( (a)->nbytes++, (a)->d.buf[(a)->d.start++] ) )
-#define iobuf_get_noeof(a)    (iobuf_get((a))&0xff)
-
-/* write a byte to the iobuf and return true on write error
- * This macro does only write the low order byte
- */
-#define iobuf_put(a,c)	iobuf_writebyte(a,c)
-
-#define iobuf_where(a)	"[don't know]"
-#define iobuf_id(a)	((a)->no)
-
-#define iobuf_get_temp_buffer(a) ( (a)->d.buf )
-#define iobuf_get_temp_length(a) ( (a)->d.len )
-#define iobuf_is_temp(a)	 ( (a)->use == 3 )
-
-#endif /*GNUPG_COMMON_IOBUF_H*/
diff --git a/common/isascii.c b/common/isascii.c
deleted file mode 100644
index 565c71664..000000000
--- a/common/isascii.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* isascii.c - Replacement for isascii.
- * Copyright (C) 2002 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
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-int
-isascii (int c)
-{
-  return (((c) & ~0x7f) == 0);
-}
diff --git a/common/maperror.c b/common/maperror.c
deleted file mode 100644
index 13657bece..000000000
--- a/common/maperror.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* maperror.c - Error mapping
- *	Copyright (C) 2001, 2002 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
- */
-
-#include <config.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-
-#include <ksba.h>
-#include <assuan.h>
-
-#include "util.h"
-#include "errors.h"
-
-/* Note: we might want to wrap this in a macro to get our hands on
-   the line and file where the error occured */
-int
-map_ksba_err (int err)
-{
-  switch (err)
-    {
-    case -1:
-    case 0: 
-      break;
-
-    case KSBA_Out_Of_Core: err = GPG_ERR_ENOMEM; break;
-    case KSBA_Invalid_Value: err = GPG_ERR_INV_VALUE; break;
-    case KSBA_Not_Implemented: err = GPG_ERR_NOT_IMPLEMENTED; break;
-    case KSBA_Conflict: err = GPG_ERR_CONFLICT; break;
-    case KSBA_Read_Error: err = GPG_ERR_EIO; break;
-    case KSBA_Write_Error: err = GPG_ERR_EIO; break;
-    case KSBA_No_Data: err = GPG_ERR_NO_DATA; break;
-    case KSBA_Bug: err = GPG_ERR_BUG; break;
-    case KSBA_Unsupported_Algorithm: err = GPG_ERR_UNSUPPORTED_ALGORITHM; break;
-    case KSBA_Invalid_Index: err = GPG_ERR_INV_INDEX; break;
-    case KSBA_Invalid_Sexp: err = GPG_ERR_INV_SEXP; break;
-    case KSBA_Unknown_Sexp: err = GPG_ERR_UNKNOWN_SEXP; break;
-      
-    default:
-      err = GPG_ERR_GENERAL;
-      break;
-    }
-  return err;
-}
-
-
-int 
-map_gcry_err (int err)
-{
-  return err;
-}
-
-int 
-map_kbx_err (int err)
-{
-  return err;
-}
-
-/* Map Assuan error code ERR to an GPG_ERR_ code.  We need to
-   distinguish between genuine (and legacy) Assuan error codes and
-   application error codes shared with all GnuPG modules.  The rule is
-   simple: All errors with a gpg_err_source of UNKNOWN are genuine
-   Assuan codes all others are passed verbatim through. */
-gpg_error_t
-map_assuan_err (int err)
-{
-  gpg_err_code_t ec;
-
-  if (gpg_err_source (err))
-    return err;
-
-  switch (err)
-    {
-    case -1:                     ec = GPG_ERR_EOF; break;
-    case 0:                      ec = 0; break;
-
-    case ASSUAN_Canceled:        ec = GPG_ERR_CANCELED; break;
-    case ASSUAN_Invalid_Index:   ec = GPG_ERR_INV_INDEX; break;
-
-    case ASSUAN_Not_Implemented: ec = GPG_ERR_NOT_IMPLEMENTED; break;
-    case ASSUAN_Server_Fault:    ec = GPG_ERR_ASSUAN_SERVER_FAULT; break;
-    case ASSUAN_No_Public_Key:   ec = GPG_ERR_NO_PUBKEY; break;
-    case ASSUAN_No_Secret_Key:   ec = GPG_ERR_NO_SECKEY; break;
-
-    case ASSUAN_Cert_Revoked:    ec = GPG_ERR_CERT_REVOKED; break;
-    case ASSUAN_No_CRL_For_Cert: ec = GPG_ERR_NO_CRL_KNOWN; break;       
-    case ASSUAN_CRL_Too_Old:     ec = GPG_ERR_CRL_TOO_OLD; break;        
-
-    case ASSUAN_Not_Trusted:     ec = GPG_ERR_NOT_TRUSTED; break;
-
-    case ASSUAN_Card_Error:      ec = GPG_ERR_CARD; break;
-    case ASSUAN_Invalid_Card:    ec = GPG_ERR_INV_CARD; break;
-    case ASSUAN_No_PKCS15_App:   ec = GPG_ERR_NO_PKCS15_APP; break;
-    case ASSUAN_Card_Not_Present: ec= GPG_ERR_CARD_NOT_PRESENT; break;
-    case ASSUAN_Not_Confirmed:   ec = GPG_ERR_NOT_CONFIRMED; break;
-    case ASSUAN_Invalid_Id:      ec = GPG_ERR_INV_ID; break;
-
-    default:
-      ec = err < 100? GPG_ERR_ASSUAN_SERVER_FAULT : GPG_ERR_ASSUAN;
-      break;
-    }
-  return gpg_err_make (GPG_ERR_SOURCE_UNKNOWN, ec);
-}
-
-/* Map GPG_xERR_xx error codes to Assuan status codes */
-int
-map_to_assuan_status (int rc)
-{
-  gpg_err_code_t   ec = gpg_err_code (rc);
-  gpg_err_source_t es = gpg_err_source (rc);
-
-  if (!rc)
-    return 0;
-  if (!es)
-    {
-      es = GPG_ERR_SOURCE_USER_4; /*  This should not happen, but we
-                                      need to make sure to pass a new
-                                      Assuan errorcode along. */
-      log_debug ("map_to_assuan_status called with no error source\n");
-    }
-
-  if (ec == -1)
-    ec = GPG_ERR_NO_DATA;  /* That used to be ASSUAN_No_Data_Available. */
-
-  return gpg_err_make (es, ec);
-}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/common/membuf.c b/common/membuf.c
deleted file mode 100644
index 69e4ab908..000000000
--- a/common/membuf.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* membuf.c - A simple implementation of a dynamic buffer
- *	Copyright (C) 2001, 2003 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
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include "membuf.h"
-
-#include "util.h"
-
-
-/* A simple implementation of a dynamic buffer.  Use init_membuf() to
-   create a buffer, put_membuf to append bytes and get_membuf to
-   release and return the buffer.  Allocation errors are detected but
-   only returned at the final get_membuf(), this helps not to clutter
-   the code with out of core checks.  */
-
-void
-init_membuf (membuf_t *mb, int initiallen)
-{
-  mb->len = 0;
-  mb->size = initiallen;
-  mb->out_of_core = 0;
-  mb->buf = xtrymalloc (initiallen);
-  if (!mb->buf)
-      mb->out_of_core = errno;
-}
-
-
-void
-put_membuf (membuf_t *mb, const void *buf, size_t len)
-{
-  if (mb->out_of_core)
-    return;
-
-  if (mb->len + len >= mb->size)
-    {
-      char *p;
-      
-      mb->size += len + 1024;
-      p = xtryrealloc (mb->buf, mb->size);
-      if (!p)
-        {
-          mb->out_of_core = errno;
-          return;
-        }
-      mb->buf = p;
-    }
-  memcpy (mb->buf + mb->len, buf, len);
-  mb->len += len;
-}
-
-
-void *
-get_membuf (membuf_t *mb, size_t *len)
-{
-  char *p;
-
-  if (mb->out_of_core)
-    {
-      xfree (mb->buf);
-      mb->buf = NULL;
-      return NULL;
-    }
-
-  p = mb->buf;
-  *len = mb->len;
-  mb->buf = NULL;
-  mb->out_of_core = ENOMEM; /* hack to make sure it won't get reused. */
-  return p;
-}
diff --git a/common/membuf.h b/common/membuf.h
deleted file mode 100644
index c199363cc..000000000
--- a/common/membuf.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* membuf.h - A simple implementation of a dynamic buffer
- *	Copyright (C) 2001, 2003 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
- */
-
-#ifndef GNUPG_COMMON_MEMBUF_H
-#define GNUPG_COMMON_MEMBUF_H
-
-/* The definition of the structure is private, we only need it here,
-   so it can be allocated on the stack. */
-struct private_membuf_s {
-  size_t len;      
-  size_t size;     
-  char *buf;       
-  int out_of_core; 
-};
-
-typedef struct private_membuf_s membuf_t;
-
-
-void init_membuf (membuf_t *mb, int initiallen);
-void put_membuf  (membuf_t *mb, const void *buf, size_t len);
-void *get_membuf (membuf_t *mb, size_t *len);
-
-
-#endif /*GNUPG_COMMON_MEMBUF_H*/
diff --git a/common/miscellaneous.c b/common/miscellaneous.c
deleted file mode 100644
index bdb12c574..000000000
--- a/common/miscellaneous.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* miscellaneous.c - Stuff not fitting elsewhere
- *	Copyright (C) 2003 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
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include "util.h"
-#include "iobuf.h"
-
-/* Decide whether the filename is stdout or a real filename and return
- * an appropriate string.  */
-const char *
-print_fname_stdout (const char *s)
-{
-    if( !s || (*s == '-' && !s[1]) )
-	return "[stdout]";
-    return s;
-}
-
-
-/* Decide whether the filename is stdin or a real filename and return
- * an appropriate string.  */
-const char *
-print_fname_stdin (const char *s)
-{
-    if( !s || (*s == '-' && !s[1]) )
-	return "[stdin]";
-    return s;
-}
-
-void
-print_string( FILE *fp, const byte *p, size_t n, int delim )
-{
-  print_sanitized_buffer (fp, p, n, delim);
-}
-
-void
-print_utf8_string2 ( FILE *fp, const byte *p, size_t n, int delim )
-{
-  print_sanitized_utf8_buffer (fp, p, n, delim);
-}
-
-void
-print_utf8_string( FILE *fp, const byte *p, size_t n )
-{
-    print_utf8_string2 (fp, p, n, 0);
-}
-
-char *
-make_printable_string( const byte *p, size_t n, int delim )
-{
-  return sanitize_buffer (p, n, delim);
-}
-
-
-/*
- * Check if the file is compressed.
- */
-int
-is_file_compressed (const char *s, int *ret_rc)
-{
-    iobuf_t a;
-    byte buf[4];
-    int i, rc = 0;
-
-    struct magic_compress_s {
-        size_t len;
-        byte magic[4];
-    } magic[] = {
-        { 3, { 0x42, 0x5a, 0x68, 0x00 } }, /* bzip2 */
-        { 3, { 0x1f, 0x8b, 0x08, 0x00 } }, /* gzip */
-        { 4, { 0x50, 0x4b, 0x03, 0x04 } }, /* (pk)zip */
-    };
-    
-    if ( !s || (*s == '-' && !s[1]) || !ret_rc )
-        return 0; /* We can't check stdin or no file was given */
-
-    a = iobuf_open( s );
-    if ( a == NULL ) {
-        *ret_rc = gpg_error_from_errno (errno);
-        return 0;
-    }
-
-    if ( iobuf_get_filelength( a ) < 4 ) {
-        *ret_rc = 0;
-        goto leave;
-    }
-
-    if ( iobuf_read( a, buf, 4 ) == -1 ) {
-        *ret_rc = a->error;
-        goto leave;
-    }
-
-    for ( i = 0; i < DIM( magic ); i++ ) {
-        if ( !memcmp( buf, magic[i].magic, magic[i].len ) ) {
-            *ret_rc = 0;
-            rc = 1;
-            break;
-        }
-    }
-
-leave:    
-    iobuf_close( a );
-    return rc;
-}
-
-
-
diff --git a/common/mkdtemp.c b/common/mkdtemp.c
deleted file mode 100644
index 5347b9cb4..000000000
--- a/common/mkdtemp.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* mkdtemp.c - libc replacement function
- * 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
- */
-
-/* This is a replacement function for mkdtemp in case the platform
-   we're building on (like mine!) doesn't have it. */
-
-#include <config.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <gcrypt.h>
-
-#ifdef MKDIR_TAKES_ONE_ARG
-# undef mkdir
-# define mkdir(a,b) mkdir(a)
-#endif
-
-char *mkdtemp(char *template)
-{
-  int attempts,idx,count=0;
-  unsigned char *ch;
-
-  idx=strlen(template);
-
-  /* Walk backwards to count all the Xes */
-  while(idx>0 && template[idx-1]=='X')
-    {
-      count++;
-      idx--;
-    }
-
-  if(count==0)
-    {
-      errno=EINVAL;
-      return NULL;
-    }
-
-  ch=&template[idx];
-
-  /* Try 4 times to make the temp directory */
-  for(attempts=0;attempts<4;attempts++)
-    {
-      int remaining=count;
-      char *marker=ch;
-      unsigned char *randombits;
-
-      idx=0;
-
-      /* Using really random bits is probably overkill here.  The
-	 worst thing that can happen with a directory name collision
-	 is that the function will return an error. */
-
-      randombits = gcry_random_bytes (4*remaining, GCRY_WEAK_RANDOM);
-
-      while(remaining>1)
-	{
-	  sprintf(marker,"%02X",randombits[idx++]);
-	  marker+=2;
-	  remaining-=2;
-	}
-
-      /* Any leftover Xes?  get_random_bits rounds up to full bytes,
-         so this is safe. */
-      if(remaining>0)
-	sprintf(marker,"%X",randombits[idx]&0xF);
-
-      gcry_free (randombits);
-
-      if(mkdir(template,0700)==0)
-	break;
-    }
-
-  if(attempts==4)
-    return NULL; /* keeps the errno from mkdir, whatever it is */
-
-  return template;
-}
-
-
diff --git a/common/mkerrors b/common/mkerrors
deleted file mode 100755
index 5a1ef33da..000000000
--- a/common/mkerrors
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-# mkerrors - Extract error strings from errors.h
-#            and create C source for gnupg_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 <config.h>
-#include <stdio.h>
-#include "errors.h"
-
-/**
- * gnupg_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 *
-gnupg_strerror (int err)
-{
-  const char *s;
-  static char buf[25];
-
-  switch (err)
-    {
-EOF
-
-awk '
-/GNUPG_No_Error/  { okay=1 }
-!okay              {next}
-/}/                { exit 0 }
-/GNUPG_[A-Za-z_]*/ { print_code($1) }
-
-
-function print_code( s )
-{
-printf "    case %s: s=\"", s ;
-gsub(/_/, " ", s );
-printf "%s\"; break;\n", tolower(substr(s,7));
-}
-'
-
-cat <<EOF
-    default:  sprintf (buf, "ec=%d", err ); s=buf; break;
-    }
-
-  return s;
-}
-
-EOF
\ No newline at end of file
diff --git a/common/mkerrtok b/common/mkerrtok
deleted file mode 100755
index 1029614af..000000000
--- a/common/mkerrtok
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# mkerrtok - Create error tokens from errors.h
-#            and the C source for gnupg_errortoken
-#	Copyright (C) 2001, 2002 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 mkerrtok */
-/* Do not edit! */
-
-/**
- * gnupg_error_token:
- * @err:  Error code 
- * 
- * This function returns a textual representaion of the given
- * errorcode. If this is an unknown value, a static string is returned.
- * This function differs from gnupg_strerror that it yields the string 
- * representation of the macro which is never subject to i18n.
- * 
- * Return value: String with the error token.
- **/
-const char *
-gnupg_error_token (int err)
-{
-  const char *s;
-
-  switch (err)
-    {
-EOF
-
-awk '
-/GNUPG_No_Error/  { okay=1 }
-!okay              {next}
-/}/                { exit 0 }
-/GNUPG_[A-Za-z_]*/ { print_code($1) }
-
-
-function print_code( s )
-{
-printf "    case %s: s=\"", s ;
-printf "%s\"; break;\n", substr(s,7);
-}
-'
-
-cat <<EOF
-    default:  s = "Unknown_Error"; break;
-    }
-
-  return s;
-}
-
-EOF
diff --git a/common/putc_unlocked.c b/common/putc_unlocked.c
deleted file mode 100644
index 02c646130..000000000
--- a/common/putc_unlocked.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* putc_unlocked.c - Replacement for putc_unlocked.
- * Copyright (C) 2002 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
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-
-int
-putc_unlocked (int c, FILE *stream)
-{
-  return putc (c, stream);
-}
diff --git a/common/signal.c b/common/signal.c
deleted file mode 100644
index dc026c10f..000000000
--- a/common/signal.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* signal.c - signal handling
- * Copyright (C) 1998, 1999, 2000, 2001, 2002 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
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include "util.h"
-
-
-static volatile int caught_fatal_sig;
-static volatile int caught_sigusr1;
-static void (*cleanup_fnc)(void);
-
-
-static void
-init_one_signal (int sig, RETSIGTYPE (*handler)(int), int check_ign )
-{
-#ifndef HAVE_DOSISH_SYSTEM
-# ifdef HAVE_SIGACTION
-  struct sigaction oact, nact;
-  
-  if (check_ign)
-    {
-      /* we don't want to change an IGN handler */
-      sigaction (sig, NULL, &oact );
-      if (oact.sa_handler == SIG_IGN )
-        return;
-    }
-
-  nact.sa_handler = handler;
-  sigemptyset (&nact.sa_mask);
-  nact.sa_flags = 0;
-  sigaction ( sig, &nact, NULL);
-# else 
-  RETSIGTYPE (*ohandler)(int);
-  
-  ohandler = signal (sig, handler);
-  if (check_ign && ohandler == SIG_IGN) 
-    {
-      /* Change it back if it was already set to IGN */
-      signal (sig, SIG_IGN);
-    }
-# endif
-#endif /*!HAVE_DOSISH_SYSTEM*/
-}
-
-static const char *
-get_signal_name( int signum )
-{
-#if defined(SYS_SIGLIST_DECLARED) && defined(NSIG)
-  return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
-#else
-  return "some signal";
-#endif
-}
-
-static RETSIGTYPE
-got_fatal_signal (int sig)
-{
-  const char *s;
-
-  if (caught_fatal_sig)
-	raise (sig);
-  caught_fatal_sig = 1;
-
-  if (cleanup_fnc)
-    cleanup_fnc ();
-  /* better don't translate these messages */
-  write (2, "\n", 1 );
-  s = log_get_prefix (NULL);
-  if (s)
-    write(2, s, strlen (s));
-  write (2, ": ", 2 );
-  s = get_signal_name(sig);
-  write (2, s, strlen(s) );
-  write (2, " caught ... exiting\n", 20);
-  
-  /* reset action to default action and raise signal again */
-  init_one_signal (sig, SIG_DFL, 0);
-  /* fixme: remove_lockfiles ();*/
-#ifdef __riscos__
-  close_fds ();
-#endif /* __riscos__ */
-  raise( sig );
-}
-
-
-static RETSIGTYPE
-got_usr_signal (int sig)
-{
-  caught_sigusr1 = 1;
-}
-
-
-void
-gnupg_init_signals (int mode, void (*fast_cleanup)(void))
-{
-  assert (!mode);
-
-  cleanup_fnc = fast_cleanup;
-#ifndef HAVE_DOSISH_SYSTEM
-  init_one_signal (SIGINT, got_fatal_signal, 1 );
-  init_one_signal (SIGHUP, got_fatal_signal, 1 );
-  init_one_signal (SIGTERM, got_fatal_signal, 1 );
-  init_one_signal (SIGQUIT, got_fatal_signal, 1 );
-  init_one_signal (SIGSEGV, got_fatal_signal, 1 );
-  init_one_signal (SIGUSR1, got_usr_signal, 0 );
-  init_one_signal (SIGPIPE, SIG_IGN, 0 );
-#endif
-}
-
-void
-gnupg_pause_on_sigusr (int which)
-{
-#ifndef HAVE_DOSISH_SYSTEM
-# ifdef HAVE_SIGPROCMASK
-  sigset_t mask, oldmask;
-
-  assert (which == 1);
-  sigemptyset( &mask );
-  sigaddset( &mask, SIGUSR1 );
-  
-  sigprocmask( SIG_BLOCK, &mask, &oldmask );
-  while (!caught_sigusr1)
-    sigsuspend (&oldmask);
-  caught_sigusr1 = 0;
-  sigprocmask (SIG_UNBLOCK, &mask, NULL);
-# else 
-  assert (which == 1);
-  sighold (SIGUSR1);
-  while (!caught_sigusr1)
-    sigpause(SIGUSR1);
-  caught_sigusr1 = 0;
-  sigrelease(SIGUSR1);
-# endif /*!HAVE_SIGPROCMASK*/
-#endif
-}
-
-
-static void
-do_block( int block )
-{
-#ifndef HAVE_DOSISH_SYSTEM
-  static int is_blocked;
-#ifdef HAVE_SIGPROCMASK
-  static sigset_t oldmask;
-
-  if (block)
-    {
-      sigset_t newmask;
-
-      if (is_blocked)
-        log_bug ("signals are already blocked\n");
-      sigfillset( &newmask );
-      sigprocmask( SIG_BLOCK, &newmask, &oldmask );
-      is_blocked = 1;
-    }
-  else
-    {
-      if (!is_blocked)
-        log_bug("signals are not blocked\n");
-      sigprocmask (SIG_SETMASK, &oldmask, NULL);
-      is_blocked = 0;
-    }
-#else /*!HAVE_SIGPROCMASK*/
-  static void (*disposition[MAXSIG])();
-  int sig;
-
-  if (block)
-    {
-      if (is_blocked)
-        log_bug("signals are already blocked\n");
-      for (sig=1; sig < MAXSIG; sig++)
-        {
-          disposition[sig] = sigset (sig, SIG_HOLD);
-        }
-      is_blocked = 1;
-    }
-  else
-    {
-      if (!is_blocked)
-        log_bug ("signals are not blocked\n");
-      for (sig=1; sig < MAXSIG; sig++) {
-        sigset (sig, disposition[sig]);
-      }
-      is_blocked = 0;
-    }
-#endif /*!HAVE_SIGPROCMASK*/
-#endif /*HAVE_DOSISH_SYSTEM*/
-}
-
-
-void
-gnupg_block_all_signals ()
-{
-  do_block(1);
-}
-
-void
-gnupg_unblock_all_signals ()
-{
-  do_block(0);
-}
diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c
deleted file mode 100644
index afdc4e2a4..000000000
--- a/common/simple-pwquery.c
+++ /dev/null
@@ -1,486 +0,0 @@
-/* simple-pwquery.c - A simple password query cleint for gpg-agent
- *	Copyright (C) 2002 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
- */
-
-/* This module is intended as a standalone client implementation to
-   gpg-agent's GET_PASSPHRASE command.  In particular it does not use
-   the Assuan library and can only cope with an already running
-   gpg-agent.  Some stuff is configurable in the header file. */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-#define SIMPLE_PWQUERY_IMPLEMENTATION 1
-#include "simple-pwquery.h"
-
-#if defined(SPWQ_USE_LOGGING) && !defined(HAVE_JNLIB_LOGGING)
-# undef SPWQ_USE_LOGGING
-#endif
-
-#ifndef _
-#define _(a) (a)
-#endif
-
-#if !defined (hexdigitp) && !defined (xtoi_2)
-#define digitp(p)   (*(p) >= '0' && *(p) <= '9')
-#define hexdigitp(a) (digitp (a)                     \
-                      || (*(a) >= 'A' && *(a) <= 'F')  \
-                      || (*(a) >= 'a' && *(a) <= 'f'))
-#define xtoi_1(p)   (*(p) <= '9'? (*(p)- '0'): \
-                     *(p) <= 'F'? (*(p)-'A'+10):(*(p)-'a'+10))
-#define xtoi_2(p)   ((xtoi_1(p) * 16) + xtoi_1((p)+1))
-#endif
-
-
-/* Write NBYTES of BUF to file descriptor FD. */
-static int
-writen (int fd, const void *buf, size_t nbytes)
-{
-  size_t nleft = nbytes;
-  int nwritten;
-  
-  while (nleft > 0)
-    {
-      nwritten = write( fd, buf, nleft );
-      if (nwritten < 0)
-        {
-          if (errno == EINTR)
-            nwritten = 0;
-          else {
-#ifdef SPWQ_USE_LOGGING
-            log_error ("write failed: %s\n", strerror (errno));
-#endif
-            return SPWQ_IO_ERROR;
-          }
-        }
-      nleft -= nwritten;
-      buf = (const char*)buf + nwritten;
-    }
-    
-  return 0;
-}
-
-
-/* Read an entire line and return number of bytes read. */
-static int
-readline (int fd, char *buf, size_t buflen)
-{
-  size_t nleft = buflen;
-  char *p;
-  int nread = 0;
-
-  while (nleft > 0)
-    {
-      int n = read (fd, buf, nleft);
-      if (n < 0)
-        {
-          if (errno == EINTR)
-            continue;
-          return -(SPWQ_IO_ERROR);
-        }
-      else if (!n)
-        {
-          return -(SPWQ_PROTOCOL_ERROR); /* incomplete line */
-        }
-      p = buf;
-      nleft -= n;
-      buf += n;
-      nread += n;
-      
-      for (; n && *p != '\n'; n--, p++)
-        ;
-      if (n)
-        {
-          break; /* at least one full line available - that's enough.
-                    This function is just a simple implementation, so
-                    it is okay to forget about pending bytes */
-        }
-    }
-
-  return nread; 
-}
-
-
-/* Send an option to the agent */
-static int
-agent_send_option (int fd, const char *name, const char *value)
-{
-  char buf[200];
-  int nread;
-  char *line;
-  int i; 
-  
-  line = spwq_malloc (7 + strlen (name) + 1 + strlen (value) + 2);
-  if (!line)
-    return SPWQ_OUT_OF_CORE;
-  strcpy (stpcpy (stpcpy (stpcpy (
-                     stpcpy (line, "OPTION "), name), "="), value), "\n");
-  i = writen (fd, line, strlen (line));
-  spwq_free (line);
-  if (i)
-    return i;
-  
-  /* get response */
-  nread = readline (fd, buf, DIM(buf)-1);
-  if (nread < 0)
-    return -nread;
-  if (nread < 3)
-    return SPWQ_PROTOCOL_ERROR;
-  
-  if (buf[0] == 'O' && buf[1] == 'K' && (buf[2] == ' ' || buf[2] == '\n')) 
-    return 0; /* okay */
-
-  return SPWQ_ERR_RESPONSE;
-}
-
-
-/* Send all available options to the agent. */
-static int 
-agent_send_all_options (int fd)
-{
-  char *dft_display = NULL;
-  char *dft_ttyname = NULL;
-  char *dft_ttytype = NULL;
-  int rc = 0;
-
-  dft_display = getenv ("DISPLAY");
-  if (dft_display)
-    {
-      if ((rc = agent_send_option (fd, "display", dft_display)))
-        return rc;
-    }
-
-  dft_ttyname = getenv ("GPG_TTY");
-  if ((!dft_ttyname || !*dft_ttyname) && ttyname (0))
-    dft_ttyname = ttyname (0);
-  if (dft_ttyname && *dft_ttyname)
-    {
-      if ((rc=agent_send_option (fd, "ttyname", dft_ttyname)))
-        return rc;
-    }
-
-  dft_ttytype = getenv ("TERM");
-  if (dft_ttyname && dft_ttytype)
-    {
-      if ((rc = agent_send_option (fd, "ttytype", dft_ttytype)))
-        return rc;
-    }
-
-#if defined(HAVE_SETLOCALE) 
-  {
-    char *old_lc = NULL;
-    char *dft_lc = NULL;
-
-#if defined(LC_CTYPE)
-    old_lc = setlocale (LC_CTYPE, NULL);
-    if (old_lc)
-      {
-        char *p = spwq_malloc (strlen (old_lc)+1);
-        if (!p)
-          return SPWQ_OUT_OF_CORE;
-        strcpy (p, old_lc);
-        old_lc = p;
-      }
-    dft_lc = setlocale (LC_CTYPE, "");
-    if (dft_ttyname && dft_lc)
-      rc = agent_send_option (fd, "lc-ctype", dft_lc);
-    if (old_lc)
-      {
-        setlocale (LC_CTYPE, old_lc);
-        spwq_free (old_lc);
-      }
-    if (rc)
-      return rc;
-#endif
-
-#if defined(LC_MESSAGES)
-    old_lc = setlocale (LC_MESSAGES, NULL);
-    if (old_lc)
-      {
-        char *p = spwq_malloc (strlen (old_lc)+1);
-        if (!p)
-          return SPWQ_OUT_OF_CORE;
-        strcpy (p, old_lc);
-        old_lc = p;
-      }
-    dft_lc = setlocale (LC_MESSAGES, "");
-    if (dft_ttyname && dft_lc)
-      rc = agent_send_option (fd, "lc-messages", dft_lc);
-    if (old_lc)
-      {
-        setlocale (LC_MESSAGES, old_lc);
-        spwq_free (old_lc);
-      }
-    if (rc)
-      return rc;
-#endif
-  }
-#endif /*HAVE_SETLOCALE*/
-
-  return 0;
-}
-
-
-
-/* Try to open a connection to the agent, send all options and return
-   the file descriptor for the connection.  Return -1 in case of
-   error. */
-static int
-agent_open (int *rfd)
-{
-  int rc;
-  int fd;
-  char *infostr, *p;
-  struct sockaddr_un client_addr;
-  size_t len;
-  int prot;
-  char line[200];
-  int nread;
-
-  *rfd = -1;
-  infostr = getenv ( "GPG_AGENT_INFO" );
-  if ( !infostr ) 
-    {
-#ifdef SPWQ_USE_LOGGING
-      log_error (_("gpg-agent is not available in this session\n"));
-#endif
-      return SPWQ_NO_AGENT;
-    }
-
-  if ( !(p = strchr ( infostr, ':')) || p == infostr
-       || (p-infostr)+1 >= sizeof client_addr.sun_path ) 
-    {
-#ifdef SPWQ_USE_LOGGING
-      log_error ( _("malformed GPG_AGENT_INFO environment variable\n"));
-#endif
-      return SPWQ_NO_AGENT;
-    }
-  *p++ = 0;
-
-  while (*p && *p != ':')
-    p++;
-  prot = *p? atoi (p+1) : 0;
-  if ( prot != 1)
-    {
-#ifdef SPWQ_USE_LOGGING
-      log_error (_("gpg-agent protocol version %d is not supported\n"),prot);
-#endif
-      return SPWQ_PROTOCOL_ERROR;
-    }
-       
-  if( (fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1 ) 
-    {
-#ifdef SPWQ_USE_LOGGING
-      log_error ("can't create socket: %s\n", strerror(errno) );
-#endif
-      return SPWQ_SYS_ERROR;
-    }
-    
-  memset (&client_addr, 0, sizeof client_addr);
-  client_addr.sun_family = AF_UNIX;
-  strcpy (client_addr.sun_path, infostr);
-  len = (offsetof (struct sockaddr_un, sun_path)
-         + strlen(client_addr.sun_path) + 1);
-    
-  if (connect (fd, (struct sockaddr*)&client_addr, len ) == -1)
-    {
-#ifdef SPWQ_USE_LOGGING
-      log_error ( _("can't connect to `%s': %s\n"), infostr, strerror (errno));
-#endif
-      close (fd );
-      return SPWQ_IO_ERROR;
-    }
-
-  nread = readline (fd, line, DIM(line));
-  if (nread < 3 || !(line[0] == 'O' && line[1] == 'K'
-                     && (line[2] == '\n' || line[2] == ' ')) ) 
-    {
-#ifdef SPWQ_USE_LOGGING
-      log_error ( _("communication problem with gpg-agent\n"));
-#endif
-      close (fd );
-      return SPWQ_PROTOCOL_ERROR;
-    }
-
-  rc = agent_send_all_options (fd);
-  if (rc)
-    {
-#ifdef SPWQ_USE_LOGGING
-      log_error (_("problem setting the gpg-agent options\n"));
-#endif
-      close (fd);
-      return rc;
-    }
-
-  *rfd = fd;
-  return 0;
-}
-
-
-/* Copy text to BUFFER and escape as required.  Return a poiinter to
-   the end of the new buffer.  NOte that BUFFER must be large enough
-   to keep the entire text; allocataing it 3 times the size of TEXT
-   is sufficient. */
-static char *
-copy_and_escape (char *buffer, const char *text)
-{
-  int i;
-  char *p = buffer;
-
-  for (i=0; text[i]; i++)
-    {
-      if (text[i] < ' ' || text[i] == '+')
-        {
-          sprintf (p, "%%%02X", text[i]);
-          p += 3;
-        }
-      else if (text[i] == ' ')
-        *p++ = '+';
-      else
-        *p++ = text[i];
-    }
-  return p;
-}
-
-
-/* Ask the gpg-agent for a passphrase and present the user with a
-   DESCRIPTION, a PROMPT and optiaonlly with a TRYAGAIN extra text.
-   If a CACHEID is not NULL it is used to locate the passphrase in in
-   the cache and store it under this ID.  If ERRORCODE is not NULL it
-   should point a variable receiving an errorcode; thsi errocode might
-   be 0 if the user canceled the operation.  The function returns NULL
-   to indicate an error. */
-char *
-simple_pwquery (const char *cacheid, 
-                const char *tryagain,
-                const char *prompt,
-                const char *description,
-                int *errorcode)
-{
-  int fd = -1;
-  int nread;
-  char *result = NULL;
-  char *pw = NULL;
-  char *p;
-  int rc, i; 
-
-  rc = agent_open (&fd);
-  if (rc)
-    goto leave;
-
-  if (!cacheid)
-    cacheid = "X";
-  if (!tryagain)
-    tryagain = "X";
-  if (!prompt)
-    prompt = "X";
-  if (!description)
-    description = "X";
-
-  {
-    char *line;
-    /* We allocate 3 times the needed space so that there is enough
-       space for escaping. */
-    line = spwq_malloc (15
-                        + 3*strlen (cacheid) + 1
-                        + 3*strlen (tryagain) + 1
-                        + 3*strlen (prompt) + 1
-                        + 3*strlen (description) + 1
-                        + 2);
-    if (!line)
-      {
-        rc = SPWQ_OUT_OF_CORE;
-        goto leave;
-      }
-    strcpy (line, "GET_PASSPHRASE ");
-    p = line+15;
-    p = copy_and_escape (p, cacheid);
-    *p++ = ' ';
-    p = copy_and_escape (p, tryagain);
-    *p++ = ' ';
-    p = copy_and_escape (p, prompt);
-    *p++ = ' ';
-    p = copy_and_escape (p, description);
-    *p++ = '\n';
-    rc = writen (fd, line, p - line);
-    spwq_free (line);
-    if (rc)
-      goto leave;
-  }
-
-  /* get response */
-  pw = spwq_secure_malloc (500);
-  nread = readline (fd, pw, 499);
-  if (nread < 0)
-    {
-      rc = -nread;
-      goto leave;
-    }
-  if (nread < 3)
-    {
-      rc = SPWQ_PROTOCOL_ERROR;
-      goto leave;
-    }
-      
-  if (pw[0] == 'O' && pw[1] == 'K' && pw[2] == ' ') 
-    { /* we got a passphrase - convert it back from hex */
-      size_t pwlen = 0;
-      
-      for (i=3; i < nread && hexdigitp (pw+i); i+=2)
-        pw[pwlen++] = xtoi_2 (pw+i);
-      pw[pwlen] = 0; /* make a C String */
-      result = pw;
-      pw = NULL;
-    }
-  else if (nread > 7 && !memcmp (pw, "ERR 111", 7)
-      && (pw[7] == ' ' || pw[7] == '\n') )
-    {
-#ifdef SPWQ_USE_LOGGING
-      log_info (_("canceled by user\n") );
-#endif
-      *errorcode = 0; /* canceled */
-    }
-  else 
-    {
-#ifdef SPWQ_USE_LOGGING
-      log_error (_("problem with the agent\n"));
-#endif
-      rc = SPWQ_ERR_RESPONSE;
-    }
-        
- leave:
-  if (errorcode)
-    *errorcode = rc;
-  if (fd != -1)
-    close (fd);
-  if (pw)
-    spwq_free (pw);
-  return result;
-}
diff --git a/common/simple-pwquery.h b/common/simple-pwquery.h
deleted file mode 100644
index 5947c42b5..000000000
--- a/common/simple-pwquery.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* simple-pwquery.c - A simple password query cleint for gpg-agent
- *	Copyright (C) 2002 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
- */
-
-#ifndef SIMPLE_PWQUERY_H
-#define SIMPLE_PWQUERY_H
-
-#ifdef SIMPLE_PWQUERY_IMPLEMENTATION /* Begin configuration stuff. */
-
-/* Include whatever files you need.  */
-#include <gcrypt.h>
-#include "../jnlib/logging.h"
-
-/* Try to write error message using the standard log mechanism.  The
-   current implementation requires that the HAVE_JNLIB_LOGGING is also
-   defined. */
-#define SPWQ_USE_LOGGING  1
-
-/* Memory allocation functions used by the implementation.  Note, that
-   the returned value is expected to be freed with
-   spwq_secure_free. */
-#define spwq_malloc(a)         gcry_malloc (a)
-#define spwq_free(a)           gcry_free (a)
-#define spwq_secure_malloc(a)  gcry_malloc_secure (a)
-#define spwq_secure_free(a)    gcry_free (a)
-
-
-#endif /*SIMPLE_PWQUERY_IMPLEMENTATION*/ /* End configuration stuff. */
-
-
-/* Ask the gpg-agent for a passphrase and present the user with a
-   DESCRIPTION, a PROMPT and optiaonlly with a TRYAGAIN extra text.
-   If a CACHEID is not NULL it is used to locate the passphrase in in
-   the cache and store it under this ID.  If ERRORCODE is not NULL it
-   should point a variable receiving an errorcode; this errocode might
-   be 0 if the user canceled the operation.  The function returns NULL
-   to indicate an error. */
-char *simple_pwquery (const char *cacheid, 
-                      const char *tryagain,
-                      const char *prompt,
-                      const char *description,
-                      int *errorcode);
-
-
-#define SPWQ_OUT_OF_CORE 1
-#define SPWQ_IO_ERROR 2
-#define SPWQ_PROTOCOL_ERROR 3 
-#define SPWQ_ERR_RESPONSE 4
-#define SPWQ_NO_AGENT 5
-#define SPWQ_SYS_ERROR 6
-#define SPWQ_GENERAL_ERROR 7
-
-#endif /*SIMPLE_PWQUERY_H*/
diff --git a/common/sysutils.c b/common/sysutils.c
deleted file mode 100644
index 6eb40b125..000000000
--- a/common/sysutils.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* sysutils.c -  system helpers
- * Copyright (C) 1998, 1999, 2000, 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
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#ifdef HAVE_STAT
-#include <sys/stat.h>
-#endif
-#if defined(__linux__) && defined(__alpha__) && __GLIBC__ < 2
-  #include <asm/sysinfo.h>
-  #include <asm/unistd.h>
-#endif
-#ifdef HAVE_SETRLIMIT
-  #include <time.h>
-  #include <sys/time.h>
-  #include <sys/resource.h>
-#endif
-#include "util.h"
-#include "i18n.h"
-
-#include "sysutils.h"
-
-#if defined(__linux__) && defined(__alpha__) && __GLIBC__ < 2
-#warning using trap_unaligned
-static int
-setsysinfo(unsigned long op, void *buffer, unsigned long size,
-		     int *start, void *arg, unsigned long flag)
-{
-    return syscall(__NR_osf_setsysinfo, op, buffer, size, start, arg, flag);
-}
-
-void
-trap_unaligned(void)
-{
-    unsigned int buf[2];
-
-    buf[0] = SSIN_UACPROC;
-    buf[1] = UAC_SIGBUS | UAC_NOPRINT;
-    setsysinfo(SSI_NVPAIRS, buf, 1, 0, 0, 0);
-}
-#else
-void
-trap_unaligned(void)
-{  /* dummy */
-}
-#endif
-
-
-int
-disable_core_dumps (void)
-{
- #ifdef HAVE_DOSISH_SYSTEM
-    return 0;
- #else
-  #ifdef HAVE_SETRLIMIT
-    struct rlimit limit;
-
-    limit.rlim_cur = 0;
-    limit.rlim_max = 0;
-    if( !setrlimit( RLIMIT_CORE, &limit ) )
-	return 0;
-    if( errno != EINVAL && errno != ENOSYS )
-	log_fatal (_("can't disable core dumps: %s\n"), strerror(errno) );
-  #endif
-    return 1;
- #endif
-}
-
-
-
-/* Return a string which is used as a kind of process ID */
-const byte *
-get_session_marker( size_t *rlen )
-{
-    static byte marker[SIZEOF_UNSIGNED_LONG*2];
-    static int initialized;
-
-    if ( !initialized ) {
-        volatile ulong aa, bb; /* we really want the uninitialized value */
-        ulong a, b;
-
-        initialized = 1;
-        /* also this marker is guessable it is not easy to use this 
-         * for a faked control packet because an attacker does not
-         * have enough control about the time the verification does 
-         * take place.  Of course, we can add just more random but 
-         * than we need the random generator even for verification
-         * tasks - which does not make sense. */
-        a = aa ^ (ulong)getpid();
-        b = bb ^ (ulong)time(NULL);
-        memcpy( marker, &a, SIZEOF_UNSIGNED_LONG );
-        memcpy( marker+SIZEOF_UNSIGNED_LONG, &b, SIZEOF_UNSIGNED_LONG );
-    }
-    *rlen = sizeof(marker);
-    return marker;
-}
-
-
-#if 0 /* not yet needed */
-int
-check_permissions(const char *path,int extension,int checkonly)
-{
-#if defined(HAVE_STAT) && !defined(HAVE_DOSISH_SYSTEM)
-  char *tmppath;
-  struct stat statbuf;
-  int ret=1;
-  int isdir=0;
-
-  if(opt.no_perm_warn)
-    return 0;
-
-  if(extension && path[0]!=DIRSEP_C)
-    {
-      if(strchr(path,DIRSEP_C))
-	tmppath=make_filename(path,NULL);
-      else
-	tmppath=make_filename(GNUPG_LIBDIR,path,NULL);
-    }
-  else
-    tmppath=m_strdup(path);
-
-  /* It's okay if the file doesn't exist */
-  if(stat(tmppath,&statbuf)!=0)
-    {
-      ret=0;
-      goto end;
-    }
-
-  isdir=S_ISDIR(statbuf.st_mode);
-
-  /* Per-user files must be owned by the user.  Extensions must be
-     owned by the user or root. */
-  if((!extension && statbuf.st_uid != getuid()) ||
-     (extension && statbuf.st_uid!=0 && statbuf.st_uid!=getuid()))
-    {
-      if(!checkonly)
-	log_info(_("Warning: unsafe ownership on %s \"%s\"\n"),
-		 isdir?"directory":extension?"extension":"file",path);
-      goto end;
-    }
-
-  /* This works for both directories and files - basically, we don't
-     care what the owner permissions are, so long as the group and
-     other permissions are 0 for per-user files, and non-writable for
-     extensions. */
-  if((extension && (statbuf.st_mode & (S_IWGRP|S_IWOTH)) !=0) ||
-     (!extension && (statbuf.st_mode & (S_IRWXG|S_IRWXO)) != 0))
-    {
-      char *dir;
-
-      /* However, if the directory the directory/file is in is owned
-         by the user and is 700, then this is not a problem.
-         Theoretically, we could walk this test up to the root
-         directory /, but for the sake of sanity, I'm stopping at one
-         level down. */
-
-      dir= make_dirname (tmppath);
-      if(stat(dir,&statbuf)==0 && statbuf.st_uid==getuid() &&
-	 S_ISDIR(statbuf.st_mode) && (statbuf.st_mode & (S_IRWXG|S_IRWXO))==0)
-	{
-	  xfree (dir);
-	  ret=0;
-	  goto end;
-	}
-
-      m_free(dir);
-
-      if(!checkonly)
-	log_info(_("Warning: unsafe permissions on %s \"%s\"\n"),
-		 isdir?"directory":extension?"extension":"file",path);
-      goto end;
-    }
-
-  ret=0;
-
- end:
-  m_free(tmppath);
-
-  return ret;
-
-#endif /* HAVE_STAT && !HAVE_DOSISH_SYSTEM */
-
-  return 0;
-}
-#endif
diff --git a/common/sysutils.h b/common/sysutils.h
deleted file mode 100644
index f2054d468..000000000
--- a/common/sysutils.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* sysutils.h - System utility functions for Gnupg
- *	Copyright (C) 2002 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
- */
-
-#ifndef GNUPG_COMMON_SYSUTILS_H
-#define GNUPG_COMMON_SYSUTILS_H
-
-void trap_unaligned (void);
-int  disable_core_dumps (void);
-const unsigned char *get_session_marker (size_t *rlen);
-int check_permissions (const char *path,int extension,int checkonly);
-
-
-#endif /*GNUPG_COMMON_SYSUTILS_H*/
diff --git a/common/ttyio.c b/common/ttyio.c
deleted file mode 100644
index fd748009e..000000000
--- a/common/ttyio.c
+++ /dev/null
@@ -1,508 +0,0 @@
-/* ttyio.c -  tty i/O functions
- * Copyright (C) 1998,1999,2000,2001,2002,2003 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
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <unistd.h>
-#ifdef HAVE_TCGETATTR
-#include <termios.h>
-#else
-#ifdef HAVE_TERMIO_H
-/* simulate termios with termio */
-#include <termio.h>
-#define termios termio
-#define tcsetattr ioctl
-#define TCSAFLUSH TCSETAF
-#define tcgetattr(A,B) ioctl(A,TCGETA,B)
-#define HAVE_TCGETATTR
-#endif
-#endif
-#ifdef __MINGW32__ /* use the odd Win32 functions */
-#include <windows.h>
-#ifdef HAVE_TCGETATTR
-#error mingw32 and termios
-#endif
-#endif
-#include <errno.h>
-#include <ctype.h>
-#include "util.h"
-#include "memory.h"
-#include "ttyio.h"
-
-#define CONTROL_D ('D' - 'A' + 1)
-
-#ifdef __MINGW32__ /* use the odd Win32 functions */
-static struct {
-    HANDLE in, out;
-} con;
-#define DEF_INPMODE  (ENABLE_LINE_INPUT|ENABLE_ECHO_INPUT    \
-					|ENABLE_PROCESSED_INPUT )
-#define HID_INPMODE  (ENABLE_LINE_INPUT|ENABLE_PROCESSED_INPUT )
-#define DEF_OUTMODE  (ENABLE_WRAP_AT_EOL_OUTPUT|ENABLE_PROCESSED_OUTPUT)
-
-#else /* yeah, we have a real OS */
-static FILE *ttyfp = NULL;
-#endif
-
-static int initialized;
-static int last_prompt_len;
-static int batchmode;
-static int no_terminal;
-
-#ifdef HAVE_TCGETATTR
-    static struct termios termsave;
-    static int restore_termios;
-#endif
-
-
-
-/* This is a wrapper around ttyname so that we can use it even when
-   the standard streams are redirected.  It figures the name out the
-   first time and returns it in a statically allocated buffer. */
-const char *
-tty_get_ttyname (void)
-{
-  static char *name;
-
-  /* On a GNU system ctermid() always return /dev/tty, so this does
-     not make much sense - however if it is ever changed we do the
-     Right Thing now. */
-#ifdef HAVE_CTERMID
-  static int got_name;
-
-  if (!got_name)
-    {
-      const char *s;
-      s = ctermid (NULL);
-      if (s)
-        name = strdup (s);
-      got_name = 1;
-    }
-#endif
-  /* Assume the staandrd tty on memory error or when tehre is no
-     certmid. */
-  return name? name : "/dev/tty";
-}
-
-
-
-#ifdef HAVE_TCGETATTR
-static void
-cleanup(void)
-{
-    if( restore_termios ) {
-	restore_termios = 0; /* do it prios in case it is interrupted again */
-	if( tcsetattr(fileno(ttyfp), TCSAFLUSH, &termsave) )
-	    log_error("tcsetattr() failed: %s\n", strerror(errno) );
-    }
-}
-#endif
-
-static void
-init_ttyfp(void)
-{
-    if( initialized )
-	return;
-
-#if defined(__MINGW32__)
-    {
-	SECURITY_ATTRIBUTES sa;
-
-	memset(&sa, 0, sizeof(sa));
-	sa.nLength = sizeof(sa);
-	sa.bInheritHandle = TRUE;
-	con.out = CreateFileA( "CONOUT$", GENERIC_READ|GENERIC_WRITE,
-			       FILE_SHARE_READ|FILE_SHARE_WRITE,
-			       &sa, OPEN_EXISTING, 0, 0 );
-	if( con.out == INVALID_HANDLE_VALUE )
-	    log_fatal("open(CONOUT$) failed: rc=%d", (int)GetLastError() );
-	memset(&sa, 0, sizeof(sa));
-	sa.nLength = sizeof(sa);
-	sa.bInheritHandle = TRUE;
-	con.in = CreateFileA( "CONIN$", GENERIC_READ|GENERIC_WRITE,
-			       FILE_SHARE_READ|FILE_SHARE_WRITE,
-			       &sa, OPEN_EXISTING, 0, 0 );
-	if( con.in == INVALID_HANDLE_VALUE )
-	    log_fatal("open(CONIN$) failed: rc=%d", (int)GetLastError() );
-    }
-    SetConsoleMode(con.in, DEF_INPMODE );
-    SetConsoleMode(con.out, DEF_OUTMODE );
-
-#elif defined(__EMX__)
-    ttyfp = stdout; /* Fixme: replace by the real functions: see wklib */
-#else
-    ttyfp = batchmode? stderr : fopen (tty_get_ttyname (), "r+");
-    if( !ttyfp ) {
-	log_error("cannot open `%s': %s\n", tty_get_ttyname (),
-                  strerror(errno) );
-	exit(2);
-    }
-#endif
-#ifdef HAVE_TCGETATTR
-    atexit( cleanup );
-#endif
-    initialized = 1;
-}
-
-
-int
-tty_batchmode( int onoff )
-{
-    int old = batchmode;
-    if( onoff != -1 )
-	batchmode = onoff;
-    return old;
-}
-
-int
-tty_no_terminal(int onoff)
-{
-    int old = no_terminal;
-    no_terminal = onoff ? 1 : 0;
-    return old;
-}
-
-void
-tty_printf( const char *fmt, ... )
-{
-    va_list arg_ptr;
-
-    if (no_terminal)
-	return;
-
-    if( !initialized )
-	init_ttyfp();
-
-    va_start( arg_ptr, fmt ) ;
-#ifdef __MINGW32__
-    {   
-        char *buf = NULL;
-        int n;
-	DWORD nwritten;
-
-	n = vasprintf(&buf, fmt, arg_ptr);
-	if( !buf )
-	    log_bug("vasprintf() failed\n");
-        
-	if( !WriteConsoleA( con.out, buf, n, &nwritten, NULL ) )
-	    log_fatal("WriteConsole failed: rc=%d", (int)GetLastError() );
-	if( n != nwritten )
-	    log_fatal("WriteConsole failed: %d != %d\n", n, (int)nwritten );
-	last_prompt_len += n;
-        xfree (buf);
-    }
-#else
-    last_prompt_len += vfprintf(ttyfp,fmt,arg_ptr) ;
-    fflush(ttyfp);
-#endif
-    va_end(arg_ptr);
-}
-
-
-/****************
- * Print a string, but filter all control characters out.
- */
-void
-tty_print_string( byte *p, size_t n )
-{
-    if (no_terminal)
-	return;
-
-    if( !initialized )
-	init_ttyfp();
-
-#ifdef __MINGW32__
-    /* not so effective, change it if you want */
-    for( ; n; n--, p++ )
-	if( iscntrl( *p ) ) {
-	    if( *p == '\n' )
-		tty_printf("\\n");
-	    else if( !*p )
-		tty_printf("\\0");
-	    else
-		tty_printf("\\x%02x", *p);
-	}
-	else
-	    tty_printf("%c", *p);
-#else
-    for( ; n; n--, p++ )
-	if( iscntrl( *p ) ) {
-	    putc('\\', ttyfp);
-	    if( *p == '\n' )
-		putc('n', ttyfp);
-	    else if( !*p )
-		putc('0', ttyfp);
-	    else
-		fprintf(ttyfp, "x%02x", *p );
-	}
-	else
-	    putc(*p, ttyfp);
-#endif
-}
-
-void
-tty_print_utf8_string2( byte *p, size_t n, size_t max_n )
-{
-    size_t i;
-    char *buf;
-
-    if (no_terminal)
-	return;
-
-    /* we can handle plain ascii simpler, so check for it first */
-    for(i=0; i < n; i++ ) {
-	if( p[i] & 0x80 )
-	    break;
-    }
-    if( i < n ) {
-	buf = utf8_to_native( p, n, 0 );
-	if( max_n && (strlen( buf ) > max_n )) {
-	    buf[max_n] = 0;
-	}
-	/*(utf8 conversion already does the control character quoting)*/
-	tty_printf("%s", buf );
-	xfree( buf );
-    }
-    else {
-	if( max_n && (n > max_n) ) {
-	    n = max_n;
-	}
-	tty_print_string( p, n );
-    }
-}
-
-void
-tty_print_utf8_string( byte *p, size_t n )
-{
-    tty_print_utf8_string2( p, n, 0 );
-}
-
-
-static char *
-do_get( const char *prompt, int hidden )
-{
-    char *buf;
-#ifndef __riscos__
-    byte cbuf[1];
-#endif
-    int c, n, i;
-
-    if( batchmode ) {
-	log_error("Sorry, we are in batchmode - can't get input\n");
-	exit(2);
-    }
-
-    if (no_terminal) {
-	log_error("Sorry, no terminal at all requested - can't get input\n");
-	exit(2);
-    }
-
-    if( !initialized )
-	init_ttyfp();
-
-    last_prompt_len = 0;
-    tty_printf( "%s", prompt );
-    buf = xmalloc((n=50));
-    i = 0;
-
-#ifdef __MINGW32__ /* windoze version */
-    if( hidden )
-	SetConsoleMode(con.in, HID_INPMODE );
-
-    for(;;) {
-	DWORD nread;
-
-	if( !ReadConsoleA( con.in, cbuf, 1, &nread, NULL ) )
-	    log_fatal("ReadConsole failed: rc=%d", (int)GetLastError() );
-	if( !nread )
-	    continue;
-	if( *cbuf == '\n' )
-	    break;
-
-	if( !hidden )
-	    last_prompt_len++;
-	c = *cbuf;
-	if( c == '\t' )
-	    c = ' ';
-	else if( c > 0xa0 )
-	    ; /* we don't allow 0xa0, as this is a protected blank which may
-	       * confuse the user */
-	else if( iscntrl(c) )
-	    continue;
-	if( !(i < n-1) ) {
-	    n += 50;
-	    buf = xrealloc (buf, n);
-	}
-	buf[i++] = c;
-    }
-
-    if( hidden )
-	SetConsoleMode(con.in, DEF_INPMODE );
-
-#elif defined(__riscos__)
-    do {
-        c = riscos_getchar();
-        if (c == 0xa || c == 0xd) { /* Return || Enter */
-            c = (int) '\n';
-        } else if (c == 0x8 || c == 0x7f) { /* Backspace || Delete */
-            if (i>0) {
-                i--;
-                if (!hidden) {
-                    last_prompt_len--;
-                    fputc(8, ttyfp);
-                    fputc(32, ttyfp);
-                    fputc(8, ttyfp);
-                    fflush(ttyfp);
-                }
-            } else {
-                fputc(7, ttyfp);
-                fflush(ttyfp);
-            }
-            continue;
-        } else if (c == (int) '\t') { /* Tab */
-            c = ' ';
-        } else if (c > 0xa0) {
-            ; /* we don't allow 0xa0, as this is a protected blank which may
-               * confuse the user */
-        } else if (iscntrl(c)) {
-            continue;
-        }
-        if(!(i < n-1)) {
-            n += 50;
-            buf = xrealloc (buf, n);
-        }
-        buf[i++] = c;
-        if (!hidden) {
-	    last_prompt_len++;
-            fputc(c, ttyfp);
-            fflush(ttyfp);
-        }
-    } while (c != '\n');
-    i = (i>0) ? i-1 : 0;
-#else /* unix version */
-    if( hidden ) {
-#ifdef HAVE_TCGETATTR
-	struct termios term;
-
-	if( tcgetattr(fileno(ttyfp), &termsave) )
-	    log_fatal("tcgetattr() failed: %s\n", strerror(errno) );
-	restore_termios = 1;
-	term = termsave;
-	term.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL);
-	if( tcsetattr( fileno(ttyfp), TCSAFLUSH, &term ) )
-	    log_fatal("tcsetattr() failed: %s\n", strerror(errno) );
-#endif
-    }
-
-    /* fixme: How can we avoid that the \n is echoed w/o disabling
-     * canonical mode - w/o this kill_prompt can't work */
-    while( read(fileno(ttyfp), cbuf, 1) == 1 && *cbuf != '\n' ) {
-	if( !hidden )
-	    last_prompt_len++;
-	c = *cbuf;
-	if( c == CONTROL_D )
-	    log_info("control d found\n");
-	if( c == '\t' )
-	    c = ' ';
-	else if( c > 0xa0 )
-	    ; /* we don't allow 0xa0, as this is a protected blank which may
-	       * confuse the user */
-	else if( iscntrl(c) )
-	    continue;
-	if( !(i < n-1) ) {
-	    n += 50;
-	    buf = xrealloc (buf, n );
-	}
-	buf[i++] = c;
-    }
-    if( *cbuf != '\n' ) {
-	buf[0] = CONTROL_D;
-	i = 1;
-    }
-
-
-    if( hidden ) {
-#ifdef HAVE_TCGETATTR
-	if( tcsetattr(fileno(ttyfp), TCSAFLUSH, &termsave) )
-	    log_error("tcsetattr() failed: %s\n", strerror(errno) );
-	restore_termios = 0;
-#endif
-    }
-#endif /* end unix version */
-    buf[i] = 0;
-    return buf;
-}
-
-
-char *
-tty_get( const char *prompt )
-{
-    return do_get( prompt, 0 );
-}
-
-char *
-tty_get_hidden( const char *prompt )
-{
-    return do_get( prompt, 1 );
-}
-
-
-void
-tty_kill_prompt()
-{
-    if ( no_terminal )
-	return;
-
-    if( !initialized )
-	init_ttyfp();
-
-    if( batchmode )
-	last_prompt_len = 0;
-    if( !last_prompt_len )
-	return;
-#ifdef __MINGW32__
-    tty_printf("\r%*s\r", last_prompt_len, "");
-#else
-    {
-	int i;
-	putc('\r', ttyfp);
-	for(i=0; i < last_prompt_len; i ++ )
-	    putc(' ', ttyfp);
-	putc('\r', ttyfp);
-	fflush(ttyfp);
-    }
-#endif
-    last_prompt_len = 0;
-}
-
-
-int
-tty_get_answer_is_yes( const char *prompt )
-{
-    int yes;
-    char *p = tty_get( prompt );
-    tty_kill_prompt();
-    yes = answer_is_yes(p);
-    xfree(p);
-    return yes;
-}
diff --git a/common/ttyio.h b/common/ttyio.h
deleted file mode 100644
index b3ca7dcaf..000000000
--- a/common/ttyio.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ttyio.h
- * Copyright (C) 1998, 1999, 2000, 2001, 2003 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
- */
-#ifndef GNUPG_COMMON_TTYIO_H
-#define GNUPG_COMMON_TTYIO_H
-
-const char *tty_get_ttyname (void);
-int tty_batchmode (int onoff);
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
-void tty_printf (const char *fmt, ... ) __attribute__ ((format (printf,1,2)));
-#else
-void tty_printf (const char *fmt, ... );
-#endif
-void tty_print_string (unsigned char *p, size_t n);
-void tty_print_utf8_string (unsigned char *p, size_t n);
-void tty_print_utf8_string2 (unsigned char *p, size_t n, size_t max_n);
-char *tty_get (const char *prompt);
-char *tty_get_hidden (const char *prompt);
-void tty_kill_prompt (void);
-int tty_get_answer_is_yes (const char *prompt);
-int tty_no_terminal (int onoff);
-
-
-#endif /*GNUPG_COMMON_TTYIO_H*/
diff --git a/common/util.h b/common/util.h
deleted file mode 100644
index 045851481..000000000
--- a/common/util.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* util.h - Utility functions for Gnupg
- *	Copyright (C) 2001, 2002, 2003 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
- */
-
-#ifndef GNUPG_COMMON_UTIL_H
-#define GNUPG_COMMON_UTIL_H
-
-#include <gcrypt.h> /* We need this for the memory function protos. */
-#include <time.h>   /* We need time_t. */
-#include <gpg-error.h> /* we need gpg-error_t. */
-
-/* to pass hash functions to libksba we need to cast it */
-#define HASH_FNC ((void (*)(void *, const void*,size_t))gcry_md_write)
-
-/* get all the stuff from jnlib */
-#include "../jnlib/logging.h"
-#include "../jnlib/argparse.h"
-#include "../jnlib/stringhelp.h"
-#include "../jnlib/mischelp.h"
-#include "../jnlib/strlist.h"
-#include "../jnlib/dotlock.h"
-#include "../jnlib/utf8conv.h"
-
-/* handy malloc macros  - use only them */
-#define xtrymalloc(a)    gcry_malloc ((a))
-#define xtrycalloc(a,b)  gcry_calloc ((a),(b))
-#define xtryrealloc(a,b) gcry_realloc ((a),(b))
-#define xtrystrdup(a)    gcry_strdup ((a))
-#define xfree(a)         gcry_free ((a))
-
-#define xmalloc(a)       gcry_xmalloc ((a))
-#define xmalloc_secure(a)  gcry_xmalloc_secure ((a))
-#define xcalloc(a,b)     gcry_xcalloc ((a),(b))
-#define xcalloc_secure(a,b) gcry_xcalloc_secure ((a),(b))
-#define xrealloc(a,b)    gcry_xrealloc ((a),(b))
-#define xstrdup(a)       gcry_xstrdup ((a))
-
-/*-- maperror.c --*/
-int map_ksba_err (int err);
-int map_gcry_err (int err);
-int map_kbx_err (int err);
-gpg_error_t map_assuan_err (int err);
-int map_to_assuan_status (int rc);
-
-/*-- gettime.c --*/
-time_t gnupg_get_time (void);
-void   gnupg_set_time (time_t newtime, int freeze);
-int    gnupg_faked_time_p (void);
-u32    make_timestamp (void);
-u32    scan_isodatestr (const char *string);
-u32    add_days_to_timestamp (u32 stamp, u16 days);
-const char *strtimevalue (u32 stamp);
-const char *strtimestamp (u32 stamp); /* GMT */
-const char *asctimestamp (u32 stamp); /* localized */
-
-/*-- signal.c --*/
-void gnupg_init_signals (int mode, void (*fast_cleanup)(void));
-void gnupg_pause_on_sigusr (int which);
-void gnupg_block_all_signals (void);
-void gnupg_unblock_all_signals (void);
-
-/*-- yesno.c --*/
-int answer_is_yes (const char *s);
-int answer_is_yes_no_default (const char *s, int def_answer);
-int answer_is_yes_no_quit (const char *s);
-
-
-/*-- miscellaneous.c --*/
-const char *print_fname_stdout (const char *s);
-const char *print_fname_stdin (const char *s);
-void print_string (FILE *fp, const byte *p, size_t n, int delim);
-void print_utf8_string2 ( FILE *fp, const byte *p, size_t n, int delim);
-void print_utf8_string (FILE *fp, const byte *p, size_t n);
-char *make_printable_string (const byte *p, size_t n, int delim);
-
-int is_file_compressed (const char *s, int *ret_rc);
-
-
-/*-- replacement functions from funcname.c --*/
-#if !HAVE_VASPRINTF
-#include <stdarg.h>
-int vasprintf (char **result, const char *format, va_list *args);
-int asprintf (char **result, const char *format, ...);
-#endif
-
-
-
-/*-- some macros to replace ctype ones and avoid locale problems --*/
-#define spacep(p)   (*(p) == ' ' || *(p) == '\t')
-#define digitp(p)   (*(p) >= '0' && *(p) <= '9')
-#define hexdigitp(a) (digitp (a)                     \
-                      || (*(a) >= 'A' && *(a) <= 'F')  \
-                      || (*(a) >= 'a' && *(a) <= 'f'))
-/* the atoi macros assume that the buffer has only valid digits */
-#define atoi_1(p)   (*(p) - '0' )
-#define atoi_2(p)   ((atoi_1(p) * 10) + atoi_1((p)+1))
-#define atoi_4(p)   ((atoi_2(p) * 100) + atoi_2((p)+2))
-#define xtoi_1(p)   (*(p) <= '9'? (*(p)- '0'): \
-                     *(p) <= 'F'? (*(p)-'A'+10):(*(p)-'a'+10))
-#define xtoi_2(p)   ((xtoi_1(p) * 16) + xtoi_1((p)+1))
-
-
-
-#endif /*GNUPG_COMMON_UTIL_H*/
diff --git a/common/vasprintf.c b/common/vasprintf.c
deleted file mode 100644
index 2af2d3a20..000000000
--- a/common/vasprintf.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Like vsprintf but provides a pointer to malloc'd storage, which must
-   be freed by the caller.
-   Copyright (C) 1994, 2002 Free Software Foundation, Inc.
-
-This file is part of the libiberty library.
-Libiberty is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-Libiberty 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
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with libiberty; see the file COPYING.LIB.  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 <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#ifdef TEST
-int global_total_width;
-#endif
-
-int
-vasprintf (char **result, const char *format, va_list *args)
-{
-  const char *p = format;
-  /* Add one to make sure that it is never zero, which might cause malloc
-     to return NULL.  */
-  int total_width = strlen (format) + 1;
-  va_list ap;
-
-#ifdef va_copy
-  va_copy (ap, args);
-#else
-#ifdef __va_copy
-  __va_copy (ap, args);
-#else
-  memcpy (&ap, args, sizeof (va_list));
-#endif /* __va_copy */
-#endif /* va_copy */
-
-  while (*p != '\0')
-    {
-      if (*p++ == '%')
-	{
-	  while (strchr ("-+ #0", *p))
-	    ++p;
-	  if (*p == '*')
-	    {
-	      ++p;
-	      total_width += abs (va_arg (ap, int));
-	    }
-	  else
-	    total_width += strtoul (p, (char**)&p, 10);
-	  if (*p == '.')
-	    {
-	      ++p;
-	      if (*p == '*')
-		{
-		  ++p;
-		  total_width += abs (va_arg (ap, int));
-		}
-	      else
-	      total_width += strtoul (p, (char**)&p, 10);
-	    }
-	  while (strchr ("hlL", *p))
-	    ++p;
-	  /* Should be big enough for any format specifier except %s
-             and floats.  */
-	  total_width += 30;
-	  switch (*p)
-	    {
-	    case 'd':
-	    case 'i':
-	    case 'o':
-	    case 'u':
-	    case 'x':
-	    case 'X':
-	    case 'c':
-	      (void) va_arg (ap, int);
-	      break;
-	    case 'f':
-	    case 'e':
-	    case 'E':
-	    case 'g':
-	    case 'G':
-	      (void) va_arg (ap, double);
-	      /* Since an ieee double can have an exponent of 307, we'll
-		 make the buffer wide enough to cover the gross case. */
-	      total_width += 307;
-	      break;
-	    case 's':
-              {
-                char *tmp = va_arg (ap, char *);
-                if (tmp)
-                  total_width += strlen (tmp);
-                else /* in case the vsprintf does prints a text */
-                  total_width += 25; /* e.g. "(null pointer reference)" */
-              }
-	      break;
-	    case 'p':
-	    case 'n':
-	      (void) va_arg (ap, char *);
-	      break;
-	    }
-	}
-    }
-#ifdef TEST
-  global_total_width = total_width;
-#endif
-  *result = malloc (total_width);
-  if (*result != NULL)
-    return vsprintf (*result, format, *args);
-  else
-    return 0;
-}
-
-
-int
-asprintf (char **buf, const char *fmt, ...)
-{
-  int status;
-  va_list ap;
-
-  va_start (ap, fmt);
-  status = vasprintf (buf, fmt, ap);
-  va_end (ap);
-  return status;
-}
-
-
-#ifdef TEST
-void
-checkit (const char* format, ...)
-{
-  va_list args;
-  char *result;
-
-  va_start (args, format);
-  vasprintf (&result, format, args);
-  if (strlen (result) < global_total_width)
-    printf ("PASS: ");
-  else
-    printf ("FAIL: ");
-  printf ("%d %s\n", global_total_width, result);
-}
-
-int
-main (void)
-{
-  checkit ("%d", 0x12345678);
-  checkit ("%200d", 5);
-  checkit ("%.300d", 6);
-  checkit ("%100.150d", 7);
-  checkit ("%s", "jjjjjjjjjiiiiiiiiiiiiiiioooooooooooooooooppppppppppppaa\n\
-777777777777777777333333333333366666666666622222222222777777777777733333");
-  checkit ("%f%s%d%s", 1.0, "foo", 77, "asdjffffffffffffffiiiiiiiiiiixxxxx");
-}
-#endif /* TEST */
diff --git a/common/yesno.c b/common/yesno.c
deleted file mode 100644
index 2a96b4e5d..000000000
--- a/common/yesno.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* yesno.c - Yes/No questions
- * Copyright (C) 1998, 1999, 2000, 2001, 2003 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
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include "i18n.h"
-#include "util.h"
-
-int
-answer_is_yes_no_default( const char *s, int def_answer )
-{
-    const char *long_yes = _("yes");
-    const char *short_yes = _("yY");
-    const char *long_no = _("no");
-    const char *short_no = _("nN");
-
-    /* Note: we have to use the local dependent strcasecmp here */
-    if( !strcasecmp(s, long_yes ) )
-	return 1;
-    if( *s && strchr( short_yes, *s ) && !s[1] )
-	return 1;
-    /* test for no strings to catch ambiguities for the next test */
-    if( !strcasecmp(s, long_no ) )
-	return 0;
-    if( *s && strchr( short_no, *s ) && !s[1] )
-	return 0;
-    /* test for the english version (for those who are used to type yes) */
-    if( !ascii_strcasecmp(s, "yes" ) )
-	return 1;
-    if( *s && strchr( "yY", *s ) && !s[1] )
-	return 1;
-    return def_answer;
-}
-
-int
-answer_is_yes( const char *s )
-{
-  return answer_is_yes_no_default(s,0);
-}
-
-/****************
- * Return 1 for yes, -1 for quit, or 0 for no
- */
-int
-answer_is_yes_no_quit( const char *s )
-{
-    const char *long_yes = _("yes");
-    const char *long_no = _("no");
-    const char *long_quit = _("quit");
-    const char *short_yes = _("yY");
-    const char *short_no = _("nN");
-    const char *short_quit = _("qQ");
-
-    /* Note: We have to use the locale dependent strcasecmp */
-    if( !strcasecmp(s, long_no ) )
-	return 0;
-    if( !strcasecmp(s, long_yes ) )
-	return 1;
-    if( !strcasecmp(s, long_quit ) )
-	return -1;
-    if( *s && strchr( short_no, *s ) && !s[1] )
-	return 0;
-    if( *s && strchr( short_yes, *s ) && !s[1] )
-	return 1;
-    if( *s && strchr( short_quit, *s ) && !s[1] )
-	return -1;
-    /* but not here */
-    if( !ascii_strcasecmp(s, "yes" ) )
-	return 1;
-    if( !ascii_strcasecmp(s, "quit" ) )
-	return -1;
-    if( *s && strchr( "yY", *s ) && !s[1] )
-	return 1;
-    if( *s && strchr( "qQ", *s ) && !s[1] )
-	return -1;
-    return 0;
-}