Merge branch 'singlepopt' into single

Conflicts:
	source4/Makefile

17 files changed, 2 insertions, 3342 deletions

diff --git a/source4/Makefile b/source4/Makefile
index 8f81055324..7679786acb 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -70,7 +70,7 @@ smbreadlinesrcdir := lib/smbreadline
 libmessagingsrcdir := lib/messaging
 libeventssrcdir := lib/events
 libcmdlinesrcdir := lib/cmdline
-poptsrcdir := lib/popt
+poptsrcdir := ../popt
 socketwrappersrcdir := ../socket_wrapper
 nsswrappersrcdir := ../nss_wrapper
 appwebsrcdir := lib/appweb
diff --git a/source4/configure.ac b/source4/configure.ac
index c91589b7d2..357121a43b 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -21,7 +21,7 @@ m4_include(lib/util/fsusage.m4)
 m4_include(lib/util/xattr.m4)
 m4_include(lib/util/capability.m4)
 m4_include(lib/util/time.m4)
-m4_include(lib/popt/samba.m4)
+m4_include(../popt/samba.m4)
 m4_include(lib/charset/config.m4)
 m4_include(lib/socket/config.m4)
 m4_include(lib/zlib.m4)
diff --git a/source4/lib/popt/CHANGES b/source4/lib/popt/CHANGES
deleted file mode 100644
index db16a5fdd0..0000000000
--- a/source4/lib/popt/CHANGES
+++ /dev/null
@@ -1,46 +0,0 @@
-1.5 -> 1.6
-	- add ability to perform callbacks for every, not just first, match.
-
-1.3 -> 1.5
-	- heavy dose of const's
-	- poptParseArgvString() now NULL terminates the list
-
-1.2.3 -> 1.3
-	- added support for single -
-	- misc bug fixes
-	- portability improvements
-
-1.2.2 -> 1.2.3
-	- fixed memset() in help message generation (Dale Hawkins)
-	- added extern "C" stuff to popt.h for C++ compilers (Dale Hawkins)
-	- const'ified poptParseArgvString (Jeff Garzik)
-
-1.2.1 -> 1.2.2
-	- fixed bug in chaind alias happens which seems to have only
-	  affected --triggers in rpm
-	- added POPT_ARG_VAL
-	- popt.3 installed by default
-
-1.2 -> 1.2.1
-	- added POPT_ARG_INTL_DOMAIN (Elliot Lee)
-	- updated Makefile's to be more GNUish (Elliot Lee)
-
-1.1 -> 1.2
-	- added popt.3 man page (Robert Lynch)
-	- don't use mmap anymore (its lack of portability isn't worth the
-	  trouble)
-	- added test script
-	- added support for exec
-	- removed support for *_POPT_ALIASES env variable -- it was a bad
-	  idea
-	- reorganized into multiple source files
-	- added automatic help generation, POPT_AUTOHELP
-	- added table callbacks
-	- added table inclusion
-	- updated man page for new features
-	- added test scripts
-
-1.0 -> 1.1
-	- moved to autoconf (Fred Fish)
-	- added STRERROR replacement (Norbert Warmuth)
-	- added const keywords (Bruce Perens)
diff --git a/source4/lib/popt/COPYING b/source4/lib/popt/COPYING
deleted file mode 100644
index b4c7ca876c..0000000000
--- a/source4/lib/popt/COPYING
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 1998  Red Hat Software
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
diff --git a/source4/lib/popt/README b/source4/lib/popt/README
deleted file mode 100644
index 0b5205bfdd..0000000000
--- a/source4/lib/popt/README
+++ /dev/null
@@ -1,18 +0,0 @@
-This is the popt command line option parsing library. While it is similiar
-to getopt(3), it contains a number of enhancements, including:
-
-	1) popt is fully reentrant
-	2) popt can parse arbitrary argv[] style arrays while 
-	   getopt(2) makes this quite difficult
-	3) popt allows users to alias command line arguments
-	4) popt provides convience functions for parsing strings
-	   into argv[] style arrays
-
-popt is used by rpm, the Red Hat install program, and many other Red Hat
-utilities, all of which provide excellent examples of how to use popt. 
-Complete documentation on popt is available in popt.ps (included in this
-tarball), which is excerpted with permission from the book "Linux
-Application Development" by Michael K. Johnson and Erik Troan (availble
-from Addison Wesley in May, 1998).
-
-Comments on popt should be addressed to ewt@redhat.com.
diff --git a/source4/lib/popt/config.mk b/source4/lib/popt/config.mk
deleted file mode 100644
index e015577aea..0000000000
--- a/source4/lib/popt/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-[SUBSYSTEM::LIBPOPT]
-CFLAGS = -Ilib/popt
-
-LIBPOPT_OBJ_FILES = $(addprefix $(poptsrcdir)/, findme.o popt.o poptconfig.o popthelp.o poptparse.o)
-
diff --git a/source4/lib/popt/findme.c b/source4/lib/popt/findme.c
deleted file mode 100644
index a950e50018..0000000000
--- a/source4/lib/popt/findme.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/** \ingroup popt
- * \file popt/findme.c
- */
-
-/* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
-   file accompanying popt source distributions, available from 
-   ftp://ftp.rpm.org/pub/rpm/dist. */
-
-#include "system.h"
-#include "findme.h"
-
-const char * findProgramPath(const char * argv0) {
-    char * path = getenv("PATH");
-    char * pathbuf;
-    char * start, * chptr;
-    char * buf;
-
-    if (argv0 == NULL) return NULL;	/* XXX can't happen */
-    /* If there is a / in the argv[0], it has to be an absolute path */
-    if (strchr(argv0, '/'))
-	return xstrdup(argv0);
-
-    if (path == NULL) return NULL;
-
-    start = pathbuf = alloca(strlen(path) + 1);
-    buf = malloc(strlen(path) + strlen(argv0) + sizeof("/"));
-    if (buf == NULL) return NULL;	/* XXX can't happen */
-    strcpy(pathbuf, path);
-
-    chptr = NULL;
-    /*@-branchstate@*/
-    do {
-	if ((chptr = strchr(start, ':')))
-	    *chptr = '\0';
-	sprintf(buf, "%s/%s", start, argv0);
-
-	if (!access(buf, X_OK))
-	    return buf;
-
-	if (chptr) 
-	    start = chptr + 1;
-	else
-	    start = NULL;
-    } while (start && *start);
-    /*@=branchstate@*/
-
-    free(buf);
-
-    return NULL;
-}
diff --git a/source4/lib/popt/findme.h b/source4/lib/popt/findme.h
deleted file mode 100644
index a016b867ea..0000000000
--- a/source4/lib/popt/findme.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/** \ingroup popt
- * \file popt/findme.h
- */
-
-/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
-   file accompanying popt source distributions, available from 
-   ftp://ftp.rpm.org/pub/rpm/dist. */
-
-#ifndef H_FINDME
-#define H_FINDME
-
-/**
- * Return absolute path to executable by searching PATH.
- * @param argv0		name of executable
- * @return		(malloc'd) absolute path to executable (or NULL)
- */
-/*@null@*/ const char * findProgramPath(/*@null@*/ const char * argv0)
-	/*@*/;
-
-#endif
diff --git a/source4/lib/popt/libpopt.m4 b/source4/lib/popt/libpopt.m4
deleted file mode 100644
index 79980d1d6b..0000000000
--- a/source4/lib/popt/libpopt.m4
+++ /dev/null
@@ -1,43 +0,0 @@
-dnl Check to see if we should use the included popt
-
-INCLUDED_POPT=auto
-AC_ARG_WITH(included-popt,
-[  --with-included-popt    use bundled popt library, not from system],
-[ INCLUDED_POPT=$withval ])
-
-AC_SUBST(POPT_LIBS)
-AC_SUBST(POPT_CFLAGS)
-
-if test x"$INCLUDED_POPT" != x"yes"; then
-	AC_CHECK_HEADERS(popt.h)
-	AC_CHECK_LIB(popt, poptGetContext, [ POPT_LIBS="-lpopt" ])
-	if test x"$ac_cv_header_popt_h" = x"no" -o x"$ac_cv_lib_popt_poptGetContext" = x"no"; then
-		INCLUDED_POPT=yes
-		POPT_CFLAGS=""
-	else
-		INCLUDED_POPT=no
-	fi
-fi
-
-AC_MSG_CHECKING(whether to use included popt)
-AC_MSG_RESULT($INCLUDED_POPT)
-if test x"$INCLUDED_POPT" != x"no"; then
-	dnl find the popt sources. This is meant to work both for 
-	dnl popt standalone builds, and builds of packages using popt
-	poptdir=""
-	poptpaths="$srcdir $srcdir/lib/popt $srcdir/popt $srcdir/../popt"
-	for d in $poptpaths; do
-		if test -f "$d/popt.c"; then
-			poptdir="$d"		
-			POPT_CFLAGS="-I$d"
-			AC_SUBST(poptdir)
-			break
-		fi
-	done
-        if test x"$poptdir" = "x"; then
-		AC_MSG_ERROR([cannot find popt source in $poptpaths])
-	fi
-	POPT_OBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o"
-	AC_SUBST(POPT_OBJ)
-	AC_CHECK_HEADERS([float.h alloca.h])
-fi
diff --git a/source4/lib/popt/popt.c b/source4/lib/popt/popt.c
deleted file mode 100644
index 4f1de65e6f..0000000000
--- a/source4/lib/popt/popt.c
+++ /dev/null
@@ -1,1238 +0,0 @@
-/** \ingroup popt
- * \file popt/popt.c
- */
-
-/* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
-   file accompanying popt source distributions, available from
-   ftp://ftp.rpm.org/pub/rpm/dist */
-
-#undef	MYDEBUG
-
-#include "system.h"
-
-#if HAVE_MATH_H
-#include <math.h>
-#endif
-#if HAVE_FLOAT_H
-#include <float.h>
-#endif
-
-#include "findme.h"
-#include "poptint.h"
-
-#ifdef	MYDEBUG
-/*@unchecked@*/
-int _popt_debug = 0;
-#endif
-
-#ifndef HAVE_STRERROR
-static char * strerror(int errno) {
-    extern int sys_nerr;
-    extern char * sys_errlist[];
-
-    if ((0 <= errno) && (errno < sys_nerr))
-	return sys_errlist[errno];
-    else
-	return POPT_("unknown errno");
-}
-#endif
-
-#ifdef MYDEBUG
-/*@unused@*/ static void prtcon(const char *msg, poptContext con)
-{
-    if (msg) fprintf(stderr, "%s", msg);
-    fprintf(stderr, "\tcon %p os %p nextCharArg \"%s\" nextArg \"%s\" argv[%d] \"%s\"\n",
-	con, con->os,
-	(con->os->nextCharArg ? con->os->nextCharArg : ""),
-	(con->os->nextArg ? con->os->nextArg : ""),
-	con->os->next,
-	(con->os->argv && con->os->argv[con->os->next]
-		? con->os->argv[con->os->next] : ""));
-}
-#endif
-
-void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
-{
-    con->execPath = _free(con->execPath);
-    con->execPath = xstrdup(path);
-    con->execAbsolute = allowAbsolute;
-    /*@-nullstate@*/ /* LCL: con->execPath can be NULL? */
-    return;
-    /*@=nullstate@*/
-}
-
-static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
-	/*@globals internalState@*/
-	/*@modifies internalState@*/
-{
-    if (opt != NULL)
-    for (; opt->longName || opt->shortName || opt->arg; opt++) {
-	if (opt->arg == NULL) continue;		/* XXX program error. */
-	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
-	    /* Recurse on included sub-tables. */
-	    invokeCallbacksPRE(con, opt->arg);
-	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
-		   (opt->argInfo & POPT_CBFLAG_PRE))
-	{   /*@-castfcnptr@*/
-	    poptCallbackType cb = (poptCallbackType)opt->arg;
-	    /*@=castfcnptr@*/
-	    /* Perform callback. */
-	    /*@-moduncon -noeffectuncon @*/
-	    cb(con, POPT_CALLBACK_REASON_PRE, NULL, NULL, opt->descrip);
-	    /*@=moduncon =noeffectuncon @*/
-	}
-    }
-}
-
-static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
-	/*@globals internalState@*/
-	/*@modifies internalState@*/
-{
-    if (opt != NULL)
-    for (; opt->longName || opt->shortName || opt->arg; opt++) {
-	if (opt->arg == NULL) continue;		/* XXX program error. */
-	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
-	    /* Recurse on included sub-tables. */
-	    invokeCallbacksPOST(con, opt->arg);
-	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
-		   (opt->argInfo & POPT_CBFLAG_POST))
-	{   /*@-castfcnptr@*/
-	    poptCallbackType cb = (poptCallbackType)opt->arg;
-	    /*@=castfcnptr@*/
-	    /* Perform callback. */
-	    /*@-moduncon -noeffectuncon @*/
-	    cb(con, POPT_CALLBACK_REASON_POST, NULL, NULL, opt->descrip);
-	    /*@=moduncon =noeffectuncon @*/
-	}
-    }
-}
-
-static void invokeCallbacksOPTION(poptContext con,
-				  const struct poptOption * opt,
-				  const struct poptOption * myOpt,
-				  /*@null@*/ const void * myData, int shorty)
-	/*@globals internalState@*/
-	/*@modifies internalState@*/
-{
-    const struct poptOption * cbopt = NULL;
-
-    if (opt != NULL)
-    for (; opt->longName || opt->shortName || opt->arg; opt++) {
-	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
-	    /* Recurse on included sub-tables. */
-	    if (opt->arg != NULL)	/* XXX program error */
-		invokeCallbacksOPTION(con, opt->arg, myOpt, myData, shorty);
-	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
-		  !(opt->argInfo & POPT_CBFLAG_SKIPOPTION)) {
-	    /* Save callback info. */
-	    cbopt = opt;
-	} else if (cbopt != NULL &&
-		   ((myOpt->shortName && opt->shortName && shorty &&
-			myOpt->shortName == opt->shortName) ||
-		    (myOpt->longName && opt->longName &&
-		/*@-nullpass@*/		/* LCL: opt->longName != NULL */
-			!strcmp(myOpt->longName, opt->longName)))
-		/*@=nullpass@*/
-		   )
-	{   /*@-castfcnptr@*/
-	    poptCallbackType cb = (poptCallbackType)cbopt->arg;
-	    /*@=castfcnptr@*/
-	    const void * cbData = (cbopt->descrip ? cbopt->descrip : myData);
-	    /* Perform callback. */
-	    if (cb != NULL) {	/* XXX program error */
-		/*@-moduncon -noeffectuncon @*/
-		cb(con, POPT_CALLBACK_REASON_OPTION, myOpt,
-			con->os->nextArg, cbData);
-		/*@=moduncon =noeffectuncon @*/
-	    }
-	    /* Terminate (unless explcitly continuing). */
-	    if (!(cbopt->argInfo & POPT_CBFLAG_CONTINUE))
-		return;
-	}
-    }
-}
-
-poptContext poptGetContext(const char * name, int argc, const char ** argv,
-			   const struct poptOption * options, int flags)
-{
-    poptContext con = malloc(sizeof(*con));
-
-    if (con == NULL) return NULL;	/* XXX can't happen */
-    memset(con, 0, sizeof(*con));
-
-    con->os = con->optionStack;
-    con->os->argc = argc;
-    /*@-dependenttrans -assignexpose@*/	/* FIX: W2DO? */
-    con->os->argv = argv;
-    /*@=dependenttrans =assignexpose@*/
-    con->os->argb = NULL;
-
-    if (!(flags & POPT_CONTEXT_KEEP_FIRST))
-	con->os->next = 1;			/* skip argv[0] */
-
-    con->leftovers = calloc( (argc + 1), sizeof(*con->leftovers) );
-    /*@-dependenttrans -assignexpose@*/	/* FIX: W2DO? */
-    con->options = options;
-    /*@=dependenttrans =assignexpose@*/
-    con->aliases = NULL;
-    con->numAliases = 0;
-    con->flags = flags;
-    con->execs = NULL;
-    con->numExecs = 0;
-    con->finalArgvAlloced = argc * 2;
-    con->finalArgv = calloc( con->finalArgvAlloced, sizeof(*con->finalArgv) );
-    con->execAbsolute = 1;
-    con->arg_strip = NULL;
-
-    if (getenv("POSIXLY_CORRECT") || getenv("POSIX_ME_HARDER"))
-	con->flags |= POPT_CONTEXT_POSIXMEHARDER;
-
-    if (name) {
-	char * t = malloc(strlen(name) + 1);
-	if (t) con->appName = strcpy(t, name);
-    }
-
-    /*@-internalglobs@*/
-    invokeCallbacksPRE(con, con->options);
-    /*@=internalglobs@*/
-
-    return con;
-}
-
-static void cleanOSE(/*@special@*/ struct optionStackEntry *os)
-	/*@uses os @*/
-	/*@releases os->nextArg, os->argv, os->argb @*/
-	/*@modifies os @*/
-{
-    os->nextArg = _free(os->nextArg);
-    os->argv = _free(os->argv);
-    os->argb = PBM_FREE(os->argb);
-}
-
-/*@-boundswrite@*/
-void poptResetContext(poptContext con)
-{
-    int i;
-
-    if (con == NULL) return;
-    while (con->os > con->optionStack) {
-	cleanOSE(con->os--);
-    }
-    con->os->argb = PBM_FREE(con->os->argb);
-    con->os->currAlias = NULL;
-    con->os->nextCharArg = NULL;
-    con->os->nextArg = NULL;
-    con->os->next = 1;			/* skip argv[0] */
-
-    con->numLeftovers = 0;
-    con->nextLeftover = 0;
-    con->restLeftover = 0;
-    con->doExec = NULL;
-
-    if (con->finalArgv != NULL)
-    for (i = 0; i < con->finalArgvCount; i++) {
-	/*@-unqualifiedtrans@*/		/* FIX: typedef double indirection. */
-	con->finalArgv[i] = _free(con->finalArgv[i]);
-	/*@=unqualifiedtrans@*/
-    }
-
-    con->finalArgvCount = 0;
-    con->arg_strip = PBM_FREE(con->arg_strip);
-    /*@-nullstate@*/	/* FIX: con->finalArgv != NULL */
-    return;
-    /*@=nullstate@*/
-}
-/*@=boundswrite@*/
-
-/* Only one of longName, shortName should be set, not both. */
-/*@-boundswrite@*/
-static int handleExec(/*@special@*/ poptContext con,
-		/*@null@*/ const char * longName, char shortName)
-	/*@uses con->execs, con->numExecs, con->flags, con->doExec,
-		con->finalArgv, con->finalArgvAlloced, con->finalArgvCount @*/
-	/*@modifies con @*/
-{
-    poptItem item;
-    int i;
-
-    if (con->execs == NULL || con->numExecs <= 0) /* XXX can't happen */
-	return 0;
-
-    for (i = con->numExecs - 1; i >= 0; i--) {
-	item = con->execs + i;
-	if (longName && !(item->option.longName &&
-			!strcmp(longName, item->option.longName)))
-	    continue;
-	else if (shortName != item->option.shortName)
-	    continue;
-	break;
-    }
-    if (i < 0) return 0;
-
-
-    if (con->flags & POPT_CONTEXT_NO_EXEC)
-	return 1;
-
-    if (con->doExec == NULL) {
-	con->doExec = con->execs + i;
-	return 1;
-    }
-
-    /* We already have an exec to do; remember this option for next
-       time 'round */
-    if ((con->finalArgvCount + 1) >= (con->finalArgvAlloced)) {
-	con->finalArgvAlloced += 10;
-	con->finalArgv = realloc(con->finalArgv,
-			sizeof(*con->finalArgv) * con->finalArgvAlloced);
-    }
-
-    i = con->finalArgvCount++;
-    if (con->finalArgv != NULL)	/* XXX can't happen */
-    {	char *s  = malloc((longName ? strlen(longName) : 0) + 3);
-	if (s != NULL) {	/* XXX can't happen */
-	    if (longName)
-		sprintf(s, "--%s", longName);
-	    else
-		sprintf(s, "-%c", shortName);
-	    con->finalArgv[i] = s;
-	} else
-	    con->finalArgv[i] = NULL;
-    }
-
-    /*@-nullstate@*/	/* FIX: con->finalArgv[] == NULL */
-    return 1;
-    /*@=nullstate@*/
-}
-/*@=boundswrite@*/
-
-/* Only one of longName, shortName may be set at a time */
-static int handleAlias(/*@special@*/ poptContext con,
-		/*@null@*/ const char * longName, char shortName,
-		/*@exposed@*/ /*@null@*/ const char * nextCharArg)
-	/*@uses con->aliases, con->numAliases, con->optionStack, con->os,
-		con->os->currAlias, con->os->currAlias->option.longName @*/
-	/*@modifies con @*/
-{
-    poptItem item = con->os->currAlias;
-    int rc;
-    int i;
-
-    if (item) {
-	if (longName && (item->option.longName &&
-		!strcmp(longName, item->option.longName)))
-	    return 0;
-	if (shortName && shortName == item->option.shortName)
-	    return 0;
-    }
-
-    if (con->aliases == NULL || con->numAliases <= 0) /* XXX can't happen */
-	return 0;
-
-    for (i = con->numAliases - 1; i >= 0; i--) {
-	item = con->aliases + i;
-	if (longName && !(item->option.longName &&
-			!strcmp(longName, item->option.longName)))
-	    continue;
-	else if (shortName != item->option.shortName)
-	    continue;
-	break;
-    }
-    if (i < 0) return 0;
-
-    if ((con->os - con->optionStack + 1) == POPT_OPTION_DEPTH)
-	return POPT_ERROR_OPTSTOODEEP;
-
-/*@-boundsread@*/
-    if (nextCharArg && *nextCharArg)
-	con->os->nextCharArg = nextCharArg;
-/*@=boundsread@*/
-
-    con->os++;
-    con->os->next = 0;
-    con->os->stuffed = 0;
-    con->os->nextArg = NULL;
-    con->os->nextCharArg = NULL;
-    con->os->currAlias = con->aliases + i;
-    rc = poptDupArgv(con->os->currAlias->argc, con->os->currAlias->argv,
-		&con->os->argc, &con->os->argv);
-    con->os->argb = NULL;
-
-    return (rc ? rc : 1);
-}
-
-/*@-bounds -boundswrite @*/
-static int execCommand(poptContext con)
-	/*@globals internalState @*/
-	/*@modifies internalState @*/
-{
-    poptItem item = con->doExec;
-    const char ** argv;
-    int argc = 0;
-    int rc;
-
-    if (item == NULL) /*XXX can't happen*/
-	return POPT_ERROR_NOARG;
-
-    if (item->argv == NULL || item->argc < 1 ||
-	(!con->execAbsolute && strchr(item->argv[0], '/')))
-	    return POPT_ERROR_NOARG;
-
-    argv = malloc(sizeof(*argv) *
-			(6 + item->argc + con->numLeftovers + con->finalArgvCount));
-    if (argv == NULL) return POPT_ERROR_MALLOC;	/* XXX can't happen */
-
-    if (!strchr(item->argv[0], '/') && con->execPath) {
-	char *s = alloca(strlen(con->execPath) + strlen(item->argv[0]) + sizeof("/"));
-	sprintf(s, "%s/%s", con->execPath, item->argv[0]);
-	argv[argc] = s;
-    } else {
-	argv[argc] = findProgramPath(item->argv[0]);
-    }
-    if (argv[argc++] == NULL) return POPT_ERROR_NOARG;
-
-    if (item->argc > 1) {
-	memcpy(argv + argc, item->argv + 1, sizeof(*argv) * (item->argc - 1));
-	argc += (item->argc - 1);
-    }
-
-    if (con->finalArgv != NULL && con->finalArgvCount > 0) {
-	memcpy(argv + argc, con->finalArgv,
-		sizeof(*argv) * con->finalArgvCount);
-	argc += con->finalArgvCount;
-    }
-
-    if (con->leftovers != NULL && con->numLeftovers > 0) {
-#if 0
-	argv[argc++] = "--";
-#endif
-	memcpy(argv + argc, con->leftovers, sizeof(*argv) * con->numLeftovers);
-	argc += con->numLeftovers;
-    }
-
-    argv[argc] = NULL;
-
-#ifdef __hpux
-    rc = setresuid(getuid(), getuid(),-1);
-    if (rc) return POPT_ERROR_ERRNO;
-#else
-/*
- * XXX " ... on BSD systems setuid() should be preferred over setreuid()"
- * XXX 	sez' Timur Bakeyev <mc@bat.ru>
- * XXX	from Norbert Warmuth <nwarmuth@privat.circular.de>
- */
-#if defined(HAVE_SETUID)
-    rc = setuid(getuid());
-    if (rc) return POPT_ERROR_ERRNO;
-#elif defined (HAVE_SETREUID)
-    rc = setreuid(getuid(), getuid()); /*hlauer: not portable to hpux9.01 */
-    if (rc) return POPT_ERROR_ERRNO;
-#else
-    ; /* Can't drop privileges */
-#endif
-#endif
-
-    if (argv[0] == NULL)
-	return POPT_ERROR_NOARG;
-
-#ifdef	MYDEBUG
-if (_popt_debug)
-    {	const char ** avp;
-	fprintf(stderr, "==> execvp(%s) argv[%d]:", argv[0], argc);
-	for (avp = argv; *avp; avp++)
-	    fprintf(stderr, " '%s'", *avp);
-	fprintf(stderr, "\n");
-    }
-#endif
-
-    rc = execvp(argv[0], (char *const *)argv);
-
-    return POPT_ERROR_ERRNO;
-}
-/*@=bounds =boundswrite @*/
-
-/*@-boundswrite@*/
-/*@observer@*/ /*@null@*/ static const struct poptOption *
-findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
-		char shortName,
-		/*@null@*/ /*@out@*/ poptCallbackType * callback,
-		/*@null@*/ /*@out@*/ const void ** callbackData,
-		int singleDash)
-	/*@modifies *callback, *callbackData */
-{
-    const struct poptOption * cb = NULL;
-
-    /* This happens when a single - is given */
-    if (singleDash && !shortName && (longName && *longName == '\0'))
-	shortName = '-';
-
-    for (; opt->longName || opt->shortName || opt->arg; opt++) {
-
-	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
-	    const struct poptOption * opt2;
-
-	    /* Recurse on included sub-tables. */
-	    if (opt->arg == NULL) continue;	/* XXX program error */
-	    opt2 = findOption(opt->arg, longName, shortName, callback,
-			      callbackData, singleDash);
-	    if (opt2 == NULL) continue;
-	    /* Sub-table data will be inheirited if no data yet. */
-	    if (!(callback && *callback)) return opt2;
-	    if (!(callbackData && *callbackData == NULL)) return opt2;
-	    /*@-observertrans -dependenttrans @*/
-	    *callbackData = opt->descrip;
-	    /*@=observertrans =dependenttrans @*/
-	    return opt2;
-	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK) {
-	    cb = opt;
-	} else if (longName && opt->longName &&
-		   (!singleDash || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) &&
-		/*@-nullpass@*/		/* LCL: opt->longName != NULL */
-		   !strcmp(longName, opt->longName))
-		/*@=nullpass@*/
-	{
-	    break;
-	} else if (shortName && shortName == opt->shortName) {
-	    break;
-	}
-    }
-
-    if (!opt->longName && !opt->shortName)
-	return NULL;
-    /*@-modobserver -mods @*/
-    if (callback) *callback = NULL;
-    if (callbackData) *callbackData = NULL;
-    if (cb) {
-	if (callback)
-	/*@-castfcnptr@*/
-	    *callback = (poptCallbackType)cb->arg;
-	/*@=castfcnptr@*/
-	if (!(cb->argInfo & POPT_CBFLAG_INC_DATA)) {
-	    if (callbackData)
-		/*@-observertrans@*/	/* FIX: typedef double indirection. */
-		*callbackData = cb->descrip;
-		/*@=observertrans@*/
-	}
-    }
-    /*@=modobserver =mods @*/
-
-    return opt;
-}
-/*@=boundswrite@*/
-
-static const char * findNextArg(/*@special@*/ poptContext con,
-		unsigned argx, int delete_arg)
-	/*@uses con->optionStack, con->os,
-		con->os->next, con->os->argb, con->os->argc, con->os->argv @*/
-	/*@modifies con @*/
-{
-    struct optionStackEntry * os = con->os;
-    const char * arg;
-
-    do {
-	int i;
-	arg = NULL;
-	while (os->next == os->argc && os > con->optionStack) os--;
-	if (os->next == os->argc && os == con->optionStack) break;
-	if (os->argv != NULL)
-	for (i = os->next; i < os->argc; i++) {
-	    /*@-sizeoftype@*/
-	    if (os->argb && PBM_ISSET(i, os->argb))
-		/*@innercontinue@*/ continue;
-	    if (*os->argv[i] == '-')
-		/*@innercontinue@*/ continue;
-	    if (--argx > 0)
-		/*@innercontinue@*/ continue;
-	    arg = os->argv[i];
-	    if (delete_arg) {
-		if (os->argb == NULL) os->argb = PBM_ALLOC(os->argc);
-		if (os->argb != NULL)	/* XXX can't happen */
-		PBM_SET(i, os->argb);
-	    }
-	    /*@innerbreak@*/ break;
-	    /*@=sizeoftype@*/
-	}
-	if (os > con->optionStack) os--;
-    } while (arg == NULL);
-    return arg;
-}
-
-/*@-boundswrite@*/
-static /*@only@*/ /*@null@*/ const char *
-expandNextArg(/*@special@*/ poptContext con, const char * s)
-	/*@uses con->optionStack, con->os,
-		con->os->next, con->os->argb, con->os->argc, con->os->argv @*/
-	/*@modifies con @*/
-{
-    const char * a = NULL;
-    size_t alen;
-    char *t, *te;
-    size_t tn = strlen(s) + 1;
-    char c;
-
-    te = t = malloc(tn);;
-    if (t == NULL) return NULL;		/* XXX can't happen */
-    while ((c = *s++) != '\0') {
-	switch (c) {
-#if 0	/* XXX can't do this */
-	case '\\':	/* escape */
-	    c = *s++;
-	    /*@switchbreak@*/ break;
-#endif
-	case '!':
-	    if (!(s[0] == '#' && s[1] == ':' && s[2] == '+'))
-		/*@switchbreak@*/ break;
-	    /* XXX Make sure that findNextArg deletes only next arg. */
-	    if (a == NULL) {
-		if ((a = findNextArg(con, 1, 1)) == NULL)
-		    /*@switchbreak@*/ break;
-	    }
-	    s += 3;
-
-	    alen = strlen(a);
-	    tn += alen;
-	    *te = '\0';
-	    t = realloc(t, tn);
-	    te = t + strlen(t);
-	    strncpy(te, a, alen); te += alen;
-	    continue;
-	    /*@notreached@*/ /*@switchbreak@*/ break;
-	default:
-	    /*@switchbreak@*/ break;
-	}
-	*te++ = c;
-    }
-    *te = '\0';
-    t = realloc(t, strlen(t) + 1);	/* XXX memory leak, hard to plug */
-    return t;
-}
-/*@=boundswrite@*/
-
-static void poptStripArg(/*@special@*/ poptContext con, int which)
-	/*@uses con->arg_strip, con->optionStack @*/
-	/*@defines con->arg_strip @*/
-	/*@modifies con @*/
-{
-    /*@-sizeoftype@*/
-    if (con->arg_strip == NULL)
-	con->arg_strip = PBM_ALLOC(con->optionStack[0].argc);
-    if (con->arg_strip != NULL)		/* XXX can't happen */
-    PBM_SET(which, con->arg_strip);
-    /*@=sizeoftype@*/
-    /*@-compdef@*/ /* LCL: con->arg_strip udefined? */
-    return;
-    /*@=compdef@*/
-}
-
-int poptSaveLong(long * arg, int argInfo, long aLong)
-{
-    /* XXX Check alignment, may fail on funky platforms. */
-    if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
-	return POPT_ERROR_NULLARG;
-
-    if (argInfo & POPT_ARGFLAG_NOT)
-	aLong = ~aLong;
-    switch (argInfo & POPT_ARGFLAG_LOGICALOPS) {
-    case 0:
-	*arg = aLong;
-	break;
-    case POPT_ARGFLAG_OR:
-	*arg |= aLong;
-	break;
-    case POPT_ARGFLAG_AND:
-	*arg &= aLong;
-	break;
-    case POPT_ARGFLAG_XOR:
-	*arg ^= aLong;
-	break;
-    default:
-	return POPT_ERROR_BADOPERATION;
-	/*@notreached@*/ break;
-    }
-    return 0;
-}
-
-int poptSaveInt(/*@null@*/ int * arg, int argInfo, long aLong)
-{
-    /* XXX Check alignment, may fail on funky platforms. */
-    if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
-	return POPT_ERROR_NULLARG;
-
-    if (argInfo & POPT_ARGFLAG_NOT)
-	aLong = ~aLong;
-    switch (argInfo & POPT_ARGFLAG_LOGICALOPS) {
-    case 0:
-	*arg = aLong;
-	break;
-    case POPT_ARGFLAG_OR:
-	*arg |= aLong;
-	break;
-    case POPT_ARGFLAG_AND:
-	*arg &= aLong;
-	break;
-    case POPT_ARGFLAG_XOR:
-	*arg ^= aLong;
-	break;
-    default:
-	return POPT_ERROR_BADOPERATION;
-	/*@notreached@*/ break;
-    }
-    return 0;
-}
-
-/*@-boundswrite@*/
-/* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
-int poptGetNextOpt(poptContext con)
-{
-    const struct poptOption * opt = NULL;
-    int done = 0;
-
-    if (con == NULL)
-	return -1;
-    while (!done) {
-	const char * origOptString = NULL;
-	poptCallbackType cb = NULL;
-	const void * cbData = NULL;
-	const char * longArg = NULL;
-	int canstrip = 0;
-	int shorty = 0;
-
-	while (!con->os->nextCharArg && con->os->next == con->os->argc
-		&& con->os > con->optionStack) {
-	    cleanOSE(con->os--);
-	}
-	if (!con->os->nextCharArg && con->os->next == con->os->argc) {
-	    /*@-internalglobs@*/
-	    invokeCallbacksPOST(con, con->options);
-	    /*@=internalglobs@*/
-	    if (con->doExec) return execCommand(con);
-	    return -1;
-	}
-
-	/* Process next long option */
-	if (!con->os->nextCharArg) {
-	    char * localOptString, * optString;
-	    int thisopt;
-
-	    /*@-sizeoftype@*/
-	    if (con->os->argb && PBM_ISSET(con->os->next, con->os->argb)) {
-		con->os->next++;
-		continue;
-	    }
-	    /*@=sizeoftype@*/
-	    thisopt = con->os->next;
-	    if (con->os->argv != NULL)	/* XXX can't happen */
-	    origOptString = con->os->argv[con->os->next++];
-
-	    if (origOptString == NULL)	/* XXX can't happen */
-		return POPT_ERROR_BADOPT;
-
-	    if (con->restLeftover || *origOptString != '-') {
-		if (con->flags & POPT_CONTEXT_POSIXMEHARDER)
-		    con->restLeftover = 1;
-		if (con->flags & POPT_CONTEXT_ARG_OPTS) {
-		    con->os->nextArg = xstrdup(origOptString);
-		    return 0;
-		}
-		if (con->leftovers != NULL)	/* XXX can't happen */
-		    con->leftovers[con->numLeftovers++] = origOptString;
-		continue;
-	    }
-
-	    /* Make a copy we can hack at */
-	    localOptString = optString =
-		strcpy(alloca(strlen(origOptString) + 1), origOptString);
-
-	    if (optString[0] == '\0')
-		return POPT_ERROR_BADOPT;
-
-	    if (optString[1] == '-' && !optString[2]) {
-		con->restLeftover = 1;
-		continue;
-	    } else {
-		char *oe;
-		int singleDash;
-
-		optString++;
-		if (*optString == '-')
-		    singleDash = 0, optString++;
-		else
-		    singleDash = 1;
-
-		/* XXX aliases with arg substitution need "--alias=arg" */
-		if (handleAlias(con, optString, '\0', NULL))
-		    continue;
-
-		if (handleExec(con, optString, '\0'))
-		    continue;
-
-		/* Check for "--long=arg" option. */
-		for (oe = optString; *oe && *oe != '='; oe++)
-		    {};
-		if (*oe == '=') {
-		    *oe++ = '\0';
-		    /* XXX longArg is mapped back to persistent storage. */
-		    longArg = origOptString + (oe - localOptString);
-		}
-
-		opt = findOption(con->options, optString, '\0', &cb, &cbData,
-				 singleDash);
-		if (!opt && !singleDash)
-		    return POPT_ERROR_BADOPT;
-	    }
-
-	    if (!opt) {
-		con->os->nextCharArg = origOptString + 1;
-	    } else {
-		if (con->os == con->optionStack &&
-		   opt->argInfo & POPT_ARGFLAG_STRIP)
-		{
-		    canstrip = 1;
-		    poptStripArg(con, thisopt);
-		}
-		shorty = 0;
-	    }
-	}
-
-	/* Process next short option */
-	/*@-branchstate@*/		/* FIX: W2DO? */
-	if (con->os->nextCharArg) {
-	    origOptString = con->os->nextCharArg;
-
-	    con->os->nextCharArg = NULL;
-
-	    if (handleAlias(con, NULL, *origOptString, origOptString + 1))
-		continue;
-
-	    if (handleExec(con, NULL, *origOptString)) {
-		/* Restore rest of short options for further processing */
-		origOptString++;
-		if (*origOptString != '\0')
-		    con->os->nextCharArg = origOptString;
-		continue;
-	    }
-
-	    opt = findOption(con->options, NULL, *origOptString, &cb,
-			     &cbData, 0);
-	    if (!opt)
-		return POPT_ERROR_BADOPT;
-	    shorty = 1;
-
-	    origOptString++;
-	    if (*origOptString != '\0')
-		con->os->nextCharArg = origOptString;
-	}
-	/*@=branchstate@*/
-
-	if (opt == NULL) return POPT_ERROR_BADOPT;	/* XXX can't happen */
-	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
-	    if (poptSaveInt((int *)opt->arg, opt->argInfo, 1L))
-		return POPT_ERROR_BADOPERATION;
-	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL) {
-	    if (opt->arg) {
-		if (poptSaveInt((int *)opt->arg, opt->argInfo, (long)opt->val))
-		    return POPT_ERROR_BADOPERATION;
-	    }
-	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
-	    con->os->nextArg = _free(con->os->nextArg);
-	    /*@-usedef@*/	/* FIX: W2DO? */
-	    if (longArg) {
-	    /*@=usedef@*/
-		longArg = expandNextArg(con, longArg);
-		con->os->nextArg = longArg;
-	    } else if (con->os->nextCharArg) {
-		longArg = expandNextArg(con, con->os->nextCharArg);
-		con->os->nextArg = longArg;
-		con->os->nextCharArg = NULL;
-	    } else {
-		while (con->os->next == con->os->argc &&
-		       con->os > con->optionStack) {
-		    cleanOSE(con->os--);
-		}
-		if (con->os->next == con->os->argc) {
-		    if (!(opt->argInfo & POPT_ARGFLAG_OPTIONAL))
-			/*@-compdef@*/	/* FIX: con->os->argv not defined */
-			return POPT_ERROR_NOARG;
-			/*@=compdef@*/
-		    con->os->nextArg = NULL;
-		} else {
-
-		    /*
-		     * Make sure this isn't part of a short arg or the
-		     * result of an alias expansion.
-		     */
-		    if (con->os == con->optionStack &&
-			(opt->argInfo & POPT_ARGFLAG_STRIP) &&
-			canstrip) {
-			poptStripArg(con, con->os->next);
-		    }
-		
-		    if (con->os->argv != NULL) {	/* XXX can't happen */
-			/* XXX watchout: subtle side-effects live here. */
-			longArg = con->os->argv[con->os->next++];
-			longArg = expandNextArg(con, longArg);
-			con->os->nextArg = longArg;
-		    }
-		}
-	    }
-	    longArg = NULL;
-
-	    if (opt->arg) {
-		switch (opt->argInfo & POPT_ARG_MASK) {
-		case POPT_ARG_STRING:
-		    /* XXX memory leak, hard to plug */
-		    *((const char **) opt->arg) = (con->os->nextArg)
-			? xstrdup(con->os->nextArg) : NULL;
-		    /*@switchbreak@*/ break;
-
-		case POPT_ARG_INT:
-		case POPT_ARG_LONG:
-		{   long aLong = 0;
-		    char *end;
-
-		    if (con->os->nextArg) {
-			aLong = strtol(con->os->nextArg, &end, 0);
-			if (!(end && *end == '\0'))
-			    return POPT_ERROR_BADNUMBER;
-		    }
-
-		    if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_LONG) {
-			if (aLong == LONG_MIN || aLong == LONG_MAX)
-			    return POPT_ERROR_OVERFLOW;
-			if (poptSaveLong((long *)opt->arg, opt->argInfo, aLong))
-			    return POPT_ERROR_BADOPERATION;
-		    } else {
-			if (aLong > INT_MAX || aLong < INT_MIN)
-			    return POPT_ERROR_OVERFLOW;
-			if (poptSaveInt((int *)opt->arg, opt->argInfo, aLong))
-			    return POPT_ERROR_BADOPERATION;
-		    }
-		}   /*@switchbreak@*/ break;
-
-		case POPT_ARG_FLOAT:
-		case POPT_ARG_DOUBLE:
-		{   double aDouble = 0.0;
-		    char *end;
-
-		    if (con->os->nextArg) {
-			/*@-mods@*/
-			int saveerrno = errno;
-			errno = 0;
-			aDouble = strtod(con->os->nextArg, &end);
-			if (errno == ERANGE)
-			    return POPT_ERROR_OVERFLOW;
-			errno = saveerrno;
-			/*@=mods@*/
-			if (*end != '\0')
-			    return POPT_ERROR_BADNUMBER;
-		    }
-
-		    if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_DOUBLE) {
-			*((double *) opt->arg) = aDouble;
-		    } else {
-#define _ABS(a)	((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
-			if ((_ABS(aDouble) - FLT_MAX) > DBL_EPSILON)
-			    return POPT_ERROR_OVERFLOW;
-			if ((FLT_MIN - _ABS(aDouble)) > DBL_EPSILON)
-			    return POPT_ERROR_OVERFLOW;
-			*((float *) opt->arg) = aDouble;
-		    }
-		}   /*@switchbreak@*/ break;
-		default:
-		    fprintf(stdout,
-			POPT_("option type (%d) not implemented in popt\n"),
-			(opt->argInfo & POPT_ARG_MASK));
-		    exit(EXIT_FAILURE);
-		    /*@notreached@*/ /*@switchbreak@*/ break;
-		}
-	    }
-	}
-
-	if (cb) {
-	    /*@-internalglobs@*/
-	    invokeCallbacksOPTION(con, con->options, opt, cbData, shorty);
-	    /*@=internalglobs@*/
-	} else if (opt->val && ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL))
-	    done = 1;
-
-	if ((con->finalArgvCount + 2) >= (con->finalArgvAlloced)) {
-	    con->finalArgvAlloced += 10;
-	    con->finalArgv = realloc(con->finalArgv,
-			    sizeof(*con->finalArgv) * con->finalArgvAlloced);
-	}
-
-	if (con->finalArgv != NULL)
-	{   char *s = malloc((opt->longName ? strlen(opt->longName) : 0) + 3);
-	    if (s != NULL) {	/* XXX can't happen */
-		if (opt->longName)
-		    sprintf(s, "%s%s",
-			((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
-			opt->longName);
-		else
-		    sprintf(s, "-%c", opt->shortName);
-		con->finalArgv[con->finalArgvCount++] = s;
-	    } else
-		con->finalArgv[con->finalArgvCount++] = NULL;
-	}
-
-	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE)
-	    /*@-ifempty@*/ ; /*@=ifempty@*/
-	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL)
-	    /*@-ifempty@*/ ; /*@=ifempty@*/
-	else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
-	    if (con->finalArgv != NULL && con->os->nextArg)
-	        con->finalArgv[con->finalArgvCount++] =
-			/*@-nullpass@*/	/* LCL: con->os->nextArg != NULL */
-			xstrdup(con->os->nextArg);
-			/*@=nullpass@*/
-	}
-    }
-
-    return (opt ? opt->val : -1);	/* XXX can't happen */
-}
-/*@=boundswrite@*/
-
-const char * poptGetOptArg(poptContext con)
-{
-    const char * ret = NULL;
-    /*@-branchstate@*/
-    if (con) {
-	ret = con->os->nextArg;
-	con->os->nextArg = NULL;
-    }
-    /*@=branchstate@*/
-    return ret;
-}
-
-const char * poptGetArg(poptContext con)
-{
-    const char * ret = NULL;
-    if (con && con->leftovers != NULL && con->nextLeftover < con->numLeftovers)
-	ret = con->leftovers[con->nextLeftover++];
-    return ret;
-}
-
-const char * poptPeekArg(poptContext con)
-{
-    const char * ret = NULL;
-    if (con && con->leftovers != NULL && con->nextLeftover < con->numLeftovers)
-	ret = con->leftovers[con->nextLeftover];
-    return ret;
-}
-
-/*@-boundswrite@*/
-const char ** poptGetArgs(poptContext con)
-{
-    if (con == NULL ||
-	con->leftovers == NULL || con->numLeftovers == con->nextLeftover)
-	return NULL;
-
-    /* some apps like [like RPM ;-) ] need this NULL terminated */
-    con->leftovers[con->numLeftovers] = NULL;
-
-    /*@-nullret -nullstate @*/	/* FIX: typedef double indirection. */
-    return (con->leftovers + con->nextLeftover);
-    /*@=nullret =nullstate @*/
-}
-/*@=boundswrite@*/
-
-poptContext poptFreeContext(poptContext con)
-{
-    poptItem item;
-    int i;
-
-    if (con == NULL) return con;
-    poptResetContext(con);
-    con->os->argb = _free(con->os->argb);
-
-    if (con->aliases != NULL)
-    for (i = 0; i < con->numAliases; i++) {
-	item = con->aliases + i;
-	/*@-modobserver -observertrans -dependenttrans@*/
-	item->option.longName = _free(item->option.longName);
-	item->option.descrip = _free(item->option.descrip);
-	item->option.argDescrip = _free(item->option.argDescrip);
-	/*@=modobserver =observertrans =dependenttrans@*/
-	item->argv = _free(item->argv);
-    }
-    con->aliases = _free(con->aliases);
-
-    if (con->execs != NULL)
-    for (i = 0; i < con->numExecs; i++) {
-	item = con->execs + i;
-	/*@-modobserver -observertrans -dependenttrans@*/
-	item->option.longName = _free(item->option.longName);
-	item->option.descrip = _free(item->option.descrip);
-	item->option.argDescrip = _free(item->option.argDescrip);
-	/*@=modobserver =observertrans =dependenttrans@*/
-	item->argv = _free(item->argv);
-    }
-    con->execs = _free(con->execs);
-
-    con->leftovers = _free(con->leftovers);
-    con->finalArgv = _free(con->finalArgv);
-    con->appName = _free(con->appName);
-    con->otherHelp = _free(con->otherHelp);
-    con->execPath = _free(con->execPath);
-    con->arg_strip = PBM_FREE(con->arg_strip);
-    
-    con = _free(con);
-    return con;
-}
-
-int poptAddAlias(poptContext con, struct poptAlias alias,
-		/*@unused@*/ int flags)
-{
-    poptItem item = alloca(sizeof(*item));
-    memset(item, 0, sizeof(*item));
-    item->option.longName = alias.longName;
-    item->option.shortName = alias.shortName;
-    item->option.argInfo = POPT_ARGFLAG_DOC_HIDDEN;
-    item->option.arg = 0;
-    item->option.val = 0;
-    item->option.descrip = NULL;
-    item->option.argDescrip = NULL;
-    item->argc = alias.argc;
-    item->argv = alias.argv;
-    return poptAddItem(con, item, 0);
-}
-
-/*@-boundswrite@*/
-/*@-mustmod@*/ /* LCL: con not modified? */
-int poptAddItem(poptContext con, poptItem newItem, int flags)
-{
-    poptItem * items, item;
-    int * nitems;
-
-    switch (flags) {
-    case 1:
-	items = &con->execs;
-	nitems = &con->numExecs;
-	break;
-    case 0:
-	items = &con->aliases;
-	nitems = &con->numAliases;
-	break;
-    default:
-	return 1;
-	/*@notreached@*/ break;
-    }
-
-    *items = realloc((*items), ((*nitems) + 1) * sizeof(**items));
-    if ((*items) == NULL)
-	return 1;
-
-    item = (*items) + (*nitems);
-
-    item->option.longName =
-	(newItem->option.longName ? xstrdup(newItem->option.longName) : NULL);
-    item->option.shortName = newItem->option.shortName;
-    item->option.argInfo = newItem->option.argInfo;
-    item->option.arg = newItem->option.arg;
-    item->option.val = newItem->option.val;
-    item->option.descrip =
-	(newItem->option.descrip ? xstrdup(newItem->option.descrip) : NULL);
-    item->option.argDescrip =
-       (newItem->option.argDescrip ? xstrdup(newItem->option.argDescrip) : NULL);
-    item->argc = newItem->argc;
-    item->argv = newItem->argv;
-
-    (*nitems)++;
-
-    return 0;
-}
-/*@=mustmod@*/
-/*@=boundswrite@*/
-
-const char * poptBadOption(poptContext con, int flags)
-{
-    struct optionStackEntry * os = NULL;
-
-    if (con != NULL)
-	os = (flags & POPT_BADOPTION_NOALIAS) ? con->optionStack : con->os;
-
-    /*@-nullderef@*/	/* LCL: os->argv != NULL */
-    return (os && os->argv ? os->argv[os->next - 1] : NULL);
-    /*@=nullderef@*/
-}
-
-const char *poptStrerror(const int error)
-{
-    switch (error) {
-      case POPT_ERROR_NOARG:
-	return POPT_("missing argument");
-      case POPT_ERROR_BADOPT:
-	return POPT_("unknown option");
-      case POPT_ERROR_BADOPERATION:
-	return POPT_("mutually exclusive logical operations requested");
-      case POPT_ERROR_NULLARG:
-	return POPT_("opt->arg should not be NULL");
-      case POPT_ERROR_OPTSTOODEEP:
-	return POPT_("aliases nested too deeply");
-      case POPT_ERROR_BADQUOTE:
-	return POPT_("error in parameter quoting");
-      case POPT_ERROR_BADNUMBER:
-	return POPT_("invalid numeric value");
-      case POPT_ERROR_OVERFLOW:
-	return POPT_("number too large or too small");
-      case POPT_ERROR_MALLOC:
-	return POPT_("memory allocation failed");
-      case POPT_ERROR_ERRNO:
-	return strerror(errno);
-      default:
-	return POPT_("unknown error");
-    }
-}
-
-int poptStuffArgs(poptContext con, const char ** argv)
-{
-    int argc;
-    int rc;
-
-    if ((con->os - con->optionStack) == POPT_OPTION_DEPTH)
-	return POPT_ERROR_OPTSTOODEEP;
-
-    for (argc = 0; argv[argc]; argc++)
-	{};
-
-    con->os++;
-    con->os->next = 0;
-    con->os->nextArg = NULL;
-    con->os->nextCharArg = NULL;
-    con->os->currAlias = NULL;
-    rc = poptDupArgv(argc, argv, &con->os->argc, &con->os->argv);
-    con->os->argb = NULL;
-    con->os->stuffed = 1;
-
-    return rc;
-}
-
-const char * poptGetInvocationName(poptContext con)
-{
-    return (con->os->argv ? con->os->argv[0] : "");
-}
-
-/*@-boundswrite@*/
-int poptStrippedArgv(poptContext con, int argc, char ** argv)
-{
-    int numargs = argc;
-    int j = 1;
-    int i;
-    
-    /*@-sizeoftype@*/
-    if (con->arg_strip)
-    for (i = 1; i < argc; i++) {
-	if (PBM_ISSET(i, con->arg_strip))
-	    numargs--;
-    }
-    
-    for (i = 1; i < argc; i++) {
-	if (con->arg_strip && PBM_ISSET(i, con->arg_strip))
-	    continue;
-	argv[j] = (j < numargs) ? argv[i] : NULL;
-	j++;
-    }
-    /*@=sizeoftype@*/
-    
-    return numargs;
-}
-/*@=boundswrite@*/
diff --git a/source4/lib/popt/popt.h b/source4/lib/popt/popt.h
deleted file mode 100644
index 04c9f655ab..0000000000
--- a/source4/lib/popt/popt.h
+++ /dev/null
@@ -1,541 +0,0 @@
-/** \file popt/popt.h
- * \ingroup popt
- */
-
-/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
-   file accompanying popt source distributions, available from 
-   ftp://ftp.rpm.org/pub/rpm/dist. */
-
-#ifndef H_POPT
-#define H_POPT
-
-#include <stdio.h>			/* for FILE * */
-
-#define POPT_OPTION_DEPTH	10
-
-/** \ingroup popt
- * \name Arg type identifiers
- */
-/*@{*/
-#define POPT_ARG_NONE		0	/*!< no arg */
-#define POPT_ARG_STRING		1	/*!< arg will be saved as string */
-#define POPT_ARG_INT		2	/*!< arg will be converted to int */
-#define POPT_ARG_LONG		3	/*!< arg will be converted to long */
-#define POPT_ARG_INCLUDE_TABLE	4	/*!< arg points to table */
-#define POPT_ARG_CALLBACK	5	/*!< table-wide callback... must be
-					   set first in table; arg points 
-					   to callback, descrip points to 
-					   callback data to pass */
-#define POPT_ARG_INTL_DOMAIN    6       /*!< set the translation domain
-					   for this table and any
-					   included tables; arg points
-					   to the domain string */
-#define POPT_ARG_VAL		7	/*!< arg should take value val */
-#define	POPT_ARG_FLOAT		8	/*!< arg will be converted to float */
-#define	POPT_ARG_DOUBLE		9	/*!< arg will be converted to double */
-
-#define POPT_ARG_MASK		0x0000FFFF
-/*@}*/
-
-/** \ingroup popt
- * \name Arg modifiers
- */
-/*@{*/
-#define POPT_ARGFLAG_ONEDASH	0x80000000  /*!< allow -longoption */
-#define POPT_ARGFLAG_DOC_HIDDEN 0x40000000  /*!< don't show in help/usage */
-#define POPT_ARGFLAG_STRIP	0x20000000  /*!< strip this arg from argv(only applies to long args) */
-#define	POPT_ARGFLAG_OPTIONAL	0x10000000  /*!< arg may be missing */
-
-#define	POPT_ARGFLAG_OR		0x08000000  /*!< arg will be or'ed */
-#define	POPT_ARGFLAG_NOR	0x09000000  /*!< arg will be nor'ed */
-#define	POPT_ARGFLAG_AND	0x04000000  /*!< arg will be and'ed */
-#define	POPT_ARGFLAG_NAND	0x05000000  /*!< arg will be nand'ed */
-#define	POPT_ARGFLAG_XOR	0x02000000  /*!< arg will be xor'ed */
-#define	POPT_ARGFLAG_NOT	0x01000000  /*!< arg will be negated */
-#define POPT_ARGFLAG_LOGICALOPS \
-        (POPT_ARGFLAG_OR|POPT_ARGFLAG_AND|POPT_ARGFLAG_XOR)
-
-#define	POPT_BIT_SET	(POPT_ARG_VAL|POPT_ARGFLAG_OR)
-					/*!< set arg bit(s) */
-#define	POPT_BIT_CLR	(POPT_ARG_VAL|POPT_ARGFLAG_NAND)
-					/*!< clear arg bit(s) */
-
-#define	POPT_ARGFLAG_SHOW_DEFAULT 0x00800000 /*!< show default value in --help */
-
-/*@}*/
-
-/** \ingroup popt
- * \name Callback modifiers
- */
-/*@{*/
-#define POPT_CBFLAG_PRE		0x80000000  /*!< call the callback before parse */
-#define POPT_CBFLAG_POST	0x40000000  /*!< call the callback after parse */
-#define POPT_CBFLAG_INC_DATA	0x20000000  /*!< use data from the include line,
-					       not the subtable */
-#define POPT_CBFLAG_SKIPOPTION	0x10000000  /*!< don't callback with option */
-#define POPT_CBFLAG_CONTINUE	0x08000000  /*!< continue callbacks with option */
-/*@}*/
-
-/** \ingroup popt
- * \name Error return values
- */
-/*@{*/
-#define POPT_ERROR_NOARG	-10	/*!< missing argument */
-#define POPT_ERROR_BADOPT	-11	/*!< unknown option */
-#define POPT_ERROR_OPTSTOODEEP	-13	/*!< aliases nested too deeply */
-#define POPT_ERROR_BADQUOTE	-15	/*!< error in paramter quoting */
-#define POPT_ERROR_ERRNO	-16	/*!< errno set, use strerror(errno) */
-#define POPT_ERROR_BADNUMBER	-17	/*!< invalid numeric value */
-#define POPT_ERROR_OVERFLOW	-18	/*!< number too large or too small */
-#define	POPT_ERROR_BADOPERATION	-19	/*!< mutually exclusive logical operations requested */
-#define	POPT_ERROR_NULLARG	-20	/*!< opt->arg should not be NULL */
-#define	POPT_ERROR_MALLOC	-21	/*!< memory allocation failed */
-/*@}*/
-
-/** \ingroup popt
- * \name poptBadOption() flags
- */
-/*@{*/
-#define POPT_BADOPTION_NOALIAS  (1 << 0)  /*!< don't go into an alias */
-/*@}*/
-
-/** \ingroup popt
- * \name poptGetContext() flags
- */
-/*@{*/
-#define POPT_CONTEXT_NO_EXEC	(1 << 0)  /*!< ignore exec expansions */
-#define POPT_CONTEXT_KEEP_FIRST	(1 << 1)  /*!< pay attention to argv[0] */
-#define POPT_CONTEXT_POSIXMEHARDER (1 << 2) /*!< options can't follow args */
-#define POPT_CONTEXT_ARG_OPTS	(1 << 4) /*!< return args as options with value 0 */
-/*@}*/
-
-/** \ingroup popt
- */
-struct poptOption {
-/*@observer@*/ /*@null@*/ const char * longName; /*!< may be NULL */
-    char shortName;			/*!< may be '\0' */
-    int argInfo;
-/*@shared@*/ /*@null@*/ void * arg;	/*!< depends on argInfo */
-    int val;			/*!< 0 means don't return, just update flag */
-/*@observer@*/ /*@null@*/ const char * descrip;	/*!< description for autohelp -- may be NULL */
-/*@observer@*/ /*@null@*/ const char * argDescrip; /*!< argument description for autohelp */
-};
-
-/** \ingroup popt
- * A popt alias argument for poptAddAlias().
- */
-struct poptAlias {
-/*@owned@*/ /*@null@*/ const char * longName;	/*!< may be NULL */
-    char shortName;		/*!< may be '\0' */
-    int argc;
-/*@owned@*/ const char ** argv;	/*!< must be free()able */
-};
-
-/** \ingroup popt
- * A popt alias or exec argument for poptAddItem().
- */
-/*@-exporttype@*/
-typedef struct poptItem_s {
-    struct poptOption option;	/*!< alias/exec name(s) and description. */
-    int argc;			/*!< (alias) no. of args. */
-/*@owned@*/ const char ** argv;	/*!< (alias) args, must be free()able. */
-} * poptItem;
-/*@=exporttype@*/
-
-/** \ingroup popt
- * \name Auto-generated help/usage
- */
-/*@{*/
-
-/**
- * Empty table marker to enable displaying popt alias/exec options.
- */
-/*@-exportvar@*/
-/*@unchecked@*/ /*@observer@*/
-extern struct poptOption poptAliasOptions[];
-/*@=exportvar@*/
-#define POPT_AUTOALIAS { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptAliasOptions, \
-			0, "Options implemented via popt alias/exec:", NULL },
-
-/**
- * Auto help table options.
- */
-/*@-exportvar@*/
-/*@unchecked@*/ /*@observer@*/
-extern struct poptOption poptHelpOptions[];
-/*@=exportvar@*/
-#define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
-			0, "Help options:", NULL },
-
-#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
-/*@}*/
-
-/** \ingroup popt
- */
-/*@-exporttype@*/
-typedef /*@abstract@*/ struct poptContext_s * poptContext;
-/*@=exporttype@*/
-
-/** \ingroup popt
- */
-#ifndef __cplusplus
-/*@-exporttype -typeuse@*/
-typedef struct poptOption * poptOption;
-/*@=exporttype =typeuse@*/
-#endif
-
-/*@-exportconst@*/
-enum poptCallbackReason {
-    POPT_CALLBACK_REASON_PRE	= 0, 
-    POPT_CALLBACK_REASON_POST	= 1,
-    POPT_CALLBACK_REASON_OPTION = 2
-};
-/*@=exportconst@*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*@-type@*/
-
-/** \ingroup popt
- * Table callback prototype.
- * @param con		context
- * @param reason	reason for callback
- * @param opt		option that triggered callback
- * @param arg		@todo Document.
- * @param data		@todo Document.
- */
-typedef void (*poptCallbackType) (poptContext con, 
-		enum poptCallbackReason reason,
-		/*@null@*/ const struct poptOption * opt,
-		/*@null@*/ const char * arg,
-		/*@null@*/ const void * data)
-	/*@*/;
-
-/** \ingroup popt
- * Initialize popt context.
- * @param name
- * @param argc		no. of arguments
- * @param argv		argument array
- * @param options	address of popt option table
- * @param flags		or'd POPT_CONTEXT_* bits
- * @return		initialized popt context
- */
-/*@only@*/ /*@null@*/ poptContext poptGetContext(
-		/*@dependent@*/ /*@keep@*/ const char * name,
-		int argc, /*@dependent@*/ /*@keep@*/ const char ** argv,
-		/*@dependent@*/ /*@keep@*/ const struct poptOption * options,
-		int flags)
-	/*@*/;
-
-/** \ingroup popt
- * Reinitialize popt context.
- * @param con		context
- */
-/*@-exportlocal@*/
-void poptResetContext(/*@null@*/poptContext con)
-	/*@modifies con @*/;
-/*@=exportlocal@*/
-
-/** \ingroup popt
- * Return value of next option found.
- * @param con		context
- * @return		next option val, -1 on last item, POPT_ERROR_* on error
- */
-int poptGetNextOpt(/*@null@*/poptContext con)
-	/*@globals fileSystem, internalState @*/
-	/*@modifies con, fileSystem, internalState @*/;
-
-/*@-redecl@*/
-/** \ingroup popt
- * Return next option argument (if any).
- * @param con		context
- * @return		option argument, NULL if no more options are available
- */
-/*@observer@*/ /*@null@*/ const char * poptGetOptArg(/*@null@*/poptContext con)
-	/*@modifies con @*/;
-
-/** \ingroup popt
- * Return current option's argument.
- * @param con		context
- * @return		option argument, NULL if no more options are available
- */
-/*@observer@*/ /*@null@*/ const char * poptGetArg(/*@null@*/poptContext con)
-	/*@modifies con @*/;
-
-/** \ingroup popt
- * Peek at current option's argument.
- * @param con		context
- * @return		option argument
- */
-/*@observer@*/ /*@null@*/ const char * poptPeekArg(/*@null@*/poptContext con)
-	/*@*/;
-
-/** \ingroup popt
- * Return remaining arguments.
- * @param con		context
- * @return		argument array, terminated with NULL
- */
-/*@observer@*/ /*@null@*/ const char ** poptGetArgs(/*@null@*/poptContext con)
-	/*@modifies con @*/;
-
-/** \ingroup popt
- * Return the option which caused the most recent error.
- * @param con		context
- * @param flags
- * @return		offending option
- */
-/*@observer@*/ const char * poptBadOption(/*@null@*/poptContext con, int flags)
-	/*@*/;
-/*@=redecl@*/
-
-/** \ingroup popt
- * Destroy context.
- * @param con		context
- * @return		NULL always
- */
-/*@null@*/ poptContext poptFreeContext( /*@only@*/ /*@null@*/ poptContext con)
-	/*@modifies con @*/;
-
-/** \ingroup popt
- * Add arguments to context.
- * @param con		context
- * @param argv		argument array, NULL terminated
- * @return		0 on success, POPT_ERROR_OPTSTOODEEP on failure
- */
-int poptStuffArgs(poptContext con, /*@keep@*/ const char ** argv)
-	/*@modifies con @*/;
-
-/** \ingroup popt
- * Add alias to context.
- * @todo Pass alias by reference, not value.
- * @deprecated Use poptAddItem instead.
- * @param con		context
- * @param alias		alias to add
- * @param flags		(unused)
- * @return		0 on success
- */
-/*@unused@*/
-int poptAddAlias(poptContext con, struct poptAlias alias, int flags)
-	/*@modifies con @*/;
-
-/** \ingroup popt
- * Add alias/exec item to context.
- * @param con		context
- * @param newItem	alias/exec item to add
- * @param flags		0 for alias, 1 for exec
- * @return		0 on success
- */
-int poptAddItem(poptContext con, poptItem newItem, int flags)
-	/*@modifies con @*/;
-
-/** \ingroup popt
- * Read configuration file.
- * @param con		context
- * @param fn		file name to read
- * @return		0 on success, POPT_ERROR_ERRNO on failure
- */
-int poptReadConfigFile(poptContext con, const char * fn)
-	/*@globals fileSystem, internalState @*/
-	/*@modifies con->execs, con->numExecs,
-		fileSystem, internalState @*/;
-
-/** \ingroup popt
- * Read default configuration from /etc/popt and $HOME/.popt.
- * @param con		context
- * @param useEnv	(unused)
- * @return		0 on success, POPT_ERROR_ERRNO on failure
- */
-int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
-	/*@globals fileSystem, internalState @*/
-	/*@modifies con->execs, con->numExecs,
-		fileSystem, internalState @*/;
-
-/** \ingroup popt
- * Duplicate an argument array.
- * @note: The argument array is malloc'd as a single area, so only argv must
- * be free'd.
- *
- * @param argc		no. of arguments
- * @param argv		argument array
- * @retval argcPtr	address of returned no. of arguments
- * @retval argvPtr	address of returned argument array
- * @return		0 on success, POPT_ERROR_NOARG on failure
- */
-int poptDupArgv(int argc, /*@null@*/ const char **argv,
-		/*@null@*/ /*@out@*/ int * argcPtr,
-		/*@null@*/ /*@out@*/ const char *** argvPtr)
-	/*@modifies *argcPtr, *argvPtr @*/;
-
-/** \ingroup popt
- * Parse a string into an argument array.
- * The parse allows ', ", and \ quoting, but ' is treated the same as " and
- * both may include \ quotes.
- * @note: The argument array is malloc'd as a single area, so only argv must
- * be free'd.
- *
- * @param s		string to parse
- * @retval argcPtr	address of returned no. of arguments
- * @retval argvPtr	address of returned argument array
- */
-int poptParseArgvString(const char * s,
-		/*@out@*/ int * argcPtr, /*@out@*/ const char *** argvPtr)
-	/*@modifies *argcPtr, *argvPtr @*/;
-
-/** \ingroup popt
- * Parses an input configuration file and returns an string that is a 
- * command line.  For use with popt.  You must free the return value when done.
- *
- * Given the file:
-\verbatim
-# this line is ignored
-    #   this one too
-aaa
-  bbb
-    ccc   
-bla=bla
-
-this_is   =   fdsafdas
-     bad_line=        
-  reall bad line  
-  reall bad line  = again
-5555=   55555   
-  test = with lots of spaces
-\endverbatim
-*
-* The result is:
-\verbatim
---aaa --bbb --ccc --bla="bla" --this_is="fdsafdas" --5555="55555" --test="with lots of spaces"
-\endverbatim
-*
-* Passing this to poptParseArgvString() yields an argv of:
-\verbatim
-'--aaa'
-'--bbb' 
-'--ccc' 
-'--bla=bla' 
-'--this_is=fdsafdas' 
-'--5555=55555' 
-'--test=with lots of spaces' 
-\endverbatim
- *
- * @bug NULL is returned if file line is too long.
- * @bug Silently ignores invalid lines.
- *
- * @param fp		file handle to read
- * @param *argstrp	return string of options (malloc'd)
- * @param flags		unused
- * @return		0 on success
- * @see			poptParseArgvString
- */
-/*@-fcnuse@*/
-int poptConfigFileToString(FILE *fp, /*@out@*/ char ** argstrp, int flags)
-	/*@globals fileSystem @*/
-	/*@modifies *fp, *argstrp, fileSystem @*/;
-/*@=fcnuse@*/
-
-/** \ingroup popt
- * Return formatted error string for popt failure.
- * @param error		popt error
- * @return		error string
- */
-/*@-redecl@*/
-/*@observer@*/ const char *poptStrerror(const int error)
-	/*@*/;
-/*@=redecl@*/
-
-/** \ingroup popt
- * Limit search for executables.
- * @param con		context
- * @param path		single path to search for executables
- * @param allowAbsolute	absolute paths only?
- */
-void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
-	/*@modifies con @*/;
-
-/** \ingroup popt
- * Print detailed description of options.
- * @param con		context
- * @param fp		ouput file handle
- * @param flags		(unused)
- */
-void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
-	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/;
-
-/** \ingroup popt
- * Print terse description of options.
- * @param con		context
- * @param fp		ouput file handle
- * @param flags		(unused)
- */
-void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
-	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/;
-
-/** \ingroup popt
- * Provide text to replace default "[OPTION...]" in help/usage output.
- * @param con		context
- * @param text		replacement text
- */
-/*@-fcnuse@*/
-void poptSetOtherOptionHelp(poptContext con, const char * text)
-	/*@modifies con @*/;
-/*@=fcnuse@*/
-
-/** \ingroup popt
- * Return argv[0] from context.
- * @param con		context
- * @return		argv[0]
- */
-/*@-redecl -fcnuse@*/
-/*@observer@*/ const char * poptGetInvocationName(poptContext con)
-	/*@*/;
-/*@=redecl =fcnuse@*/
-
-/** \ingroup popt
- * Shuffle argv pointers to remove stripped args, returns new argc.
- * @param con		context
- * @param argc		no. of args
- * @param argv		arg vector
- * @return		new argc
- */
-/*@-fcnuse@*/
-int poptStrippedArgv(poptContext con, int argc, char ** argv)
-	/*@modifies *argv @*/;
-/*@=fcnuse@*/
-
-/**
- * Save a long, performing logical operation with value.
- * @warning Alignment check may be too strict on certain platorms.
- * @param arg		integer pointer, aligned on int boundary.
- * @param argInfo	logical operation (see POPT_ARGFLAG_*)
- * @param aLong		value to use
- * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
- */
-/*@-incondefs@*/
-int poptSaveLong(/*@null@*/ long * arg, int argInfo, long aLong)
-	/*@modifies *arg @*/
-	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
-/*@=incondefs@*/
-
-/**
- * Save an integer, performing logical operation with value.
- * @warning Alignment check may be too strict on certain platorms.
- * @param arg		integer pointer, aligned on int boundary.
- * @param argInfo	logical operation (see POPT_ARGFLAG_*)
- * @param aLong		value to use
- * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
- */
-/*@-incondefs@*/
-int poptSaveInt(/*@null@*/ int * arg, int argInfo, long aLong)
-	/*@modifies *arg @*/
-	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
-/*@=incondefs@*/
-
-/*@=type@*/
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/source4/lib/popt/poptconfig.c b/source4/lib/popt/poptconfig.c
deleted file mode 100644
index a600a92905..0000000000
--- a/source4/lib/popt/poptconfig.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/** \ingroup popt
- * \file popt/poptconfig.c
- */
-
-/* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
-   file accompanying popt source distributions, available from 
-   ftp://ftp.rpm.org/pub/rpm/dist. */
-
-#include "system.h"
-#include "poptint.h"
-
-/*@-compmempass@*/	/* FIX: item->option.longName kept, not dependent. */
-static void configLine(poptContext con, char * line)
-	/*@modifies con @*/
-{
-    /*@-type@*/
-    int nameLength = strlen(con->appName);
-    /*@=type@*/
-    const char * entryType;
-    const char * opt;
-    poptItem item = alloca(sizeof(*item));
-    int i, j;
-    
-/*@-boundswrite@*/
-    memset(item, 0, sizeof(*item));
-
-    /*@-type@*/
-    if (strncmp(line, con->appName, nameLength)) return;
-    /*@=type@*/
-
-    line += nameLength;
-    if (*line == '\0' || !isspace(*line)) return;
-
-    while (*line != '\0' && isspace(*line)) line++;
-    entryType = line;
-    while (*line == '\0' || !isspace(*line)) line++;
-    *line++ = '\0';
-
-    while (*line != '\0' && isspace(*line)) line++;
-    if (*line == '\0') return;
-    opt = line;
-    while (*line == '\0' || !isspace(*line)) line++;
-    *line++ = '\0';
-
-    while (*line != '\0' && isspace(*line)) line++;
-    if (*line == '\0') return;
-
-    /*@-temptrans@*/ /* FIX: line alias is saved */
-    if (opt[0] == '-' && opt[1] == '-')
-	item->option.longName = opt + 2;
-    else if (opt[0] == '-' && opt[2] == '\0')
-	item->option.shortName = opt[1];
-    /*@=temptrans@*/
-
-    if (poptParseArgvString(line, &item->argc, &item->argv)) return;
-
-    /*@-modobserver@*/
-    item->option.argInfo = POPT_ARGFLAG_DOC_HIDDEN;
-    for (i = 0, j = 0; i < item->argc; i++, j++) {
-	const char * f;
-	if (!strncmp(item->argv[i], "--POPTdesc=", sizeof("--POPTdesc=")-1)) {
-	    f = item->argv[i] + sizeof("--POPTdesc=");
-	    if (f[0] == '$' && f[1] == '"') f++;
-	    item->option.descrip = f;
-	    item->option.argInfo &= ~POPT_ARGFLAG_DOC_HIDDEN;
-	    j--;
-	} else
-	if (!strncmp(item->argv[i], "--POPTargs=", sizeof("--POPTargs=")-1)) {
-	    f = item->argv[i] + sizeof("--POPTargs=");
-	    if (f[0] == '$' && f[1] == '"') f++;
-	    item->option.argDescrip = f;
-	    item->option.argInfo &= ~POPT_ARGFLAG_DOC_HIDDEN;
-	    item->option.argInfo |= POPT_ARG_STRING;
-	    j--;
-	} else
-	if (j != i)
-	    item->argv[j] = item->argv[i];
-    }
-    if (j != i) {
-	item->argv[j] = NULL;
-	item->argc = j;
-    }
-    /*@=modobserver@*/
-/*@=boundswrite@*/
-	
-    /*@-nullstate@*/ /* FIX: item->argv[] may be NULL */
-    if (!strcmp(entryType, "alias"))
-	(void) poptAddItem(con, item, 0);
-    else if (!strcmp(entryType, "exec"))
-	(void) poptAddItem(con, item, 1);
-    /*@=nullstate@*/
-}
-/*@=compmempass@*/
-
-int poptReadConfigFile(poptContext con, const char * fn)
-{
-    const char * file, * chptr, * end;
-    char * buf;
-/*@dependent@*/ char * dst;
-    int fd, rc;
-    off_t fileLength;
-
-    fd = open(fn, O_RDONLY);
-    if (fd < 0)
-	return (errno == ENOENT ? 0 : POPT_ERROR_ERRNO);
-
-    fileLength = lseek(fd, 0, SEEK_END);
-    if (fileLength == -1 || lseek(fd, 0, 0) == -1) {
-	rc = errno;
-	(void) close(fd);
-	/*@-mods@*/
-	errno = rc;
-	/*@=mods@*/
-	return POPT_ERROR_ERRNO;
-    }
-
-    file = alloca(fileLength + 1);
-    if (read(fd, (char *)file, fileLength) != fileLength) {
-	rc = errno;
-	(void) close(fd);
-	/*@-mods@*/
-	errno = rc;
-	/*@=mods@*/
-	return POPT_ERROR_ERRNO;
-    }
-    if (close(fd) == -1)
-	return POPT_ERROR_ERRNO;
-
-/*@-boundswrite@*/
-    dst = buf = alloca(fileLength + 1);
-
-    chptr = file;
-    end = (file + fileLength);
-    /*@-infloops@*/	/* LCL: can't detect chptr++ */
-    while (chptr < end) {
-	switch (*chptr) {
-	  case '\n':
-	    *dst = '\0';
-	    dst = buf;
-	    while (*dst && isspace(*dst)) dst++;
-	    if (*dst && *dst != '#')
-		configLine(con, dst);
-	    chptr++;
-	    /*@switchbreak@*/ break;
-	  case '\\':
-	    *dst++ = *chptr++;
-	    if (chptr < end) {
-		if (*chptr == '\n') 
-		    dst--, chptr++;	
-		    /* \ at the end of a line does not insert a \n */
-		else
-		    *dst++ = *chptr++;
-	    }
-	    /*@switchbreak@*/ break;
-	  default:
-	    *dst++ = *chptr++;
-	    /*@switchbreak@*/ break;
-	}
-    }
-    /*@=infloops@*/
-/*@=boundswrite@*/
-
-    return 0;
-}
-
-int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
-{
-    char * fn, * home;
-    int rc;
-
-    /*@-type@*/
-    if (!con->appName) return 0;
-    /*@=type@*/
-
-    rc = poptReadConfigFile(con, "/etc/popt");
-    if (rc) return rc;
-#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
-    if (getuid() != geteuid()) return 0;
-#endif
-
-    if ((home = getenv("HOME"))) {
-	fn = alloca(strlen(home) + 20);
-	strcpy(fn, home);
-	strcat(fn, "/.popt");
-	rc = poptReadConfigFile(con, fn);
-	if (rc) return rc;
-    }
-
-    return 0;
-}
diff --git a/source4/lib/popt/popthelp.c b/source4/lib/popt/popthelp.c
deleted file mode 100644
index 7ae3de7fb5..0000000000
--- a/source4/lib/popt/popthelp.c
+++ /dev/null
@@ -1,742 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/*@-type@*/
-/** \ingroup popt
- * \file popt/popthelp.c
- */
-
-/* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
-   file accompanying popt source distributions, available from 
-   ftp://ftp.rpm.org/pub/rpm/dist. */
-
-#include "system.h"
-#include "poptint.h"
-
-/**
- * Display arguments.
- * @param con		context
- * @param foo		(unused)
- * @param key		option(s)
- * @param arg		(unused)
- * @param data		(unused)
- */
-static void displayArgs(poptContext con,
-		/*@unused@*/ enum poptCallbackReason foo,
-		struct poptOption * key, 
-		/*@unused@*/ const char * arg, /*@unused@*/ void * data)
-	/*@globals fileSystem@*/
-	/*@modifies fileSystem@*/
-{
-    if (key->shortName == '?')
-	poptPrintHelp(con, stdout, 0);
-    else
-	poptPrintUsage(con, stdout, 0);
-    exit(0);
-}
-
-#ifdef	NOTYET
-/*@unchecked@*/
-static int show_option_defaults = 0;
-#endif
-
-/**
- * Empty table marker to enable displaying popt alias/exec options.
- */
-/*@observer@*/ /*@unchecked@*/
-struct poptOption poptAliasOptions[] = {
-    POPT_TABLEEND
-};
-
-/**
- * Auto help table options.
- */
-/*@-castfcnptr@*/
-/*@observer@*/ /*@unchecked@*/
-struct poptOption poptHelpOptions[] = {
-  { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL },
-  { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL },
-  { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL },
-#ifdef	NOTYET
-  { "defaults", '\0', POPT_ARG_NONE, &show_option_defaults, 0,
-	N_("Display option defaults in message"), NULL },
-#endif
-    POPT_TABLEEND
-} ;
-/*@=castfcnptr@*/
-
-/**
- * @param table		option(s)
- */
-/*@observer@*/ /*@null@*/ static const char *const
-getTableTranslationDomain(/*@null@*/ const struct poptOption *table)
-	/*@*/
-{
-    const struct poptOption *opt;
-
-    if (table != NULL)
-    for (opt = table; opt->longName || opt->shortName || opt->arg; opt++) {
-	if (opt->argInfo == POPT_ARG_INTL_DOMAIN)
-	    return opt->arg;
-    }
-    return NULL;
-}
-
-/**
- * @param opt		option(s)
- * @param translation_domain	translation domain
- */
-/*@observer@*/ /*@null@*/ static const char *const
-getArgDescrip(const struct poptOption * opt,
-		/*@-paramuse@*/ /* FIX: i18n macros disabled with lclint */
-		/*@null@*/ const char * translation_domain)
-		/*@=paramuse@*/
-	/*@*/
-{
-    if (!(opt->argInfo & POPT_ARG_MASK)) return NULL;
-
-    if (opt == (poptHelpOptions + 1) || opt == (poptHelpOptions + 2))
-	if (opt->argDescrip) return POPT_(opt->argDescrip);
-
-    if (opt->argDescrip) return D_(translation_domain, opt->argDescrip);
-
-    switch (opt->argInfo & POPT_ARG_MASK) {
-    case POPT_ARG_NONE:		return POPT_("NONE");
-#ifdef	DYING
-    case POPT_ARG_VAL:		return POPT_("VAL");
-#else
-    case POPT_ARG_VAL:		return NULL;
-#endif
-    case POPT_ARG_INT:		return POPT_("INT");
-    case POPT_ARG_LONG:		return POPT_("LONG");
-    case POPT_ARG_STRING:	return POPT_("STRING");
-    case POPT_ARG_FLOAT:	return POPT_("FLOAT");
-    case POPT_ARG_DOUBLE:	return POPT_("DOUBLE");
-    default:			return POPT_("ARG");
-    }
-}
-
-/**
- * Display default value for an option.
- * @param lineLength
- * @param opt		option(s)
- * @param translation_domain	translation domain
- * @return
- */
-static /*@only@*/ /*@null@*/ char *
-singleOptionDefaultValue(int lineLength,
-		const struct poptOption * opt,
-		/*@-paramuse@*/ /* FIX: i18n macros disabled with lclint */
-		/*@null@*/ const char * translation_domain)
-		/*@=paramuse@*/
-	/*@*/
-{
-    const char * defstr = D_(translation_domain, "default");
-    char * le = malloc(4*lineLength + 1);
-    char * l = le;
-
-    if (le == NULL) return NULL;	/* XXX can't happen */
-/*@-boundswrite@*/
-    *le = '\0';
-    *le++ = '(';
-    strcpy(le, defstr);	le += strlen(le);
-    *le++ = ':';
-    *le++ = ' ';
-    if (opt->arg)	/* XXX programmer error */
-    switch (opt->argInfo & POPT_ARG_MASK) {
-    case POPT_ARG_VAL:
-    case POPT_ARG_INT:
-    {	long aLong = *((int *)opt->arg);
-	le += sprintf(le, "%ld", aLong);
-    }	break;
-    case POPT_ARG_LONG:
-    {	long aLong = *((long *)opt->arg);
-	le += sprintf(le, "%ld", aLong);
-    }	break;
-    case POPT_ARG_FLOAT:
-    {	double aDouble = *((float *)opt->arg);
-	le += sprintf(le, "%g", aDouble);
-    }	break;
-    case POPT_ARG_DOUBLE:
-    {	double aDouble = *((double *)opt->arg);
-	le += sprintf(le, "%g", aDouble);
-    }	break;
-    case POPT_ARG_STRING:
-    {	const char * s = *(const char **)opt->arg;
-	if (s == NULL) {
-	    strcpy(le, "null");	le += strlen(le);
-	} else {
-	    size_t slen = 4*lineLength - (le - l) - sizeof("\"...\")");
-	    *le++ = '"';
-	    strncpy(le, s, slen); le[slen] = '\0'; le += strlen(le);	
-	    if (slen < strlen(s)) {
-		strcpy(le, "...");	le += strlen(le);
-	    }
-	    *le++ = '"';
-	}
-    }	break;
-    case POPT_ARG_NONE:
-    default:
-	l = _free(l);
-	return NULL;
-	/*@notreached@*/ break;
-    }
-    *le++ = ')';
-    *le = '\0';
-/*@=boundswrite@*/
-
-    return l;
-}
-
-/**
- * Display help text for an option.
- * @param fp		output file handle
- * @param maxLeftCol
- * @param opt		option(s)
- * @param translation_domain	translation domain
- */
-static void singleOptionHelp(FILE * fp, int maxLeftCol, 
-		const struct poptOption * opt,
-		/*@null@*/ const char * translation_domain)
-	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/
-{
-    int indentLength = maxLeftCol + 5;
-    int lineLength = 79 - indentLength;
-    const char * help = D_(translation_domain, opt->descrip);
-    const char * argDescrip = getArgDescrip(opt, translation_domain);
-    int helpLength;
-    char * defs = NULL;
-    char * left;
-    int nb = maxLeftCol + 1;
-
-    /* Make sure there's more than enough room in target buffer. */
-    if (opt->longName)	nb += strlen(opt->longName);
-    if (argDescrip)	nb += strlen(argDescrip);
-
-/*@-boundswrite@*/
-    left = malloc(nb);
-    if (left == NULL) return;	/* XXX can't happen */
-    left[0] = '\0';
-    left[maxLeftCol] = '\0';
-
-    if (opt->longName && opt->shortName)
-	sprintf(left, "-%c, %s%s", opt->shortName,
-		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
-		opt->longName);
-    else if (opt->shortName != '\0') 
-	sprintf(left, "-%c", opt->shortName);
-    else if (opt->longName)
-	sprintf(left, "%s%s",
-		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
-		opt->longName);
-    if (!*left) goto out;
-
-    if (argDescrip) {
-	char * le = left + strlen(left);
-
-	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL)
-	    *le++ = '[';
-
-	/* Choose type of output */
-	/*@-branchstate@*/
-	if (opt->argInfo & POPT_ARGFLAG_SHOW_DEFAULT) {
-	    defs = singleOptionDefaultValue(lineLength, opt, translation_domain);
-	    if (defs) {
-		char * t = malloc((help ? strlen(help) : 0) +
-				strlen(defs) + sizeof(" "));
-		if (t) {
-		    char * te = t;
-		    *te = '\0';
-		    if (help) {
-			strcpy(te, help);	te += strlen(te);
-		    }
-		    *te++ = ' ';
-		    strcpy(te, defs);
-		    defs = _free(defs);
-		}
-		defs = t;
-	    }
-	}
-	/*@=branchstate@*/
-
-	if (opt->argDescrip == NULL) {
-	    switch (opt->argInfo & POPT_ARG_MASK) {
-	    case POPT_ARG_NONE:
-		break;
-	    case POPT_ARG_VAL:
-#ifdef	NOTNOW	/* XXX pug ugly nerdy output */
-	    {	long aLong = opt->val;
-		int ops = (opt->argInfo & POPT_ARGFLAG_LOGICALOPS);
-		int negate = (opt->argInfo & POPT_ARGFLAG_NOT);
-
-		/* Don't bother displaying typical values */
-		if (!ops && (aLong == 0L || aLong == 1L || aLong == -1L))
-		    break;
-		*le++ = '[';
-		switch (ops) {
-		case POPT_ARGFLAG_OR:
-		    *le++ = '|';
-		    /*@innerbreak@*/ break;
-		case POPT_ARGFLAG_AND:
-		    *le++ = '&';
-		    /*@innerbreak@*/ break;
-		case POPT_ARGFLAG_XOR:
-		    *le++ = '^';
-		    /*@innerbreak@*/ break;
-		default:
-		    /*@innerbreak@*/ break;
-		}
-		*le++ = '=';
-		if (negate) *le++ = '~';
-		/*@-formatconst@*/
-		le += sprintf(le, (ops ? "0x%lx" : "%ld"), aLong);
-		/*@=formatconst@*/
-		*le++ = ']';
-	    }
-#endif
-		break;
-	    case POPT_ARG_INT:
-	    case POPT_ARG_LONG:
-	    case POPT_ARG_FLOAT:
-	    case POPT_ARG_DOUBLE:
-	    case POPT_ARG_STRING:
-		*le++ = '=';
-		strcpy(le, argDescrip);		le += strlen(le);
-		break;
-	    default:
-		break;
-	    }
-	} else {
-	    *le++ = '=';
-	    strcpy(le, argDescrip);		le += strlen(le);
-	}
-	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL)
-	    *le++ = ']';
-	*le = '\0';
-    }
-/*@=boundswrite@*/
-
-    if (help)
-	fprintf(fp,"  %-*s   ", maxLeftCol, left);
-    else {
-	fprintf(fp,"  %s\n", left); 
-	goto out;
-    }
-
-    left = _free(left);
-    if (defs) {
-	help = defs; defs = NULL;
-    }
-
-    helpLength = strlen(help);
-/*@-boundsread@*/
-    while (helpLength > lineLength) {
-	const char * ch;
-	char format[16];
-
-	ch = help + lineLength - 1;
-	while (ch > help && !isspace(*ch)) ch--;
-	if (ch == help) break;		/* give up */
-	while (ch > (help + 1) && isspace(*ch)) ch--;
-	ch++;
-
-	sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), indentLength);
-	/*@-formatconst@*/
-	fprintf(fp, format, help, " ");
-	/*@=formatconst@*/
-	help = ch;
-	while (isspace(*help) && *help) help++;
-	helpLength = strlen(help);
-    }
-/*@=boundsread@*/
-
-    if (helpLength) fprintf(fp, "%s\n", help);
-
-out:
-    /*@-dependenttrans@*/
-    defs = _free(defs);
-    /*@=dependenttrans@*/
-    left = _free(left);
-}
-
-/**
- * @param opt		option(s)
- * @param translation_domain	translation domain
- */
-static int maxArgWidth(const struct poptOption * opt,
-		       /*@null@*/ const char * translation_domain)
-	/*@*/
-{
-    int max = 0;
-    int len = 0;
-    const char * s;
-    
-    if (opt != NULL)
-    while (opt->longName || opt->shortName || opt->arg) {
-	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
-	    if (opt->arg)	/* XXX program error */
-	    len = maxArgWidth(opt->arg, translation_domain);
-	    if (len > max) max = len;
-	} else if (!(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
-	    len = sizeof("  ")-1;
-	    if (opt->shortName != '\0') len += sizeof("-X")-1;
-	    if (opt->shortName != '\0' && opt->longName) len += sizeof(", ")-1;
-	    if (opt->longName) {
-		len += ((opt->argInfo & POPT_ARGFLAG_ONEDASH)
-			? sizeof("-")-1 : sizeof("--")-1);
-		len += strlen(opt->longName);
-	    }
-
-	    s = getArgDescrip(opt, translation_domain);
-	    if (s)
-		len += sizeof("=")-1 + strlen(s);
-	    if (opt->argInfo & POPT_ARGFLAG_OPTIONAL) len += sizeof("[]")-1;
-	    if (len > max) max = len;
-	}
-
-	opt++;
-    }
-    
-    return max;
-}
-
-/**
- * Display popt alias and exec help.
- * @param fp		output file handle
- * @param items		alias/exec array
- * @param nitems	no. of alias/exec entries
- * @param left
- * @param translation_domain	translation domain
- */
-static void itemHelp(FILE * fp,
-		/*@null@*/ poptItem items, int nitems, int left,
-		/*@null@*/ const char * translation_domain)
-	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/
-{
-    poptItem item;
-    int i;
-
-    if (items != NULL)
-    for (i = 0, item = items; i < nitems; i++, item++) {
-	const struct poptOption * opt;
-	opt = &item->option;
-	if ((opt->longName || opt->shortName) && 
-	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
-	    singleOptionHelp(fp, left, opt, translation_domain);
-    }
-}
-
-/**
- * Display help text for a table of options.
- * @param con		context
- * @param fp		output file handle
- * @param table		option(s)
- * @param left
- * @param translation_domain	translation domain
- */
-static void singleTableHelp(poptContext con, FILE * fp,
-		/*@null@*/ const struct poptOption * table, int left,
-		/*@null@*/ const char * translation_domain)
-	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/
-{
-    const struct poptOption * opt;
-    const char *sub_transdom;
-
-    if (table == poptAliasOptions) {
-	itemHelp(fp, con->aliases, con->numAliases, left, NULL);
-	itemHelp(fp, con->execs, con->numExecs, left, NULL);
-	return;
-    }
-
-    if (table != NULL)
-    for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
-	if ((opt->longName || opt->shortName) && 
-	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
-	    singleOptionHelp(fp, left, opt, translation_domain);
-    }
-
-    if (table != NULL)
-    for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
-	if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_INCLUDE_TABLE)
-	    continue;
-	sub_transdom = getTableTranslationDomain(opt->arg);
-	if (sub_transdom == NULL)
-	    sub_transdom = translation_domain;
-	    
-	if (opt->descrip)
-	    fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
-
-	singleTableHelp(con, fp, opt->arg, left, sub_transdom);
-    }
-}
-
-/**
- * @param con		context
- * @param fp		output file handle
- */
-static int showHelpIntro(poptContext con, FILE * fp)
-	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/
-{
-    int len = 6;
-    const char * fn;
-
-    fprintf(fp, POPT_("Usage:"));
-    if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
-/*@-boundsread@*/
-	/*@-nullderef@*/	/* LCL: wazzup? */
-	fn = con->optionStack->argv[0];
-	/*@=nullderef@*/
-/*@=boundsread@*/
-	if (fn == NULL) return len;
-	if (strchr(fn, '/')) fn = strrchr(fn, '/') + 1;
-	fprintf(fp, " %s", fn);
-	len += strlen(fn) + 1;
-    }
-
-    return len;
-}
-
-void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
-{
-    int leftColWidth;
-
-    (void) showHelpIntro(con, fp);
-    if (con->otherHelp)
-	fprintf(fp, " %s\n", con->otherHelp);
-    else
-	fprintf(fp, " %s\n", POPT_("[OPTION...]"));
-
-    leftColWidth = maxArgWidth(con->options, NULL);
-    singleTableHelp(con, fp, con->options, leftColWidth, NULL);
-}
-
-/**
- * @param fp		output file handle
- * @param cursor
- * @param opt		option(s)
- * @param translation_domain	translation domain
- */
-static int singleOptionUsage(FILE * fp, int cursor, 
-		const struct poptOption * opt,
-		/*@null@*/ const char *translation_domain)
-	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/
-{
-    int len = 4;
-    char shortStr[2] = { '\0', '\0' };
-    const char * item = shortStr;
-    const char * argDescrip = getArgDescrip(opt, translation_domain);
-
-    if (opt->shortName != '\0' && opt->longName != NULL) {
-	len += 2;
-	if (!(opt->argInfo & POPT_ARGFLAG_ONEDASH)) len++;
-	len += strlen(opt->longName);
-    } else if (opt->shortName != '\0') {
-	len++;
-	shortStr[0] = opt->shortName;
-	shortStr[1] = '\0';
-    } else if (opt->longName) {
-	len += strlen(opt->longName);
-	if (!(opt->argInfo & POPT_ARGFLAG_ONEDASH)) len++;
-	item = opt->longName;
-    }
-
-    if (len == 4) return cursor;
-
-    if (argDescrip) 
-	len += strlen(argDescrip) + 1;
-
-    if ((cursor + len) > 79) {
-	fprintf(fp, "\n       ");
-	cursor = 7;
-    } 
-
-    if (opt->longName && opt->shortName) {
-	fprintf(fp, " [-%c|-%s%s%s%s]",
-	    opt->shortName, ((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "" : "-"),
-	    opt->longName,
-	    (argDescrip ? " " : ""),
-	    (argDescrip ? argDescrip : ""));
-    } else {
-	fprintf(fp, " [-%s%s%s%s]",
-	    ((opt->shortName || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) ? "" : "-"),
-	    item,
-	    (argDescrip ? (opt->shortName != '\0' ? " " : "=") : ""),
-	    (argDescrip ? argDescrip : ""));
-    }
-
-    return cursor + len + 1;
-}
-
-/**
- * Display popt alias and exec usage.
- * @param fp		output file handle
- * @param cursor
- * @param item		alias/exec array
- * @param nitems	no. of ara/exec entries
- * @param translation_domain	translation domain
- */
-static int itemUsage(FILE * fp, int cursor, poptItem item, int nitems,
-		/*@null@*/ const char * translation_domain)
-	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/
-{
-    int i;
-
-    /*@-branchstate@*/		/* FIX: W2DO? */
-    if (item != NULL)
-    for (i = 0; i < nitems; i++, item++) {
-	const struct poptOption * opt;
-	opt = &item->option;
-        if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN) {
-	    translation_domain = (const char *)opt->arg;
-	} else if ((opt->longName || opt->shortName) &&
-		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
-	    cursor = singleOptionUsage(fp, cursor, opt, translation_domain);
-	}
-    }
-    /*@=branchstate@*/
-
-    return cursor;
-}
-
-/**
- * Keep track of option tables already processed.
- */
-typedef struct poptDone_s {
-    int nopts;
-    int maxopts;
-    const void ** opts;
-} * poptDone;
-
-/**
- * Display usage text for a table of options.
- * @param con		context
- * @param fp		output file handle
- * @param cursor
- * @param opt		option(s)
- * @param translation_domain	translation domain
- * @param done		tables already processed
- * @return
- */
-static int singleTableUsage(poptContext con, FILE * fp, int cursor,
-		/*@null@*/ const struct poptOption * opt,
-		/*@null@*/ const char * translation_domain,
-		/*@null@*/ poptDone done)
-	/*@globals fileSystem @*/
-	/*@modifies *fp, done, fileSystem @*/
-{
-    /*@-branchstate@*/		/* FIX: W2DO? */
-    if (opt != NULL)
-    for (; (opt->longName || opt->shortName || opt->arg) ; opt++) {
-        if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN) {
-	    translation_domain = (const char *)opt->arg;
-	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
-	    if (done) {
-		int i = 0;
-		for (i = 0; i < done->nopts; i++) {
-/*@-boundsread@*/
-		    const void * that = done->opts[i];
-/*@=boundsread@*/
-		    if (that == NULL || that != opt->arg)
-			/*@innercontinue@*/ continue;
-		    /*@innerbreak@*/ break;
-		}
-		/* Skip if this table has already been processed. */
-		if (opt->arg == NULL || i < done->nopts)
-		    continue;
-/*@-boundswrite@*/
-		if (done->nopts < done->maxopts)
-		    done->opts[done->nopts++] = (const void *) opt->arg;
-/*@=boundswrite@*/
-	    }
-	    cursor = singleTableUsage(con, fp, cursor, opt->arg,
-			translation_domain, done);
-	} else if ((opt->longName || opt->shortName) &&
-		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
-	    cursor = singleOptionUsage(fp, cursor, opt, translation_domain);
-	}
-    }
-    /*@=branchstate@*/
-
-    return cursor;
-}
-
-/**
- * Return concatenated short options for display.
- * @todo Sub-tables should be recursed.
- * @param opt		option(s)
- * @param fp		output file handle
- * @retval str		concatenation of short options
- * @return		length of display string
- */
-static int showShortOptions(const struct poptOption * opt, FILE * fp,
-		/*@null@*/ char * str)
-	/*@globals fileSystem @*/
-	/*@modifies *str, *fp, fileSystem @*/
-{
-    char * s = alloca(300);	/* larger than the ascii set */
-
-    s[0] = '\0';
-    /*@-branchstate@*/		/* FIX: W2DO? */
-    if (str == NULL) {
-	memset(s, 0, sizeof(s));
-	str = s;
-    }
-    /*@=branchstate@*/
-
-/*@-boundswrite@*/
-    if (opt != NULL)
-    for (; (opt->longName || opt->shortName || opt->arg); opt++) {
-	if (opt->shortName && !(opt->argInfo & POPT_ARG_MASK))
-	    str[strlen(str)] = opt->shortName;
-	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE)
-	    if (opt->arg)	/* XXX program error */
-		(void) showShortOptions(opt->arg, fp, str);
-    } 
-/*@=boundswrite@*/
-
-    if (s != str || *s != '\0')
-	return 0;
-
-    fprintf(fp, " [-%s]", s);
-    return strlen(s) + 4;
-}
-
-void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
-{
-    poptDone done = memset(alloca(sizeof(*done)), 0, sizeof(*done));
-    int cursor;
-
-    done->nopts = 0;
-    done->maxopts = 64;
-    cursor = done->maxopts * sizeof(*done->opts);
-/*@-boundswrite@*/
-    done->opts = memset(alloca(cursor), 0, cursor);
-    done->opts[done->nopts++] = (const void *) con->options;
-/*@=boundswrite@*/
-
-    cursor = showHelpIntro(con, fp);
-    cursor += showShortOptions(con->options, fp, NULL);
-    cursor = singleTableUsage(con, fp, cursor, con->options, NULL, done);
-    cursor = itemUsage(fp, cursor, con->aliases, con->numAliases, NULL);
-    cursor = itemUsage(fp, cursor, con->execs, con->numExecs, NULL);
-
-    if (con->otherHelp) {
-	cursor += strlen(con->otherHelp) + 1;
-	if (cursor > 79) fprintf(fp, "\n       ");
-	fprintf(fp, " %s", con->otherHelp);
-    }
-
-    fprintf(fp, "\n");
-}
-
-void poptSetOtherOptionHelp(poptContext con, const char * text)
-{
-    con->otherHelp = _free(con->otherHelp);
-    con->otherHelp = xstrdup(text);
-}
-/*@=type@*/
diff --git a/source4/lib/popt/poptint.h b/source4/lib/popt/poptint.h
deleted file mode 100644
index 5d308efe96..0000000000
--- a/source4/lib/popt/poptint.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/** \ingroup popt
- * \file popt/poptint.h
- */
-
-/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
-   file accompanying popt source distributions, available from 
-   ftp://ftp.rpm.org/pub/rpm/dist. */
-
-#ifndef H_POPTINT
-#define H_POPTINT
-
-/**
- * Wrapper to free(3), hides const compilation noise, permit NULL, return NULL.
- * @param p		memory to free
- * @retval		NULL always
- */
-/*@unused@*/ static inline /*@null@*/ void *
-_free(/*@only@*/ /*@null@*/ const void * p)
-	/*@modifies p @*/
-{
-    if (p != NULL)	free((void *)p);
-    return NULL;
-}
-
-/* Bit mask macros. */
-/*@-exporttype -redef @*/
-typedef	unsigned int __pbm_bits;
-/*@=exporttype =redef @*/
-#define	__PBM_NBITS		(8 * sizeof (__pbm_bits))
-#define	__PBM_IX(d)		((d) / __PBM_NBITS)
-#define __PBM_MASK(d)		((__pbm_bits) 1 << (((unsigned)(d)) % __PBM_NBITS))
-/*@-exporttype -redef @*/
-typedef struct {
-    __pbm_bits bits[1];
-} pbm_set;
-/*@=exporttype =redef @*/
-#define	__PBM_BITS(set)	((set)->bits)
-
-#define	PBM_ALLOC(d)	calloc(__PBM_IX (d) + 1, sizeof(__pbm_bits))
-#define	PBM_FREE(s)	_free(s);
-#define PBM_SET(d, s)   (__PBM_BITS (s)[__PBM_IX (d)] |= __PBM_MASK (d))
-#define PBM_CLR(d, s)   (__PBM_BITS (s)[__PBM_IX (d)] &= ~__PBM_MASK (d))
-#define PBM_ISSET(d, s) ((__PBM_BITS (s)[__PBM_IX (d)] & __PBM_MASK (d)) != 0)
-
-struct optionStackEntry {
-    int argc;
-/*@only@*/ /*@null@*/
-    const char ** argv;
-/*@only@*/ /*@null@*/
-    pbm_set * argb;
-    int next;
-/*@only@*/ /*@null@*/
-    const char * nextArg;
-/*@observer@*/ /*@null@*/
-    const char * nextCharArg;
-/*@dependent@*/ /*@null@*/
-    poptItem currAlias;
-    int stuffed;
-};
-
-struct poptContext_s {
-    struct optionStackEntry optionStack[POPT_OPTION_DEPTH];
-/*@dependent@*/
-    struct optionStackEntry * os;
-/*@owned@*/ /*@null@*/
-    const char ** leftovers;
-    int numLeftovers;
-    int nextLeftover;
-/*@keep@*/
-    const struct poptOption * options;
-    int restLeftover;
-/*@only@*/ /*@null@*/
-    const char * appName;
-/*@only@*/ /*@null@*/
-    poptItem aliases;
-    int numAliases;
-    int flags;
-/*@owned@*/ /*@null@*/
-    poptItem execs;
-    int numExecs;
-/*@only@*/ /*@null@*/
-    const char ** finalArgv;
-    int finalArgvCount;
-    int finalArgvAlloced;
-/*@dependent@*/ /*@null@*/
-    poptItem doExec;
-/*@only@*/
-    const char * execPath;
-    int execAbsolute;
-/*@only@*/
-    const char * otherHelp;
-/*@null@*/
-    pbm_set * arg_strip;
-};
-
-#ifdef HAVE_LIBINTL_H
-#include <libintl.h>
-#endif
-
-#if defined(HAVE_GETTEXT) && !defined(__LCLINT__)
-#define _(foo) gettext(foo)
-#else
-#define _(foo) foo
-#endif
-
-#if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
-#define D_(dom, str) dgettext(dom, str)
-#define POPT_(foo) D_("popt", foo)
-#else
-#define D_(dom, str) str
-#define POPT_(foo) foo
-#endif
-
-#define N_(foo) foo
-
-#endif
diff --git a/source4/lib/popt/poptparse.c b/source4/lib/popt/poptparse.c
deleted file mode 100644
index a0dea80041..0000000000
--- a/source4/lib/popt/poptparse.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/** \ingroup popt
- * \file popt/poptparse.c
- */
-
-/* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
-   file accompanying popt source distributions, available from 
-   ftp://ftp.rpm.org/pub/rpm/dist. */
-
-#include "system.h"
-
-#define POPT_ARGV_ARRAY_GROW_DELTA 5
-
-/*@-boundswrite@*/
-int poptDupArgv(int argc, const char **argv,
-		int * argcPtr, const char *** argvPtr)
-{
-    size_t nb = (argc + 1) * sizeof(*argv);
-    const char ** argv2;
-    char * dst;
-    int i;
-
-    if (argc <= 0 || argv == NULL)	/* XXX can't happen */
-	return POPT_ERROR_NOARG;
-    for (i = 0; i < argc; i++) {
-	if (argv[i] == NULL)
-	    return POPT_ERROR_NOARG;
-	nb += strlen(argv[i]) + 1;
-    }
-	
-    dst = malloc(nb);
-    if (dst == NULL)			/* XXX can't happen */
-	return POPT_ERROR_MALLOC;
-    argv2 = (void *) dst;
-    dst += (argc + 1) * sizeof(*argv);
-
-    /*@-branchstate@*/
-    for (i = 0; i < argc; i++) {
-	argv2[i] = dst;
-	dst += strlen(strcpy(dst, argv[i])) + 1;
-    }
-    /*@=branchstate@*/
-    argv2[argc] = NULL;
-
-    if (argvPtr) {
-	*argvPtr = argv2;
-    } else {
-	free(argv2);
-	argv2 = NULL;
-    }
-    if (argcPtr)
-	*argcPtr = argc;
-    return 0;
-}
-/*@=boundswrite@*/
-
-/*@-bounds@*/
-int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
-{
-    const char * src;
-    char quote = '\0';
-    int argvAlloced = POPT_ARGV_ARRAY_GROW_DELTA;
-    const char ** argv = malloc(sizeof(*argv) * argvAlloced);
-    int argc = 0;
-    int buflen = strlen(s) + 1;
-    char * buf = memset(alloca(buflen), 0, buflen);
-    int rc = POPT_ERROR_MALLOC;
-
-    if (argv == NULL) return rc;
-    argv[argc] = buf;
-
-    for (src = s; *src != '\0'; src++) {
-	if (quote == *src) {
-	    quote = '\0';
-	} else if (quote != '\0') {
-	    if (*src == '\\') {
-		src++;
-		if (!*src) {
-		    rc = POPT_ERROR_BADQUOTE;
-		    goto exit;
-		}
-		if (*src != quote) *buf++ = '\\';
-	    }
-	    *buf++ = *src;
-	} else if (isspace(*src)) {
-	    if (*argv[argc] != '\0') {
-		buf++, argc++;
-		if (argc == argvAlloced) {
-		    argvAlloced += POPT_ARGV_ARRAY_GROW_DELTA;
-		    argv = realloc(argv, sizeof(*argv) * argvAlloced);
-		    if (argv == NULL) goto exit;
-		}
-		argv[argc] = buf;
-	    }
-	} else switch (*src) {
-	  case '"':
-	  case '\'':
-	    quote = *src;
-	    /*@switchbreak@*/ break;
-	  case '\\':
-	    src++;
-	    if (!*src) {
-		rc = POPT_ERROR_BADQUOTE;
-		goto exit;
-	    }
-	    /*@fallthrough@*/
-	  default:
-	    *buf++ = *src;
-	    /*@switchbreak@*/ break;
-	}
-    }
-
-    if (strlen(argv[argc])) {
-	argc++, buf++;
-    }
-
-    rc = poptDupArgv(argc, argv, argcPtr, argvPtr);
-
-exit:
-    if (argv) free(argv);
-    return rc;
-}
-/*@=bounds@*/
-
-/* still in the dev stage.
- * return values, perhaps 1== file erro
- * 2== line to long
- * 3== umm.... more?
- */
-int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags)
-{
-    char line[999];
-    char * argstr;
-    char * p;
-    char * q;
-    char * x;
-    int t;
-    int argvlen = 0;
-    size_t maxlinelen = sizeof(line);
-    size_t linelen;
-    int maxargvlen = 480;
-    int linenum = 0;
-
-    *argstrp = NULL;
-
-    /*   |   this_is   =   our_line
-     *	     p             q      x
-     */
-
-    if (fp == NULL)
-	return POPT_ERROR_NULLARG;
-
-    argstr = calloc(maxargvlen, sizeof(*argstr));
-    if (argstr == NULL) return POPT_ERROR_MALLOC;
-
-    while (fgets(line, (int)maxlinelen, fp) != NULL) {
-	linenum++;
-	p = line;
-
-	/* loop until first non-space char or EOL */
-	while( *p != '\0' && isspace(*p) )
-	    p++;
-
-	linelen = strlen(p);
-	if (linelen >= maxlinelen-1)
-	    return POPT_ERROR_OVERFLOW;	/* XXX line too long */
-
-	if (*p == '\0' || *p == '\n') continue;	/* line is empty */
-	if (*p == '#') continue;		/* comment line */
-
-	q = p;
-
-	while (*q != '\0' && (!isspace(*q)) && *q != '=')
-	    q++;
-
-	if (isspace(*q)) {
-	    /* a space after the name, find next non space */
-	    *q++='\0';
-	    while( *q != '\0' && isspace((int)*q) ) q++;
-	}
-	if (*q == '\0') {
-	    /* single command line option (ie, no name=val, just name) */
-	    q[-1] = '\0';		/* kill off newline from fgets() call */
-	    argvlen += (t = q - p) + (sizeof(" --")-1);
-	    if (argvlen >= maxargvlen) {
-		maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2;
-		argstr = realloc(argstr, maxargvlen);
-		if (argstr == NULL) return POPT_ERROR_MALLOC;
-	    }
-	    strcat(argstr, " --");
-	    strcat(argstr, p);
-	    continue;
-	}
-	if (*q != '=')
-	    continue;	/* XXX for now, silently ignore bogus line */
-		
-	/* *q is an equal sign. */
-	*q++ = '\0';
-
-	/* find next non-space letter of value */
-	while (*q != '\0' && isspace(*q))
-	    q++;
-	if (*q == '\0')
-	    continue;	/* XXX silently ignore missing value */
-
-	/* now, loop and strip all ending whitespace */
-	x = p + linelen;
-	while (isspace(*--x))
-	    *x = 0;	/* null out last char if space (including fgets() NL) */
-
-	/* rest of line accept */
-	t = x - p;
-	argvlen += t + (sizeof("' --='")-1);
-	if (argvlen >= maxargvlen) {
-	    maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2;
-	    argstr = realloc(argstr, maxargvlen);
-	    if (argstr == NULL) return POPT_ERROR_MALLOC;
-	}
-	strcat(argstr, " --");
-	strcat(argstr, p);
-	strcat(argstr, "=\"");
-	strcat(argstr, q);
-	strcat(argstr, "\"");
-    }
-
-    *argstrp = argstr;
-    return 0;
-}
diff --git a/source4/lib/popt/samba.m4 b/source4/lib/popt/samba.m4
deleted file mode 100644
index 855fd6c402..0000000000
--- a/source4/lib/popt/samba.m4
+++ /dev/null
@@ -1,8 +0,0 @@
-m4_include(lib/popt/libpopt.m4)
-
-if test x"$POPT_OBJ" = "x"; then
-	SMB_EXT_LIB(LIBPOPT, [${POPT_LIBS}])
-else
-	SMB_INCLUDE_MK(lib/popt/config.mk)
-fi
-
diff --git a/source4/lib/popt/system.h b/source4/lib/popt/system.h
deleted file mode 100644
index 000e23d484..0000000000
--- a/source4/lib/popt/system.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#include "config.h"
-
-#if defined (__GLIBC__) && defined(__LCLINT__)
-/*@-declundef@*/
-/*@unchecked@*/
-extern __const __int32_t *__ctype_tolower;
-/*@unchecked@*/
-extern __const __int32_t *__ctype_toupper;
-/*@=declundef@*/
-#endif
-
-#include <ctype.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-
-#if HAVE_MCHECK_H 
-#include <mcheck.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef __NeXT
-/* access macros are not declared in non posix mode in unistd.h -
- don't try to use posix on NeXTstep 3.3 ! */
-#include <libc.h>
-#endif
-
-#if defined(__LCLINT__)
-/*@-declundef -incondefs -redecl@*/ /* LCL: missing annotation */
-/*@only@*/ void * alloca (size_t __size)
-	/*@ensures MaxSet(result) == (__size - 1) @*/
-	/*@*/;
-/*@=declundef =incondefs =redecl@*/
-#endif
-
-/* AIX requires this to be the first thing in the file.  */ 
-#ifndef __GNUC__
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
-#pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#   endif
-#  endif
-# endif
-#elif defined(__GNUC__) && defined(__STRICT_ANSI__)
-#define alloca __builtin_alloca
-#endif
-
-/*@-redecl -redef@*/
-/*@mayexit@*/ /*@only@*/ char * xstrdup (const char *str)
-	/*@*/;
-/*@=redecl =redef@*/
-
-#if HAVE_MCHECK_H && defined(__GNUC__)
-#define	vmefail()	(fprintf(stderr, "virtual memory exhausted.\n"), exit(EXIT_FAILURE), NULL)
-#define xstrdup(_str)   (strcpy((malloc(strlen(_str)+1) ? : vmefail()), (_str)))
-#else
-#define	xstrdup(_str)	strdup(_str)
-#endif  /* HAVE_MCHECK_H && defined(__GNUC__) */
-
-
-#include "popt.h"