Index: dump_setup.cc
===================================================================
RCS file: /cvs/src/src/winsup/utils/dump_setup.cc,v
retrieving revision 1.10
diff -u -p -r1.10 dump_setup.cc
--- dump_setup.cc	15 Aug 2003 20:26:11 -0000	1.10
+++ dump_setup.cc	16 Aug 2003 04:21:49 -0000
@@ -276,6 +276,12 @@ check_package_files (int verbose, char *
   while (fgets (buf, MAX_PATH, fp))
     {
       char *filename = strtok(buf, "\n");
+
+      if (*filename == '/')
+        ++filename;
+      else if (!strncmp (filename, "./", 2))
+        filename += 2;
+
       if (filename[strlen (filename) - 1] == '/')
         {
           if (!directory_exists (verbose, filename, package))
@@ -411,21 +417,22 @@ package_list (int verbose, char **argv)
     {
       FILE *fp = open_package_list (packages[i].name);
       if (!fp)
-      {
-	if (verbose)
-	  printf ("Can't open file list /etc/setup/%s.lst.gz for package %s\n",
-	      packages[i].name, packages[i].name);
-	return;
-      }
+	{
+	  if (verbose)
+	    printf ("Can't open file list /etc/setup/%s.lst.gz for package %s\n",
+		packages[i].name, packages[i].name);
+	  continue;
+	}
 
-      printf ("Package: %s-%s\n", packages[i].name, packages[i].ver);
+      if (verbose)
+	printf ("Package: %s-%s\n", packages[i].name, packages[i].ver);
 
       char buf[MAX_PATH + 1];
       while (fgets (buf, MAX_PATH, fp))
 	{
 	  char *lastchar = strchr(buf, '\n');
 	  if (lastchar[-1] != '/')
-	    printf ("    /%s", buf);
+	    printf ("%s/%s", (verbose?"    ":""), buf);
 	}
 
       fclose (fp);
@@ -450,12 +457,7 @@ package_find (int verbose, char **argv)
     {
       FILE *fp = open_package_list (packages[i].name);
       if (!fp)
-      {
-	if (verbose)
-	  printf ("Can't open file list /etc/setup/%s.lst.gz for package %s\n",
-	      packages[i].name, packages[i].name);
-	return;
-      }
+	continue;
 
       char buf[MAX_PATH + 2];
       buf[0] = '/';
@@ -479,7 +481,11 @@ package_find (int verbose, char **argv)
 	      if (!a && is_alias)
 		a = match_argv (argv, filename + 4);
 	      if (a > 0)
-		printf ("%s-%s\n", packages[i].name, packages[i].ver);
+		{
+		  if (verbose)
+		    printf ("%s: found in package ", filename);
+		  printf ("%s-%s\n", packages[i].name, packages[i].ver);
+		}
 	    }
 	}