lib/rpminstall.c: Perform glob on remote ftp install args.

lib/misc.[ch]: Rename remoteGlob to rpmGlob. Preserve glob_error behavior.
build/files.c: Ditto.
lib/rpmio.c: Collapse ftpFileDesc() into ftpReq().
lib/rpmio.c: Eliminate all uses of u->path.
lib/url.c: Ditto.
lib/url.c: Tweak url cache code to reuse empty slots (never happens).

CVS patchset: 3478
CVS date: 1999/12/12 17:46:22

1 files changed, 41 insertions, 41 deletions

diff --git a/lib/query.c b/lib/query.c
index 91ee65e8f..5e06fdfdb 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -454,61 +454,61 @@ int rpmQueryVerify(QVA_t *qva, enum rpmQVSources source, const char * arg,
     int retcode = 0;
     char *end = NULL;
 
-  switch (source) {
+    switch (source) {
     case RPMQV_RPM:
-    { int argc = 0;
-      const char ** argv = NULL;
-      int i;
+    {	int argc = 0;
+	const char ** argv = NULL;
+	int i;
 
-      rc = remoteGlob(arg, &argc, &argv);
-      if (rc)
-	return 1;
-      for (i = 0; i < argc; i++) {
-	FD_t fd;
-	fd = Fopen(argv[i], "r.ufdio");
-	if (Ferror(fd)) {
-	    /* XXX Fstrerror */
-	    fprintf(stderr, _("open of %s failed: %s\n"), argv[i],
+	rc = rpmGlob(arg, &argc, &argv);
+	if (rc)
+	    return 1;
+	for (i = 0; i < argc; i++) {
+	    FD_t fd;
+	    fd = Fopen(argv[i], "r.ufdio");
+	    if (Ferror(fd)) {
+		/* XXX Fstrerror */
+		fprintf(stderr, _("open of %s failed: %s\n"), argv[i],
 #ifndef	NOTYET
 			urlStrerror(argv[i]));
 #else
 			Fstrerror(fd));
 #endif
-	    if (fd)
-		Fclose(fd);
-	    retcode = 1;
-	    break;
-	}
+		if (fd) Fclose(fd);
+		retcode = 1;
+		break;
+	    }
 
-	retcode = rpmReadPackageHeader(fd, &h, &isSource, NULL, NULL);
+	    retcode = rpmReadPackageHeader(fd, &h, &isSource, NULL, NULL);
 
-	Fclose(fd);
+	    Fclose(fd);
 
-	switch (retcode) {
-	case 0:
-	    if (h == NULL) {
-		fprintf(stderr, _("old format source packages cannot "
+	    switch (retcode) {
+	    case 0:
+		if (h == NULL) {
+		    fprintf(stderr, _("old format source packages cannot "
 			"be queried\n"));
+		    retcode = 1;
+		    break;
+		}
+		retcode = showPackage(qva, db, h);
+		headerFree(h);
+		break;
+	    case 1:
+		fprintf(stderr, _("%s does not appear to be a RPM package\n"),
+				argv[i]);
+		/*@fallthrough@*/
+	    case 2:
+		fprintf(stderr, _("query of %s failed\n"), argv[i]);
 		retcode = 1;
 		break;
 	    }
-	    retcode = showPackage(qva, db, h);
-	    headerFree(h);
-	    break;
-	case 1:
-	    fprintf(stderr, _("%s does not appear to be a RPM package\n"), argv[i]);
-	    /*@fallthrough@*/
-	case 2:
-	    fprintf(stderr, _("query of %s failed\n"), argv[i]);
-	    retcode = 1;
-	    break;
 	}
-      }
-      if (argv) {
-	for (i = 0; i < argc; i++)
-	    xfree(argv[i]);
-	xfree(argv);
-      }
+	if (argv) {
+	    for (i = 0; i < argc; i++)
+		xfree(argv[i]);
+	    xfree(argv);
+	}
     }	break;
 
     case RPMQV_SPECFILE:
@@ -658,7 +658,7 @@ int rpmQueryVerify(QVA_t *qva, enum rpmQVSources source, const char * arg,
 	    dbiFreeIndexRecord(matches);
 	}
 	break;
-  }
+    }
    
     return retcode;
 }