Handle config.guess and config.sub with DOS EOLs

[platform/upstream/rpm.git] / rpmspec.c

diff --git a/rpmspec.c b/rpmspec.c
index 1e06a27..86e3285 100644 (file)
--- a/rpmspec.c
+++ b/rpmspec.c
@@ -1,5 +1,4 @@
 #include "system.h"
-const char *__progname;
 
 #include <rpm/rpmcli.h>
 #include <rpm/rpmbuild.h>
@@ -13,6 +12,7 @@ const char *__progname;
 enum modes {
     MODE_UNKNOWN       = 0,
     MODE_QUERY         = (1 <<  0),
+    MODE_PARSE         = (1 <<  1),
 };
 
 static int mode = MODE_UNKNOWN;
@@ -21,14 +21,16 @@ const char *target = NULL;
 char *queryformat = NULL;
 
 static struct poptOption specOptsTable[] = {
+    { "parse", 'P', POPT_ARG_VAL, &mode, MODE_PARSE,
+       N_("parse spec file(s) to stdout"), NULL },
     { "query", 'q', POPT_ARG_VAL, &mode, MODE_QUERY,
        N_("query spec file(s)"), NULL },
     { "rpms", 0, POPT_ARG_VAL, &source, RPMQV_SPECRPMS,
        N_("operate on binary rpms generated by spec (default)"), NULL },
+    { "builtrpms", 0, POPT_ARG_VAL, &source, RPMQV_SPECBUILTRPMS,
+       N_("operate on binary rpms that would be built from spec"), NULL },
     { "srpm", 0, POPT_ARG_VAL, &source, RPMQV_SPECSRPM,
        N_("operate on source rpm generated by spec"), NULL },
-    { "target", 0, POPT_ARG_STRING, &target, 0,
-       N_("override target platform"), NULL },
     { "queryformat", 0, POPT_ARG_STRING, &queryformat, 0,
        N_("use the following query format"), "QUERYFORMAT" },
     { "qf", 0, (POPT_ARG_STRING | POPT_ARGFLAG_DOC_HIDDEN), &queryformat, 0,
@@ -57,6 +59,8 @@ int main(int argc, char *argv[])
     poptContext optCon;
     int ec = 0;
 
+    xsetprogname(argv[0]); /* Portability call -- see system.h */
+
     optCon = rpmcliInit(argc, argv, optionsTable);
 
     if (rpmcliPipeOutput && initPipe())
@@ -81,6 +85,23 @@ int main(int argc, char *argv[])
        ec = rpmcliQuery(ts, qva, (ARGV_const_t) poptGetArgs(optCon));
        break;
 
+    case MODE_PARSE: {
+       const char * spath;
+       if (!poptPeekArg(optCon))
+           argerror(_("no arguments given for parse"));
+
+       while ((spath = poptGetArg(optCon)) != NULL) {
+           rpmSpec spec = rpmSpecParse(spath, (RPMSPEC_ANYARCH|RPMSPEC_FORCE), NULL);
+           if (spec == NULL) {
+               ec++;
+               continue;
+           }
+           fprintf(stdout, "%s", rpmSpecGetSection(spec, RPMBUILD_NONE));
+           rpmSpecFree(spec);
+       }
+       break;
+    }
+
     case MODE_UNKNOWN:
        if (poptPeekArg(optCon) != NULL || argc <= 1 || rpmIsVerbose()) {
            printUsage(optCon, stderr, 0);
@@ -90,7 +111,8 @@ int main(int argc, char *argv[])
     }
 
     rpmtsFree(ts);
-    finishPipe();
+    if (finishPipe())
+       ec = EXIT_FAILURE;
 
     free(qva->qva_queryFormat);