Glob ftswalk/arglist args always.

CVS patchset: 7481
CVS date: 2004/10/17 23:32:55

3 files changed, 17 insertions, 23 deletions

diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index 341dc804c..1384f175f 100644
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -109,14 +109,23 @@ fprintf(stderr, "*** gi %p\t%p\n", gi, gi->mi);
 	break;
     case RPMGI_ARGLIST:
     case RPMGI_FTSWALK:
-    {   ARGV_t argv = keyp;
+    {   ARGV_t pav = keyp;
+	const char * arg;
 	unsigned flags = keylen;
+	int xx;
 
-	gi->argv = argv;
+	gi->argv = xcalloc(1, sizeof(*gi->argv));
 	gi->argc = 0;
-	if (argv != NULL)
-        while (*argv++ != NULL)
-	   gi->argc++;
+	if (pav != NULL)
+	while ((arg = *pav++) != NULL) {
+	    ARGV_t av = NULL;
+	    int ac;
+
+	    xx = rpmGlob(arg, &ac, &av);
+	    xx = argvAppend(&gi->argv, av);
+	    gi->argc += ac;
+	    av = argvFree(av);
+	}
 	gi->ftsOpts = flags;
 
 if (_rpmgi_debug < 0)
diff --git a/lib/rpmgi.h b/lib/rpmgi.h
index 53a9f3f7b..61b3b819c 100644
--- a/lib/rpmgi.h
+++ b/lib/rpmgi.h
@@ -117,7 +117,7 @@ rpmgi rpmgiFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmgi gi)
  * @return		new general iterator
  */
 /*@only@*/
-rpmgi rpmgiNew(rpmts ts, int tag, /*@only@*/ void *const keyp, size_t keylen)
+rpmgi rpmgiNew(rpmts ts, int tag, void *const keyp, size_t keylen)
 	/*@*/;
 
 const char * rpmgiNext(/*@null@*/ rpmgi gi)
diff --git a/lib/tgi.c b/lib/tgi.c
index d169ff912..167960220 100644
--- a/lib/tgi.c
+++ b/lib/tgi.c
@@ -67,12 +67,10 @@ main(int argc, char *const argv[])
     rpmts ts = NULL;
     rpmVSFlags vsflags;
     rpmgi gi = NULL;
-    const char ** pav;
+    const char ** av;
     const char * arg;
-    ARGV_t av;
     int ac;
     int rc = 0;
-    int xx;
 
     optCon = rpmcliInit(argc, argv, optionsTable);
     if (optCon == NULL)
@@ -95,20 +93,7 @@ main(int argc, char *const argv[])
 	(void) rpmtsSetTid(ts, tid);
     }
 
-    pav = poptGetArgs(optCon);
-
-    /* Glob all args and concatenate. */
-    av = xcalloc(1, sizeof(*av));
-    if (pav != NULL)
-    while ((arg = *pav++) != NULL) {
-	ARGV_t aav;
-	int aac;
-	aav = NULL;
-	xx = rpmGlob(arg, &aac, &aav);
-	xx = argvAppend(&av, aav);
-	aav = argvFree(aav);
-    }
-
+    av = poptGetArgs(optCon);
     gi = rpmgiNew(ts, gitag, av, ftsOpts);
     (void) rpmgiSetQueryFormat(gi, queryFormat);