libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-06 14:30:38 +08:00
Code Issues Projects Releases Wiki Activity

* dump_setup.cc (package_find): Don't stop searching on missing

Browse Source 
file list.
	(package_list): Ditto.

	* dump_setup.cc: (package_list): Make output terse unless
	verbose requested.  Fix formatting.
	(package_find): Ditto.
This commit is contained in:
Corinna Vinschen 2003-08-16 09:09:09 +00:00
parent 66745a1ea5
commit b723879025
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
winsup/utils/ChangeLog
View File

@ -1,3 +1,15 @@
2003-08-16 David Rothenberger <daveroth@acm.org>
* dump_setup.cc (package_find): Don't stop searching on missing
file list.
(package_list): Ditto.
2003-08-16 Igor Pechtchanski <pechtcha@cs.nyu.edu>
* dump_setup.cc: (package_list): Make output terse unless
verbose requested. Fix formatting.
(package_find): Ditto.
2003-08-15 Corinna Vinschen <corinna@vinschen.de> 2003-08-15 Corinna Vinschen <corinna@vinschen.de>
* cygcheck.cc (main): Fix some formatting and help text printing. * cygcheck.cc (main): Fix some formatting and help text printing.

30
winsup/utils/dump_setup.cc
View File

@ -411,21 +411,22 @@ package_list (int verbose, char **argv)
{ {
FILE *fp = open_package_list (packages[i].name); FILE *fp = open_package_list (packages[i].name);
if (!fp) if (!fp)
{ {
if (verbose) if (verbose)
printf ("Can't open file list /etc/setup/%s.lst.gz for package %s\n", printf ("Can't open file list /etc/setup/%s.lst.gz for package %s\n",
packages[i].name, packages[i].name); packages[i].name, packages[i].name);
return; 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]; char buf[MAX_PATH + 1];
while (fgets (buf, MAX_PATH, fp)) while (fgets (buf, MAX_PATH, fp))
{ {
char *lastchar = strchr(buf, '\n'); char *lastchar = strchr(buf, '\n');
if (lastchar[-1] != '/') if (lastchar[-1] != '/')
printf (" /%s", buf); printf ("%s/%s", (verbose?" ":""), buf);
} }
fclose (fp); fclose (fp);
@ -450,12 +451,7 @@ package_find (int verbose, char **argv)
{ {
FILE *fp = open_package_list (packages[i].name); FILE *fp = open_package_list (packages[i].name);
if (!fp) if (!fp)
{ continue;
if (verbose)
printf ("Can't open file list /etc/setup/%s.lst.gz for package %s\n",
packages[i].name, packages[i].name);
return;
}
char buf[MAX_PATH + 2]; char buf[MAX_PATH + 2];
buf[0] = '/'; buf[0] = '/';
@ -479,7 +475,11 @@ package_find (int verbose, char **argv)
if (!a && is_alias) if (!a && is_alias)
a = match_argv (argv, filename + 4); a = match_argv (argv, filename + 4);
if (a > 0) 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);
}
} }
} }