Chainsaw the now unused #ifdef'ed parts out of rpmqv.c and rpmbuild.c

1 files changed, 9 insertions, 428 deletions

diff --git a/rpmbuild.c b/rpmbuild.c
index 6104e2ffd..e8b2f4032 100644
--- a/rpmbuild.c
+++ b/rpmbuild.c
@@ -3,14 +3,6 @@ const char *__progname;
 
 #define	_AUTOHELP
 
-#if defined(IAM_RPM) 
-#define	IAM_RPMBT
-#define	IAM_RPMDB
-#define	IAM_RPMEIU
-#define	IAM_RPMQV
-#define	IAM_RPMK
-#endif
-
 #include <sys/wait.h>
 #if HAVE_MCHECK_H
 #include <mcheck.h>
@@ -31,87 +23,38 @@ const char *__progname;
 #define GETOPT_RECOMPILE	1004
 #endif
 
-#if defined(IAM_RPMBT) || defined(IAM_RPMK)
+#if defined(IAM_RPMBT)
 #include "lib/signature.h"
 #endif
 
 #include "debug.h"
 
 enum modes {
-
-    MODE_QUERY		= (1 <<  0),
-    MODE_VERIFY		= (1 <<  3),
-#define	MODES_QV (MODE_QUERY | MODE_VERIFY)
-
-    MODE_INSTALL	= (1 <<  1),
-    MODE_ERASE		= (1 <<  2),
-#define	MODES_IE (MODE_INSTALL | MODE_ERASE)
-
     MODE_BUILD		= (1 <<  4),
     MODE_REBUILD	= (1 <<  5),
     MODE_RECOMPILE	= (1 <<  8),
     MODE_TARBUILD	= (1 << 11),
 #define	MODES_BT (MODE_BUILD | MODE_TARBUILD | MODE_REBUILD | MODE_RECOMPILE)
 
-    MODE_CHECKSIG	= (1 <<  6),
-    MODE_RESIGN		= (1 <<  7),
-#define	MODES_K	 (MODE_CHECKSIG | MODE_RESIGN)
-
-    MODE_INITDB		= (1 << 10),
-    MODE_REBUILDDB	= (1 << 12),
-    MODE_VERIFYDB	= (1 << 13),
-#define	MODES_DB (MODE_INITDB | MODE_REBUILDDB | MODE_VERIFYDB)
-
-
     MODE_UNKNOWN	= 0
 };
 
-#define	MODES_FOR_DBPATH	(MODES_BT | MODES_IE | MODES_QV | MODES_DB)
-#define	MODES_FOR_NODEPS	(MODES_BT | MODES_IE | MODE_VERIFY)
-#define	MODES_FOR_TEST		(MODES_BT | MODES_IE)
-#define	MODES_FOR_ROOT		(MODES_BT | MODES_IE | MODES_QV | MODES_DB | MODES_K)
+#define	MODES_FOR_DBPATH	(MODES_BT)
+#define	MODES_FOR_NODEPS	(MODES_BT)
+#define	MODES_FOR_TEST		(MODES_BT)
+#define	MODES_FOR_ROOT		(MODES_BT)
 
 static int quiet;
 
 /* the structure describing the options we take and the defaults */
 static struct poptOption optionsTable[] = {
 
-#ifdef	IAM_RPMQV
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmQVSourcePoptTable, 0,
-        N_("Query/Verify package selection options:"),
-        NULL },
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmQueryPoptTable, 0,
-	N_("Query options (with -q or --query):"),
-	NULL },
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmVerifyPoptTable, 0,
-	N_("Verify options (with -V or --verify):"),
-	NULL },
-#endif	/* IAM_RPMQV */
-
-#ifdef	IAM_RPMK
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmSignPoptTable, 0,
-	N_("Signature options:"),
-	NULL },
-#endif	/* IAM_RPMK */
-
-#ifdef	IAM_RPMDB
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmDatabasePoptTable, 0,
-	N_("Database options:"),
-	NULL },
-#endif	/* IAM_RPMDB */
-
 #ifdef	IAM_RPMBT
  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmBuildPoptTable, 0,
 	N_("Build options with [ <specfile> | <tarball> | <source package> ]:"),
 	NULL },
 #endif	/* IAM_RPMBT */
 
-#ifdef	IAM_RPMEIU
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmInstallPoptTable, 0,
-	N_("Install/Upgrade/Erase options:"),
-	NULL },
-#endif	/* IAM_RPMEIU */
-
  { "quiet", '\0', 0, &quiet, 0,			NULL, NULL},
 
  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0,
@@ -163,27 +106,11 @@ int main(int argc, char *argv[])
     rpmts ts = NULL;
     enum modes bigMode = MODE_UNKNOWN;
 
-#if defined(IAM_RPMQV)
-    QVA_t qva = &rpmQVKArgs;
-#endif
-
 #ifdef	IAM_RPMBT
     BTA_t ba = &rpmBTArgs;
 #endif
 
-#ifdef	IAM_RPMEIU
-   struct rpmInstallArguments_s * ia = &rpmIArgs;
-#endif
-
-#if defined(IAM_RPMDB)
-   struct rpmDatabaseArguments_s * da = &rpmDBArgs;
-#endif
-
-#if defined(IAM_RPMK)
-   QVA_t ka = &rpmQVKArgs;
-#endif
-
-#if defined(IAM_RPMBT) || defined(IAM_RPMK)
+#if defined(IAM_RPMBT)
     char * passPhrase = "";
 #endif
 
@@ -195,9 +122,6 @@ int main(int argc, char *argv[])
     int ec = 0;
     int status;
     int p[2];
-#ifdef	IAM_RPMEIU
-    int i;
-#endif
 	
 #if HAVE_MCHECK_H && HAVE_MTRACE
     mtrace();	/* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
@@ -214,32 +138,6 @@ int main(int argc, char *argv[])
 #ifdef	IAM_RPMBT
     if (rstreq(__progname, "rpmbuild"))	bigMode = MODE_BUILD;
 #endif
-#ifdef	IAM_RPMQV
-    if (rstreq(__progname, "rpmquery"))	bigMode = MODE_QUERY;
-    if (rstreq(__progname, "rpmverify")) bigMode = MODE_VERIFY;
-#endif
-
-#if defined(IAM_RPMQV)
-    /* Jumpstart option from argv[0] if necessary. */
-    switch (bigMode) {
-    case MODE_QUERY:	qva->qva_mode = 'q';	break;
-    case MODE_VERIFY:	qva->qva_mode = 'V';	break;
-    case MODE_CHECKSIG:	qva->qva_mode = 'K';	break;
-    case MODE_RESIGN:	qva->qva_mode = 'R';	break;
-    case MODE_INSTALL:
-    case MODE_ERASE:
-    case MODE_BUILD:
-    case MODE_REBUILD:
-    case MODE_RECOMPILE:
-    case MODE_TARBUILD:
-    case MODE_INITDB:
-    case MODE_REBUILDDB:
-    case MODE_VERIFYDB:
-    case MODE_UNKNOWN:
-    default:
-	break;
-    }
-#endif
 
 #if defined(ENABLE_NLS)
     /* set up the correct locale */
@@ -254,8 +152,6 @@ int main(int argc, char *argv[])
     /* Only build has it's own set of aliases, everything else uses rpm */
 #ifdef	IAM_RPMBT
     poptCtx = "rpmbuild";
-#else
-    poptCtx = "rpm";
 #endif
 
     /* Make a first pass through the arguments, looking for --rcfile */
@@ -309,177 +205,6 @@ int main(int argc, char *argv[])
     }
 #endif	/* IAM_RPMBT */
     
-#ifdef	IAM_RPMDB
-  if (bigMode == MODE_UNKNOWN || (bigMode & MODES_DB)) {
-    if (da->init) {
-	if (bigMode != MODE_UNKNOWN) 
-	    argerror(_("only one major mode may be specified"));
-	else
-	    bigMode = MODE_INITDB;
-    } else
-    if (da->rebuild) {
-	if (bigMode != MODE_UNKNOWN) 
-	    argerror(_("only one major mode may be specified"));
-	else
-	    bigMode = MODE_REBUILDDB;
-    } else
-    if (da->verify) {
-	if (bigMode != MODE_UNKNOWN) 
-	    argerror(_("only one major mode may be specified"));
-	else
-	    bigMode = MODE_VERIFYDB;
-    }
-  }
-#endif	/* IAM_RPMDB */
-
-#ifdef	IAM_RPMQV
-  if (bigMode == MODE_UNKNOWN || (bigMode & MODES_QV)) {
-    switch (qva->qva_mode) {
-    case 'q':	bigMode = MODE_QUERY;		break;
-    case 'V':	bigMode = MODE_VERIFY;		break;
-    }
-
-    if (qva->qva_sourceCount) {
-	if (qva->qva_sourceCount > 2)
-	    argerror(_("one type of query/verify may be performed at a "
-			"time"));
-    }
-    if (qva->qva_flags && (bigMode & ~MODES_QV)) 
-	argerror(_("unexpected query flags"));
-
-    if (qva->qva_queryFormat && (bigMode & ~MODES_QV)) 
-	argerror(_("unexpected query format"));
-
-    if (qva->qva_source != RPMQV_PACKAGE && (bigMode & ~MODES_QV)) 
-	argerror(_("unexpected query source"));
-  }
-#endif	/* IAM_RPMQV */
-
-#ifdef	IAM_RPMEIU
-  if (bigMode == MODE_UNKNOWN || (bigMode & MODES_IE))
-    {	int iflags = (ia->installInterfaceFlags &
-		(INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL));
-	int eflags = (ia->installInterfaceFlags & INSTALL_ERASE);
-
-	if (iflags & eflags)
-	    argerror(_("only one major mode may be specified"));
-	else if (iflags)
-	    bigMode = MODE_INSTALL;
-	else if (eflags)
-	    bigMode = MODE_ERASE;
-    }
-#endif	/* IAM_RPMEIU */
-
-#ifdef	IAM_RPMK
-  if (bigMode == MODE_UNKNOWN || (bigMode & MODES_K)) {
-	switch (ka->qva_mode) {
-	case RPMSIGN_NONE:
-	    ka->sign = 0;
-	    break;
-	case RPMSIGN_IMPORT_PUBKEY:
-	case RPMSIGN_CHK_SIGNATURE:
-	    bigMode = MODE_CHECKSIG;
-	    ka->sign = 0;
-	    break;
-	case RPMSIGN_ADD_SIGNATURE:
-	case RPMSIGN_NEW_SIGNATURE:
-	case RPMSIGN_DEL_SIGNATURE:
-	    bigMode = MODE_RESIGN;
-	    ka->sign = (ka->qva_mode != RPMSIGN_DEL_SIGNATURE);
-	    break;
-	}
-  }
-#endif	/* IAM_RPMK */
-
-#if defined(IAM_RPMEIU)
-    if (!( bigMode == MODE_INSTALL ) &&
-(ia->probFilter & (RPMPROB_FILTER_REPLACEPKG | RPMPROB_FILTER_OLDPACKAGE)))
-	argerror(_("only installation, upgrading, rmsource and rmspec may be forced"));
-    if (bigMode != MODE_INSTALL && (ia->probFilter & RPMPROB_FILTER_FORCERELOCATE))
-	argerror(_("files may only be relocated during package installation"));
-
-    if (ia->relocations && ia->prefix)
-	argerror(_("cannot use --prefix with --relocate or --excludepath"));
-
-    if (bigMode != MODE_INSTALL && ia->relocations)
-	argerror(_("--relocate and --excludepath may only be used when installing new packages"));
-
-    if (bigMode != MODE_INSTALL && ia->prefix)
-	argerror(_("--prefix may only be used when installing new packages"));
-
-    if (ia->prefix && ia->prefix[0] != '/') 
-	argerror(_("arguments to --prefix must begin with a /"));
-
-    if (bigMode != MODE_INSTALL && (ia->installInterfaceFlags & INSTALL_HASH))
-	argerror(_("--hash (-h) may only be specified during package "
-			"installation"));
-
-    if (bigMode != MODE_INSTALL && (ia->installInterfaceFlags & INSTALL_PERCENT))
-	argerror(_("--percent may only be specified during package "
-			"installation"));
-
-    if (bigMode != MODE_INSTALL && (ia->probFilter & RPMPROB_FILTER_REPLACEPKG))
-	argerror(_("--replacepkgs may only be specified during package "
-			"installation"));
-
-    if (bigMode != MODE_INSTALL && (ia->transFlags & RPMTRANS_FLAG_NODOCS))
-	argerror(_("--excludedocs may only be specified during package "
-		   "installation"));
-
-    if (bigMode != MODE_INSTALL && ia->incldocs)
-	argerror(_("--includedocs may only be specified during package "
-		   "installation"));
-
-    if (ia->incldocs && (ia->transFlags & RPMTRANS_FLAG_NODOCS))
-	argerror(_("only one of --excludedocs and --includedocs may be "
-		 "specified"));
-  
-    if (bigMode != MODE_INSTALL && (ia->probFilter & RPMPROB_FILTER_IGNOREARCH))
-	argerror(_("--ignorearch may only be specified during package "
-		   "installation"));
-
-    if (bigMode != MODE_INSTALL && (ia->probFilter & RPMPROB_FILTER_IGNOREOS))
-	argerror(_("--ignoreos may only be specified during package "
-		   "installation"));
-
-    if (bigMode != MODE_INSTALL && bigMode != MODE_ERASE &&
-	(ia->probFilter & (RPMPROB_FILTER_DISKSPACE|RPMPROB_FILTER_DISKNODES)))
-	argerror(_("--ignoresize may only be specified during package "
-		   "installation"));
-
-    if ((ia->installInterfaceFlags & UNINSTALL_ALLMATCHES) && bigMode != MODE_ERASE)
-	argerror(_("--allmatches may only be specified during package "
-		   "erasure"));
-
-    if ((ia->transFlags & RPMTRANS_FLAG_ALLFILES) && bigMode != MODE_INSTALL)
-	argerror(_("--allfiles may only be specified during package "
-		   "installation"));
-
-    if ((ia->transFlags & RPMTRANS_FLAG_JUSTDB) &&
-	bigMode != MODE_INSTALL && bigMode != MODE_ERASE)
-	argerror(_("--justdb may only be specified during package "
-		   "installation and erasure"));
-
-    if (bigMode != MODE_INSTALL && bigMode != MODE_ERASE && bigMode != MODE_VERIFY &&
-	(ia->transFlags & (RPMTRANS_FLAG_NOSCRIPTS | _noTransScripts | _noTransTriggers)))
-	argerror(_("script disabling options may only be specified during "
-		   "package installation and erasure"));
-
-    if (bigMode != MODE_INSTALL && bigMode != MODE_ERASE && bigMode != MODE_VERIFY &&
-	(ia->transFlags & (RPMTRANS_FLAG_NOTRIGGERS | _noTransTriggers)))
-	argerror(_("trigger disabling options may only be specified during "
-		   "package installation and erasure"));
-
-    if (ia->noDeps & (bigMode & ~MODES_FOR_NODEPS))
-	argerror(_("--nodeps may only be specified during package "
-		   "building, rebuilding, recompilation, installation,"
-		   "erasure, and verification"));
-
-    if ((ia->transFlags & RPMTRANS_FLAG_TEST) && (bigMode & ~MODES_FOR_TEST))
-	argerror(_("--test may only be specified during package installation, "
-		 "erasure, and building"));
-#endif	/* IAM_RPMEIU */
-
     if (rpmcliRootDir && rpmcliRootDir[1] && (bigMode & ~MODES_FOR_ROOT))
 	argerror(_("--root (-r) may only be specified during "
 		 "installation, erasure, querying, and "
@@ -500,18 +225,10 @@ int main(int argc, char *argv[])
     if (quiet)
 	rpmSetVerbosity(RPMLOG_WARNING);
 
-#if defined(IAM_RPMBT) || defined(IAM_RPMK)
-    if (0
 #if defined(IAM_RPMBT)
-    || ba->sign 
-#endif
-#if defined(IAM_RPMK)
-    || ka->sign
-#endif
-    )
-    {
+    if (ba->sign) {
         if (bigMode == MODE_REBUILD || bigMode == MODE_BUILD ||
-	    bigMode == MODE_RESIGN || bigMode == MODE_TARBUILD)
+	    bigMode == MODE_TARBUILD)
 	{
 	    const char ** av;
 	    struct stat sb;
@@ -567,7 +284,7 @@ int main(int argc, char *argv[])
     	/* Make rpmLookupSignatureType() return 0 ("none") from now on */
         (void) rpmLookupSignatureType(RPMLOOKUPSIG_DISABLE);
     }
-#endif	/* IAM_RPMBT || IAM_RPMK */
+#endif	/* IAM_RPMBT */
 
     if (rpmcliPipeOutput) {
 	if (pipe(p) < 0) {
@@ -592,22 +309,6 @@ int main(int argc, char *argv[])
     ts = rpmtsCreate();
     (void) rpmtsSetRootDir(ts, rpmcliRootDir);
     switch (bigMode) {
-#ifdef	IAM_RPMDB
-    case MODE_INITDB:
-	ec = rpmtsInitDB(ts, 0644);
-	break;
-
-    case MODE_REBUILDDB:
-    {   rpmVSFlags vsflags = rpmExpandNumeric("%{_vsflags_rebuilddb}");
-	rpmVSFlags ovsflags = rpmtsSetVSFlags(ts, vsflags);
-	ec = rpmtsRebuildDB(ts);
-	vsflags = rpmtsSetVSFlags(ts, ovsflags);
-    }	break;
-    case MODE_VERIFYDB:
-	ec = rpmtsVerifyDB(ts);
-	break;
-#endif	/* IAM_RPMDB */
-
 #ifdef	IAM_RPMBT
     case MODE_REBUILD:
     case MODE_RECOMPILE:
@@ -703,115 +404,6 @@ int main(int argc, char *argv[])
     }	break;
 #endif	/* IAM_RPMBT */
 
-#ifdef	IAM_RPMEIU
-    case MODE_ERASE:
-	if (ia->noDeps) ia->installInterfaceFlags |= UNINSTALL_NODEPS;
-
-	if (!poptPeekArg(optCon)) {
-	    argerror(_("no packages given for erase"));
-	} else {
-	    ec += rpmErase(ts, ia, (ARGV_const_t) poptGetArgs(optCon));
-	}
-	break;
-
-    case MODE_INSTALL:
-
-	/* RPMTRANS_FLAG_KEEPOBSOLETE */
-
-	if (!ia->incldocs) {
-	    if (ia->transFlags & RPMTRANS_FLAG_NODOCS) {
-		;
-	    } else if (rpmExpandNumeric("%{_excludedocs}"))
-		ia->transFlags |= RPMTRANS_FLAG_NODOCS;
-	}
-
-	if (ia->noDeps) ia->installInterfaceFlags |= INSTALL_NODEPS;
-
-	/* we've already ensured !(!ia->prefix && !ia->relocations) */
-	if (ia->prefix) {
-	    ia->relocations = xmalloc(2 * sizeof(*ia->relocations));
-	    ia->relocations[0].oldPath = NULL;   /* special case magic */
-	    ia->relocations[0].newPath = ia->prefix;
-	    ia->relocations[1].oldPath = NULL;
-	    ia->relocations[1].newPath = NULL;
-	} else if (ia->relocations) {
-	    ia->relocations = xrealloc(ia->relocations, 
-			sizeof(*ia->relocations) * (ia->numRelocations + 1));
-	    ia->relocations[ia->numRelocations].oldPath = NULL;
-	    ia->relocations[ia->numRelocations].newPath = NULL;
-	}
-
-	if (!poptPeekArg(optCon)) {
-	    argerror(_("no packages given for install"));
-	} else {
-	    /* FIX: ia->relocations[0].newPath undefined */
-	    ec += rpmInstall(ts, ia, (ARGV_t) poptGetArgs(optCon));
-	}
-	break;
-
-#endif	/* IAM_RPMEIU */
-
-#ifdef	IAM_RPMQV
-    case MODE_QUERY:
-	if (!poptPeekArg(optCon) && !(qva->qva_source == RPMQV_ALL))
-	    argerror(_("no arguments given for query"));
-
-	qva->qva_specQuery = rpmspecQuery;
-	ec = rpmcliQuery(ts, qva, (ARGV_const_t) poptGetArgs(optCon));
-	qva->qva_specQuery = NULL;
-	break;
-
-    case MODE_VERIFY:
-    {	rpmVerifyFlags verifyFlags = VERIFY_ALL;
-
-	verifyFlags &= ~qva->qva_flags;
-	qva->qva_flags = (rpmQueryFlags) verifyFlags;
-
-	if (!poptPeekArg(optCon) && !(qva->qva_source == RPMQV_ALL))
-	    argerror(_("no arguments given for verify"));
-	ec = rpmcliVerify(ts, qva, (ARGV_const_t) poptGetArgs(optCon));
-    }	break;
-#endif	/* IAM_RPMQV */
-
-#ifdef IAM_RPMK
-    case MODE_CHECKSIG:
-    {	rpmVerifyFlags verifyFlags =
-		(VERIFY_FILEDIGEST|VERIFY_DIGEST|VERIFY_SIGNATURE);
-
-	verifyFlags &= ~ka->qva_flags;
-	ka->qva_flags = (rpmQueryFlags) verifyFlags;
-    }  
-    case MODE_RESIGN:
-	if (!poptPeekArg(optCon))
-	    argerror(_("no arguments given"));
-	ka->passPhrase = passPhrase;
-	ec = rpmcliSign(ts, ka, (ARGV_const_t) poptGetArgs(optCon));
-    	break;
-#endif	/* IAM_RPMK */
-	
-#if !defined(IAM_RPMQV)
-    case MODE_QUERY:
-    case MODE_VERIFY:
-#endif
-#if !defined(IAM_RPMK)
-    case MODE_CHECKSIG:
-    case MODE_RESIGN:
-#endif
-#if !defined(IAM_RPMDB)
-    case MODE_INITDB:
-    case MODE_REBUILDDB:
-    case MODE_VERIFYDB:
-#endif
-#if !defined(IAM_RPMBT)
-    case MODE_BUILD:
-    case MODE_REBUILD:
-    case MODE_RECOMPILE:
-    case MODE_TARBUILD:
-#endif
-#if !defined(IAM_RPMEIU)
-    case MODE_INSTALL:
-    case MODE_ERASE:
-#endif
     case MODE_UNKNOWN:
 	if (poptPeekArg(optCon) != NULL || argc <= 1 || rpmIsVerbose()) {
 	    printUsage(optCon, stderr, 0);
@@ -837,23 +429,12 @@ exit:
     /* keeps memory leak checkers quiet */
     rpmlogClose();
 
-#ifdef	IAM_RPMQV
-    qva->qva_queryFormat = _free(qva->qva_queryFormat);
-#endif
-
 #ifdef	IAM_RPMBT
     freeNames();
     ba->buildRootOverride = _free(ba->buildRootOverride);
     ba->targets = _free(ba->targets);
 #endif
 
-#ifdef	IAM_RPMEIU
-    if (ia->relocations != NULL)
-    for (i = 0; i < ia->numRelocations; i++)
-	ia->relocations[i].oldPath = _free(ia->relocations[i].oldPath);
-    ia->relocations = _free(ia->relocations);
-#endif
-
 #if HAVE_MCHECK_H && HAVE_MTRACE
     muntrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
 #endif