Imported Upstream version 4.14.1

[platform/upstream/rpm.git] / tools / rpmdeps.c

diff --git a/tools/rpmdeps.c b/tools/rpmdeps.c
index c3112eb..f260a38 100644 (file)
--- a/tools/rpmdeps.c
+++ b/tools/rpmdeps.c
@@ -1,5 +1,4 @@
 #include "system.h"
-const char *__progname;
 
 #include <rpm/rpmbuild.h>
 #include <rpm/argv.h>
@@ -8,12 +7,24 @@ const char *__progname;
 
 #include "debug.h"
 
-char *progname;
-
 static int print_provides;
 
 static int print_requires;
 
+static int print_recommends;
+
+static int print_suggests;
+
+static int print_supplements;
+
+static int print_enhances;
+
+static int print_conflicts;
+
+static int print_obsoletes;
+
+static int print_alldeps;
+
 static void rpmdsPrint(const char * msg, rpmds ds, FILE * fp)
 {
     if (fp == NULL) fp = stderr;
@@ -36,6 +47,20 @@ static struct poptOption optionsTable[] = {
         NULL, NULL },
  { "requires", 'R', POPT_ARG_VAL, &print_requires, -1,
         NULL, NULL },
+ { "recommends", '\0', POPT_ARG_VAL, &print_recommends, -1,
+        NULL, NULL },
+ { "suggests", '\0', POPT_ARG_VAL, &print_suggests, -1,
+        NULL, NULL },
+ { "supplements", '\0', POPT_ARG_VAL, &print_supplements, -1,
+        NULL, NULL },
+ { "enhances", '\0', POPT_ARG_VAL, &print_enhances, -1,
+        NULL, NULL },
+ { "conflicts", '\0', POPT_ARG_VAL, &print_conflicts, -1,
+        NULL, NULL },
+ { "obsoletes", '\0', POPT_ARG_VAL, &print_obsoletes, -1,
+        NULL, NULL },
+ { "alldeps", '\0', POPT_ARG_VAL, &print_alldeps, -1,
+        NULL, NULL },
 
    POPT_AUTOALIAS
    POPT_AUTOHELP
@@ -51,10 +76,7 @@ main(int argc, char *argv[])
     int ec = 1;
     char buf[BUFSIZ];
 
-    if ((progname = strrchr(argv[0], '/')) != NULL)
-       progname++;
-    else
-       progname = argv[0];
+    xsetprogname(argv[0]); /* Portability call -- see system.h */
 
     optCon = rpmcliInit(argc, argv, optionsTable);
     if (optCon == NULL)
@@ -82,13 +104,27 @@ main(int argc, char *argv[])
     if (rpmfcClassify(fc, av, NULL) || rpmfcApply(fc))
        goto exit;
 
-    if (_rpmfc_debug)
-       rpmfcPrint(buf, fc, NULL);
-
-    if (print_provides)
-       rpmdsPrint(NULL, rpmfcProvides(fc), stdout);
-    if (print_requires)
-       rpmdsPrint(NULL, rpmfcRequires(fc), stdout);
+    if (print_alldeps || _rpmfc_debug)
+       rpmfcPrint(NULL, fc, print_alldeps ? stdout : NULL);
+
+    if (!print_alldeps) {
+       if (print_provides)
+           rpmdsPrint(NULL, rpmfcProvides(fc), stdout);
+       if (print_requires)
+           rpmdsPrint(NULL, rpmfcRequires(fc), stdout);
+       if (print_recommends)
+           rpmdsPrint(NULL, rpmfcRecommends(fc), stdout);
+       if (print_suggests)
+           rpmdsPrint(NULL, rpmfcSuggests(fc), stdout);
+       if (print_supplements)
+           rpmdsPrint(NULL, rpmfcSupplements(fc), stdout);
+       if (print_enhances)
+           rpmdsPrint(NULL, rpmfcEnhances(fc), stdout);
+       if (print_conflicts)
+           rpmdsPrint(NULL, rpmfcConflicts(fc), stdout);
+       if (print_obsoletes)
+           rpmdsPrint(NULL, rpmfcObsoletes(fc), stdout);
+    }
 
     ec = 0;