Merge build.[ch] into rpmbuild.c, doesn't make sense to separate anymore

5 files changed, 335 insertions, 380 deletions

diff --git a/Makefile.am b/Makefile.am
index 21a078aec..21a5663c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,7 +89,7 @@ rpm_CPPFLAGS =		$(AM_CPPFLAGS) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV
 rpm_LDADD =		build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
 rpm_LDADD +=		@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
 
-rpmbuild_SOURCES =	rpmbuild.c build.c build.h debug.h system.h
+rpmbuild_SOURCES =	rpmbuild.c debug.h system.h
 rpmbuild_CPPFLAGS =	$(AM_CPPFLAGS)
 rpmbuild_LDADD =	build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
 rpmbuild_LDADD += 	@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
diff --git a/build.c b/build.c
deleted file mode 100644
index 501f9d607..000000000
--- a/build.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/** \ingroup rpmcli
- * Parse spec file and build package.
- */
-
-#include "system.h"
-
-#include <libgen.h>
-#include <errno.h>
-#include <ctype.h>
-
-#include <rpm/rpmcli.h>
-#include <rpm/rpmtag.h>
-#include <rpm/rpmlib.h>		/* rpmrc, MACHTABLE .. */
-#include <rpm/rpmbuild.h>
-
-#include <rpm/rpmps.h>
-#include <rpm/rpmte.h>
-#include <rpm/rpmts.h>
-#include <rpm/rpmfileutil.h>
-#include <rpm/rpmlog.h>
-#include <lib/misc.h>
-
-#include "build.h"
-#include "debug.h"
-
-/**
- */
-static int checkSpec(rpmts ts, Header h)
-{
-    rpmps ps;
-    int rc;
-
-    if (!headerIsEntry(h, RPMTAG_REQUIRENAME)
-     && !headerIsEntry(h, RPMTAG_CONFLICTNAME))
-	return 0;
-
-    rc = rpmtsAddInstallElement(ts, h, NULL, 0, NULL);
-
-    rc = rpmtsCheck(ts);
-
-    ps = rpmtsProblems(ts);
-    if (rc == 0 && rpmpsNumProblems(ps) > 0) {
-	rpmlog(RPMLOG_ERR, _("Failed build dependencies:\n"));
-	rpmpsPrint(NULL, ps);
-	rc = 1;
-    }
-    ps = rpmpsFree(ps);
-
-    /* XXX nuke the added package. */
-    rpmtsClean(ts);
-
-    return rc;
-}
-
-/**
- */
-static int isSpecFile(const char * specfile)
-{
-    char buf[256];
-    const char * s;
-    FILE * f;
-    int count;
-    int checking;
-
-    f = fopen(specfile, "r");
-    if (f == NULL || ferror(f)) {
-	rpmlog(RPMLOG_ERR, _("Unable to open spec file %s: %s\n"),
-		specfile, strerror(errno));
-	return 0;
-    }
-    count = fread(buf, sizeof(buf[0]), sizeof(buf), f);
-    (void) fclose(f);
-
-    if (count == 0)
-	return 0;
-
-    checking = 1;
-    for (s = buf; count--; s++) {
-	switch (*s) {
-	case '\r':
-	case '\n':
-	    checking = 1;
-	    break;
-	case ':':
-	    checking = 0;
-	    break;
-	default:
-#if 0
-	    if (checking && !(isprint(*s) || isspace(*s))) return 0;
-	    break;
-#else
-	    if (checking && !(isprint(*s) || isspace(*s)) && *(unsigned char *)s < 32) return 0;
-	    break;
-#endif
-	}
-    }
-    return 1;
-}
-
-/* 
- * Try to find a spec from a tarball pointed to by arg. 
- * Return absolute path to spec name on success, otherwise NULL.
- */
-static char * getTarSpec(const char *arg)
-{
-    char *specFile = NULL;
-    char *specDir;
-    char *specBase;
-    char *tmpSpecFile;
-    const char **try;
-    char tarbuf[BUFSIZ];
-    int gotspec = 0, res;
-    static const char *tryspec[] = { "Specfile", "\\*.spec", NULL };
-
-    specDir = rpmGetPath("%{_specdir}", NULL);
-    tmpSpecFile = rpmGetPath("%{_specdir}/", "rpm-spec.XXXXXX", NULL);
-
-    (void) close(mkstemp(tmpSpecFile));
-
-    for (try = tryspec; *try != NULL; try++) {
-	FILE *fp;
-	char *cmd;
-
-	cmd = rpmExpand("%{uncompress: ", arg, "} | ",
-			"%{__tar} xOvf - --wildcards ", *try,
-			" 2>&1 > ", tmpSpecFile, NULL);
-
-	if (!(fp = popen(cmd, "r"))) {
-	    rpmlog(RPMLOG_ERR, _("Failed to open tar pipe: %m\n"));
-	} else {
-	    char *fok;
-	    for (;;) {
-		fok = fgets(tarbuf, sizeof(tarbuf) - 1, fp);
-		/* tar sometimes prints "tar: Record size = 16" messages */
-		if (!fok || strncmp(fok, "tar: ", 5) != 0)
-		    break;
-	    }
-	    pclose(fp);
-	    gotspec = (fok != NULL) && isSpecFile(tmpSpecFile);
-	}
-
-	if (!gotspec) 
-	    unlink(tmpSpecFile);
-	free(cmd);
-    }
-
-    if (!gotspec) {
-    	rpmlog(RPMLOG_ERR, _("Failed to read spec file from %s\n"), arg);
-	goto exit;
-    }
-
-    specBase = basename(tarbuf);
-    /* remove trailing \n */
-    specBase[strlen(specBase)-1] = '\0';
-
-    rasprintf(&specFile, "%s/%s", specDir, specBase);
-    res = rename(tmpSpecFile, specFile);
-
-    if (res) {
-    	rpmlog(RPMLOG_ERR, _("Failed to rename %s to %s: %m\n"),
-		tmpSpecFile, specFile);
-    	free(specFile);
-	specFile = NULL;
-    } else {
-    	/* mkstemp() can give unnecessarily strict permissions, fixup */
-	mode_t mask;
-	umask(mask = umask(0));
-	(void) chmod(specFile, 0666 & ~mask);
-    }
-
-exit:
-    (void) unlink(tmpSpecFile);
-    free(tmpSpecFile);
-    free(specDir);
-    return specFile;
-}
-
-/**
- */
-static int buildForTarget(rpmts ts, const char * arg, BTA_t ba)
-{
-    const char * passPhrase = ba->passPhrase;
-    const char * cookie = ba->cookie;
-    int buildAmount = ba->buildAmount;
-    char * buildRootURL = NULL;
-    char * specFile = NULL;
-    rpmSpec spec = NULL;
-    int rc = 1; /* assume failure */
-
-#ifndef	DYING
-    rpmSetTables(RPM_MACHTABLE_BUILDARCH, RPM_MACHTABLE_BUILDOS);
-#endif
-
-    if (ba->buildRootOverride)
-	buildRootURL = rpmGenPath(NULL, ba->buildRootOverride, NULL);
-
-    /* Create build tree if necessary */
-    const char * buildtree = "%{_topdir}:%{_specdir}:%{_sourcedir}:%{_builddir}:%{_rpmdir}:%{_srcrpmdir}:%{_buildrootdir}";
-    const char * rootdir = rpmtsRootDir(ts);
-    if (rpmMkdirs(!rstreq(rootdir, "/") ? rootdir : NULL , buildtree)) {
-	goto exit;
-    }
-
-    if (ba->buildMode == 't') {
-    	char *srcdir = NULL, *dir;
-
-	specFile = getTarSpec(arg);
-	if (!specFile)
-	    goto exit;
-
-	/* Make the directory of the tarball %_sourcedir for this run */
-	/* dirname() may modify contents so extra hoops needed. */
-	if (*arg != '/') {
-	    dir = rpmGetCwd();
-	    rstrscat(&dir, "/", arg, NULL);
-	} else {
-	    dir = xstrdup(arg);
-	}
-	srcdir = dirname(dir);
-	addMacro(NULL, "_sourcedir", NULL, srcdir, RMIL_TARBALL);
-	free(dir);
-    } else {
-	specFile = xstrdup(arg);
-    }
-
-    if (*specFile != '/') {
-	char *cwd = rpmGetCwd();
-	char *s = NULL;
-	rasprintf(&s, "%s/%s", cwd, arg);
-	free(cwd);
-	free(specFile);
-	specFile = s;
-    }
-
-    struct stat st;
-    if (stat(specFile, &st) < 0) {
-	rpmlog(RPMLOG_ERR, _("failed to stat %s: %m\n"), specFile);
-	goto exit;
-    }
-    if (! S_ISREG(st.st_mode)) {
-	rpmlog(RPMLOG_ERR, _("File %s is not a regular file.\n"), specFile);
-	goto exit;
-    }
-
-    /* Try to verify that the file is actually a specfile */
-    if (!isSpecFile(specFile)) {
-	rpmlog(RPMLOG_ERR,
-		_("File %s does not appear to be a specfile.\n"), specFile);
-	goto exit;
-    }
-    
-    /* Don't parse spec if only its removal is requested */
-    if (ba->buildAmount == RPMBUILD_RMSPEC) {
-	rc = unlink(specFile);
-	goto exit;
-    }
-
-    /* Parse the spec file */
-#define	_anyarch(_f)	\
-(((_f)&(RPMBUILD_PREP|RPMBUILD_BUILD|RPMBUILD_INSTALL|RPMBUILD_PACKAGEBINARY)) == 0)
-    if (parseSpec(ts, specFile, ba->rootdir, buildRootURL, 0, passPhrase,
-		cookie, _anyarch(buildAmount), ba->force))
-    {
-	goto exit;
-    }
-#undef	_anyarch
-    if ((spec = rpmtsSetSpec(ts, NULL)) == NULL) {
-	goto exit;
-    }
-
-    if ( ba->buildAmount&RPMBUILD_RMSOURCE && !(ba->buildAmount&~(RPMBUILD_RMSOURCE|RPMBUILD_RMSPEC)) ) {
-	rc = doRmSource(spec);
-	if ( rc == RPMRC_OK && ba->buildAmount&RPMBUILD_RMSPEC )
-	    rc = unlink(specFile);
-	goto exit;
-    }
-
-    /* Assemble source header from parsed components */
-    initSourceHeader(spec);
-
-    /* Check build prerequisites */
-    if (!ba->noDeps && checkSpec(ts, spec->sourceHeader)) {
-	goto exit;
-    }
-
-    if (buildSpec(ts, spec, buildAmount, ba->noBuild)) {
-	goto exit;
-    }
-    
-    if (ba->buildMode == 't')
-	(void) unlink(specFile);
-    rc = 0;
-
-exit:
-    free(specFile);
-    freeSpec(spec);
-    free(buildRootURL);
-    return rc;
-}
-
-int build(rpmts ts, const char * arg, BTA_t ba, const char * rcfile)
-{
-    char *t, *te;
-    int rc = 0;
-    char * targets = ba->targets;
-#define	buildCleanMask	(RPMBUILD_RMSOURCE|RPMBUILD_RMSPEC)
-    int cleanFlags = ba->buildAmount & buildCleanMask;
-    rpmVSFlags vsflags, ovsflags;
-
-    vsflags = rpmExpandNumeric("%{_vsflags_build}");
-    if (ba->qva_flags & VERIFY_DIGEST)
-	vsflags |= _RPMVSF_NODIGESTS;
-    if (ba->qva_flags & VERIFY_SIGNATURE)
-	vsflags |= _RPMVSF_NOSIGNATURES;
-    if (ba->qva_flags & VERIFY_HDRCHK)
-	vsflags |= RPMVSF_NOHDRCHK;
-    ovsflags = rpmtsSetVSFlags(ts, vsflags);
-
-    if (targets == NULL) {
-	rc =  buildForTarget(ts, arg, ba);
-	goto exit;
-    }
-
-    /* parse up the build operators */
-
-    printf(_("Building target platforms: %s\n"), targets);
-
-    ba->buildAmount &= ~buildCleanMask;
-    for (t = targets; *t != '\0'; t = te) {
-	char *target;
-	if ((te = strchr(t, ',')) == NULL)
-	    te = t + strlen(t);
-	target = xmalloc(te-t+1);
-	strncpy(target, t, (te-t));
-	target[te-t] = '\0';
-	if (*te != '\0')
-	    te++;
-	else	/* XXX Perform clean-up after last target build. */
-	    ba->buildAmount |= cleanFlags;
-
-	printf(_("Building for target %s\n"), target);
-
-	/* Read in configuration for target. */
-	rpmFreeMacros(NULL);
-	rpmFreeRpmrc();
-	(void) rpmReadConfigFiles(rcfile, target);
-	free(target);
-	rc = buildForTarget(ts, arg, ba);
-	if (rc)
-	    break;
-    }
-
-exit:
-    vsflags = rpmtsSetVSFlags(ts, ovsflags);
-    /* Restore original configuration. */
-    rpmFreeMacros(NULL);
-    rpmFreeRpmrc();
-    (void) rpmReadConfigFiles(rcfile, NULL);
-
-    return rc;
-}
diff --git a/build.h b/build.h
deleted file mode 100644
index 7092af0df..000000000
--- a/build.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef H_BUILD
-#define H_BUILD
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int build(rpmts ts, const char * arg, BTA_t ba,
-		const char * rcfile);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0ffeee79d..958155073 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,6 @@
 
 # Package source files
 
-build.c
 rpm2cpio.c
 rpmqv.c
 rpmbuild.c
diff --git a/rpmbuild.c b/rpmbuild.c
index a9ccc2bc5..5ca6bed19 100644
--- a/rpmbuild.c
+++ b/rpmbuild.c
@@ -3,6 +3,9 @@ const char *__progname;
 
 #define	_AUTOHELP
 
+#include <errno.h>
+#include <libgen.h>
+#include <ctype.h>
 #include <sys/wait.h>
 #if HAVE_MCHECK_H
 #include <mcheck.h>
@@ -17,7 +20,6 @@ const char *__progname;
 #include <rpm/rpmps.h>
 #include <rpm/rpmts.h>
 #include "lib/signature.h"
-#include "build.h"
 
 #include "debug.h"
 
@@ -83,6 +85,337 @@ static void printUsage(poptContext con, FILE * fp, int flags)
 	poptPrintUsage(con, fp, flags);
 }
 
+static int checkSpec(rpmts ts, Header h)
+{
+    rpmps ps;
+    int rc;
+
+    if (!headerIsEntry(h, RPMTAG_REQUIRENAME)
+     && !headerIsEntry(h, RPMTAG_CONFLICTNAME))
+	return 0;
+
+    rc = rpmtsAddInstallElement(ts, h, NULL, 0, NULL);
+
+    rc = rpmtsCheck(ts);
+
+    ps = rpmtsProblems(ts);
+    if (rc == 0 && rpmpsNumProblems(ps) > 0) {
+	rpmlog(RPMLOG_ERR, _("Failed build dependencies:\n"));
+	rpmpsPrint(NULL, ps);
+	rc = 1;
+    }
+    ps = rpmpsFree(ps);
+
+    /* XXX nuke the added package. */
+    rpmtsClean(ts);
+
+    return rc;
+}
+
+static int isSpecFile(const char * specfile)
+{
+    char buf[256];
+    const char * s;
+    FILE * f;
+    int count;
+    int checking;
+
+    f = fopen(specfile, "r");
+    if (f == NULL || ferror(f)) {
+	rpmlog(RPMLOG_ERR, _("Unable to open spec file %s: %s\n"),
+		specfile, strerror(errno));
+	return 0;
+    }
+    count = fread(buf, sizeof(buf[0]), sizeof(buf), f);
+    (void) fclose(f);
+
+    if (count == 0)
+	return 0;
+
+    checking = 1;
+    for (s = buf; count--; s++) {
+	switch (*s) {
+	case '\r':
+	case '\n':
+	    checking = 1;
+	    break;
+	case ':':
+	    checking = 0;
+	    break;
+	default:
+#if 0
+	    if (checking && !(isprint(*s) || isspace(*s))) return 0;
+	    break;
+#else
+	    if (checking && !(isprint(*s) || isspace(*s)) && *(unsigned char *)s < 32) return 0;
+	    break;
+#endif
+	}
+    }
+    return 1;
+}
+
+/* 
+ * Try to find a spec from a tarball pointed to by arg. 
+ * Return absolute path to spec name on success, otherwise NULL.
+ */
+static char * getTarSpec(const char *arg)
+{
+    char *specFile = NULL;
+    char *specDir;
+    char *specBase;
+    char *tmpSpecFile;
+    const char **try;
+    char tarbuf[BUFSIZ];
+    int gotspec = 0, res;
+    static const char *tryspec[] = { "Specfile", "\\*.spec", NULL };
+
+    specDir = rpmGetPath("%{_specdir}", NULL);
+    tmpSpecFile = rpmGetPath("%{_specdir}/", "rpm-spec.XXXXXX", NULL);
+
+    (void) close(mkstemp(tmpSpecFile));
+
+    for (try = tryspec; *try != NULL; try++) {
+	FILE *fp;
+	char *cmd;
+
+	cmd = rpmExpand("%{uncompress: ", arg, "} | ",
+			"%{__tar} xOvf - --wildcards ", *try,
+			" 2>&1 > ", tmpSpecFile, NULL);
+
+	if (!(fp = popen(cmd, "r"))) {
+	    rpmlog(RPMLOG_ERR, _("Failed to open tar pipe: %m\n"));
+	} else {
+	    char *fok;
+	    for (;;) {
+		fok = fgets(tarbuf, sizeof(tarbuf) - 1, fp);
+		/* tar sometimes prints "tar: Record size = 16" messages */
+		if (!fok || strncmp(fok, "tar: ", 5) != 0)
+		    break;
+	    }
+	    pclose(fp);
+	    gotspec = (fok != NULL) && isSpecFile(tmpSpecFile);
+	}
+
+	if (!gotspec) 
+	    unlink(tmpSpecFile);
+	free(cmd);
+    }
+
+    if (!gotspec) {
+    	rpmlog(RPMLOG_ERR, _("Failed to read spec file from %s\n"), arg);
+	goto exit;
+    }
+
+    specBase = basename(tarbuf);
+    /* remove trailing \n */
+    specBase[strlen(specBase)-1] = '\0';
+
+    rasprintf(&specFile, "%s/%s", specDir, specBase);
+    res = rename(tmpSpecFile, specFile);
+
+    if (res) {
+    	rpmlog(RPMLOG_ERR, _("Failed to rename %s to %s: %m\n"),
+		tmpSpecFile, specFile);
+    	free(specFile);
+	specFile = NULL;
+    } else {
+    	/* mkstemp() can give unnecessarily strict permissions, fixup */
+	mode_t mask;
+	umask(mask = umask(0));
+	(void) chmod(specFile, 0666 & ~mask);
+    }
+
+exit:
+    (void) unlink(tmpSpecFile);
+    free(tmpSpecFile);
+    free(specDir);
+    return specFile;
+}
+
+static int buildForTarget(rpmts ts, const char * arg, BTA_t ba)
+{
+    const char * passPhrase = ba->passPhrase;
+    const char * cookie = ba->cookie;
+    int buildAmount = ba->buildAmount;
+    char * buildRootURL = NULL;
+    char * specFile = NULL;
+    rpmSpec spec = NULL;
+    int rc = 1; /* assume failure */
+
+#ifndef	DYING
+    rpmSetTables(RPM_MACHTABLE_BUILDARCH, RPM_MACHTABLE_BUILDOS);
+#endif
+
+    if (ba->buildRootOverride)
+	buildRootURL = rpmGenPath(NULL, ba->buildRootOverride, NULL);
+
+    /* Create build tree if necessary */
+    const char * buildtree = "%{_topdir}:%{_specdir}:%{_sourcedir}:%{_builddir}:%{_rpmdir}:%{_srcrpmdir}:%{_buildrootdir}";
+    const char * rootdir = rpmtsRootDir(ts);
+    if (rpmMkdirs(!rstreq(rootdir, "/") ? rootdir : NULL , buildtree)) {
+	goto exit;
+    }
+
+    if (ba->buildMode == 't') {
+    	char *srcdir = NULL, *dir;
+
+	specFile = getTarSpec(arg);
+	if (!specFile)
+	    goto exit;
+
+	/* Make the directory of the tarball %_sourcedir for this run */
+	/* dirname() may modify contents so extra hoops needed. */
+	if (*arg != '/') {
+	    dir = rpmGetCwd();
+	    rstrscat(&dir, "/", arg, NULL);
+	} else {
+	    dir = xstrdup(arg);
+	}
+	srcdir = dirname(dir);
+	addMacro(NULL, "_sourcedir", NULL, srcdir, RMIL_TARBALL);
+	free(dir);
+    } else {
+	specFile = xstrdup(arg);
+    }
+
+    if (*specFile != '/') {
+	char *cwd = rpmGetCwd();
+	char *s = NULL;
+	rasprintf(&s, "%s/%s", cwd, arg);
+	free(cwd);
+	free(specFile);
+	specFile = s;
+    }
+
+    struct stat st;
+    if (stat(specFile, &st) < 0) {
+	rpmlog(RPMLOG_ERR, _("failed to stat %s: %m\n"), specFile);
+	goto exit;
+    }
+    if (! S_ISREG(st.st_mode)) {
+	rpmlog(RPMLOG_ERR, _("File %s is not a regular file.\n"), specFile);
+	goto exit;
+    }
+
+    /* Try to verify that the file is actually a specfile */
+    if (!isSpecFile(specFile)) {
+	rpmlog(RPMLOG_ERR,
+		_("File %s does not appear to be a specfile.\n"), specFile);
+	goto exit;
+    }
+    
+    /* Don't parse spec if only its removal is requested */
+    if (ba->buildAmount == RPMBUILD_RMSPEC) {
+	rc = unlink(specFile);
+	goto exit;
+    }
+
+    /* Parse the spec file */
+#define	_anyarch(_f)	\
+(((_f)&(RPMBUILD_PREP|RPMBUILD_BUILD|RPMBUILD_INSTALL|RPMBUILD_PACKAGEBINARY)) == 0)
+    if (parseSpec(ts, specFile, ba->rootdir, buildRootURL, 0, passPhrase,
+		cookie, _anyarch(buildAmount), ba->force))
+    {
+	goto exit;
+    }
+#undef	_anyarch
+    if ((spec = rpmtsSetSpec(ts, NULL)) == NULL) {
+	goto exit;
+    }
+
+    if ( ba->buildAmount&RPMBUILD_RMSOURCE && !(ba->buildAmount&~(RPMBUILD_RMSOURCE|RPMBUILD_RMSPEC)) ) {
+	rc = doRmSource(spec);
+	if ( rc == RPMRC_OK && ba->buildAmount&RPMBUILD_RMSPEC )
+	    rc = unlink(specFile);
+	goto exit;
+    }
+
+    /* Assemble source header from parsed components */
+    initSourceHeader(spec);
+
+    /* Check build prerequisites */
+    if (!ba->noDeps && checkSpec(ts, spec->sourceHeader)) {
+	goto exit;
+    }
+
+    if (buildSpec(ts, spec, buildAmount, ba->noBuild)) {
+	goto exit;
+    }
+    
+    if (ba->buildMode == 't')
+	(void) unlink(specFile);
+    rc = 0;
+
+exit:
+    free(specFile);
+    freeSpec(spec);
+    free(buildRootURL);
+    return rc;
+}
+
+static int build(rpmts ts, const char * arg, BTA_t ba, const char * rcfile)
+{
+    char *t, *te;
+    int rc = 0;
+    char * targets = ba->targets;
+#define	buildCleanMask	(RPMBUILD_RMSOURCE|RPMBUILD_RMSPEC)
+    int cleanFlags = ba->buildAmount & buildCleanMask;
+    rpmVSFlags vsflags, ovsflags;
+
+    vsflags = rpmExpandNumeric("%{_vsflags_build}");
+    if (ba->qva_flags & VERIFY_DIGEST)
+	vsflags |= _RPMVSF_NODIGESTS;
+    if (ba->qva_flags & VERIFY_SIGNATURE)
+	vsflags |= _RPMVSF_NOSIGNATURES;
+    if (ba->qva_flags & VERIFY_HDRCHK)
+	vsflags |= RPMVSF_NOHDRCHK;
+    ovsflags = rpmtsSetVSFlags(ts, vsflags);
+
+    if (targets == NULL) {
+	rc =  buildForTarget(ts, arg, ba);
+	goto exit;
+    }
+
+    /* parse up the build operators */
+
+    printf(_("Building target platforms: %s\n"), targets);
+
+    ba->buildAmount &= ~buildCleanMask;
+    for (t = targets; *t != '\0'; t = te) {
+	char *target;
+	if ((te = strchr(t, ',')) == NULL)
+	    te = t + strlen(t);
+	target = xmalloc(te-t+1);
+	strncpy(target, t, (te-t));
+	target[te-t] = '\0';
+	if (*te != '\0')
+	    te++;
+	else	/* XXX Perform clean-up after last target build. */
+	    ba->buildAmount |= cleanFlags;
+
+	printf(_("Building for target %s\n"), target);
+
+	/* Read in configuration for target. */
+	rpmFreeMacros(NULL);
+	rpmFreeRpmrc();
+	(void) rpmReadConfigFiles(rcfile, target);
+	free(target);
+	rc = buildForTarget(ts, arg, ba);
+	if (rc)
+	    break;
+    }
+
+exit:
+    vsflags = rpmtsSetVSFlags(ts, ovsflags);
+    /* Restore original configuration. */
+    rpmFreeMacros(NULL);
+    rpmFreeRpmrc();
+    (void) rpmReadConfigFiles(rcfile, NULL);
+
+    return rc;
+}
+
 int main(int argc, char *argv[])
 {
     rpmts ts = NULL;