Merge "allow rpm to custom systemd installation" into tizen

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

diff --git a/rpmspec.c b/rpmspec.c
index ecc4434..2027ffa 100644 (file)
--- a/rpmspec.c
+++ b/rpmspec.c
@@ -13,6 +13,7 @@ const char *__progname;
 enum modes {
     MODE_UNKNOWN       = 0,
     MODE_QUERY         = (1 <<  0),
+    MODE_PARSE         = (1 <<  1),
 };
 
 static int mode = MODE_UNKNOWN;
@@ -20,8 +21,9 @@ static int source = RPMQV_SPECRPMS;
 const char *target = NULL;
 char *queryformat = NULL;
 
-/* the structure describing the options we take and the defaults */
-static struct poptOption optionsTable[] = {
+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,
@@ -34,6 +36,13 @@ static struct poptOption optionsTable[] = {
        N_("use the following query format"), "QUERYFORMAT" },
     { "qf", 0, (POPT_ARG_STRING | POPT_ARGFLAG_DOC_HIDDEN), &queryformat, 0,
        NULL, NULL },
+    POPT_TABLEEND
+};
+
+/* the structure describing the options we take and the defaults */
+static struct poptOption optionsTable[] = {
+    { NULL, '\0', POPT_ARG_INCLUDE_TABLE, specOptsTable, 0,
+       N_("Spec options:"), NULL },
 
     { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0,
        N_("Common options for all rpm modes and executables:"), NULL },
@@ -75,6 +84,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);
@@ -83,10 +109,11 @@ int main(int argc, char *argv[])
        break;
     }
 
-    ts = rpmtsFree(ts);
-    finishPipe();
+    rpmtsFree(ts);
+    if (finishPipe())
+       ec = EXIT_FAILURE;
 
-    qva->qva_queryFormat = _free(qva->qva_queryFormat);
+    free(qva->qva_queryFormat);
 
     rpmcliFini(optCon);