From 812468916a676676ebd948bbc4a645f05f6e7c1f Mon Sep 17 00:00:00 2001
From: ewt <devnull@localhost>
Date: Sat, 8 Jun 1996 17:27:10 +0000
Subject: [PATCH] added dependency querying

CVS patchset: 623
CVS date: 1996/06/08 17:27:10
---
 query.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++----------
 query.h |  1 +
 2 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/query.c b/query.c
index ec76e4a..e980023 100644
--- a/query.c
+++ b/query.c
@@ -16,9 +16,11 @@
 #include "query.h"
 
 static void printHeader(Header h, int queryFlags, char * queryFormat);
-static void queryHeader(Header h, const char * incomingFormat);
+static const char * queryHeader(Header h, const char * incomingFormat, 
+				int arrayNum);
 static void escapedChar(char ch);
-static const char * handleFormat(Header h, const char * chptr);
+static const char * handleFormat(Header h, const char * chptr, 
+				 const int arrayNum);
 static void showMatches(rpmdb db, dbIndexSet matches, int queryFlags, 
 			char * queryFormat);
 static int findMatches(rpmdb db, char * name, char * version, char * release,
@@ -36,34 +38,38 @@ static char * defaultQueryFormat =
 	    "Install date: %-27{-INSTALLTIME}   Build Host: %{BUILDHOST}\n"
 	    "Group       : %-27{GROUP}   Source RPM: %{SOURCERPM}\n"
 	    "Size        : %{SIZE}\n"
+	    "Provides    : %{PROVIDES}\n"
 	    "Description : %{DESCRIPTION}\n";
 
-static void queryHeader(Header h, const char * chptr) {
+static const char * queryHeader(Header h, const char * chptr, int arrayNum) {
     while (chptr && *chptr) {
 	switch (*chptr) {
 	  case '\\':
 	    chptr++;
-	    if (!*chptr) return;
+	    if (!*chptr) return NULL;
 	    escapedChar(*chptr++);
 	    break;
 
 	  case '%':
 	    chptr++;
-	    if (!*chptr) return;
+	    if (!*chptr) return NULL;
 	    if (*chptr == '%') {
 		putchar('%');
 		chptr++;
 	    }
-	    chptr = handleFormat(h, chptr);
+	    chptr = handleFormat(h, chptr, 0);
 	    break;
 
 	  default:
 	    putchar(*chptr++);
 	}
     }
+
+    return chptr;
 }
 
-static const char * handleFormat(Header h, const char * chptr) {
+static const char * handleFormat(Header h, const char * chptr, 
+				 const int arrayNum) {
     const char * f = chptr;
     const char * tagptr;
     char format[20];
@@ -71,6 +77,7 @@ static const char * handleFormat(Header h, const char * chptr) {
     char tag[100];
     const struct rpmTagTableEntry * t;
     void * p;
+    char ** strarray;
     int type, count;
     int isDate = 0;
     time_t dateint;
@@ -120,16 +127,26 @@ static const char * handleFormat(Header h, const char * chptr) {
     }
  
     if (!getEntry(h, t->val, &type, &p, &count) || !p) {
-	p = "(unknown)";
+	p = "(none)";
 	count = 1;
 	type = STRING_TYPE;
-    } else if (count > 1 || type == STRING_ARRAY_TYPE) {
+    } else if (count > 1 && (type != STRING_ARRAY_TYPE)) {
 	p = "(array)";
 	count = 1;
 	type = STRING_TYPE;
     }
 
     switch (type) {
+      case STRING_ARRAY_TYPE:
+	strcat(format, "s ");
+
+	/* now use this format for each string, with a space in between */
+	strarray = p;
+	while (count--) {
+	    printf(format, *strarray++);
+	}
+	break;
+
       case STRING_TYPE:
 	strcat(format, "s");
 	printf(format, p);
@@ -175,6 +192,7 @@ static void printHeader(Header h, int queryFlags, char * queryFormat) {
     char * name, * version, * release;
     int_32 count, type;
     char * prefix = NULL;
+    char ** requiresList, ** strlist;
     char ** fileList;
     char * fileStatesList;
     char ** fileOwnerList, ** fileGroupList;
@@ -197,7 +215,25 @@ static void printHeader(Header h, int queryFlags, char * queryFormat) {
 		queryFormat = defaultQueryFormat;
 	    } 
 
-	    queryHeader(h, queryFormat);
+	    queryHeader(h, queryFormat, -1);
+	}
+
+	if (queryFlags & QUERY_FOR_DEPS) {
+	    printf("Requires    : ");
+	    if (!getEntry(h, RPMTAG_REQUIRENAME, &type, 
+		 (void **) &requiresList, &count) || !count) {
+		puts("(nothing)");
+	    } else {
+		char * indent = "";
+
+		strlist = requiresList;
+
+	        while (count--) {
+		    printf("%s%s\n", indent, *strlist++);
+		    indent = "              ";
+		}
+		free(requiresList);
+	    }
 	}
 
 	if (queryFlags & QUERY_FOR_LIST) {
diff --git a/query.h b/query.h
index a38dc0b..0dd3857 100644
--- a/query.h
+++ b/query.h
@@ -14,6 +14,7 @@ enum querysources { QUERY_PATH, QUERY_PACKAGE, QUERY_ALL, QUERY_SPATH,
 #define QUERY_FOR_CONFIG	(1 << 4)
 #define QUERY_FOR_SCRIPTS	(1 << 5)
 #define QUERY_BY_NUMBER         (1 << 6)
+#define QUERY_FOR_DEPS          (1 << 7)
 
 int doQuery(char * prefix, enum querysources source, int queryFlags, 
 	     char * arg, char * queryFormat);
-- 
2.7.4