JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* dump_setup.cc (dump_setup): Compute the longest package name

Browse Source 
and align columns properly.
This commit is contained in:
Corinna Vinschen 2003-02-07 21:11:44 +00:00
parent 4a41db9e74
commit eceb45bdff
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@ -1,3 +1,8 @@
2003-02-07 Igor Pechtchanski <pechtcha@cs.nyu.edu>
* dump_setup.cc (dump_setup): Compute the longest package name
and align columns properly.
2003-02-06 Christopher Faylor <cgf@redhat.com> 2003-02-06 Christopher Faylor <cgf@redhat.com>
* cygcheck.cc (common_apps): Add some more apps. * cygcheck.cc (common_apps): Add some more apps.

8
winsup/utils/dump_setup.cc
View File

@ -204,7 +204,6 @@ dump_setup (int verbose, char **argv, bool /*check_files*/)
pkgver *packages; pkgver *packages;
packages = (pkgver *) calloc (nlines, sizeof(packages[0])); packages = (pkgver *) calloc (nlines, sizeof(packages[0]));
printf ("%-*s%-*s\n", package_len, "Package", version_len, "Version");
int n; int n;
for (n = 0; fgets (buf, 4096, fp) && n < nlines;) for (n = 0; fgets (buf, 4096, fp) && n < nlines;)
{ {
@ -225,7 +224,13 @@ dump_setup (int verbose, char **argv, bool /*check_files*/)
strcpy (packages[n].name , package); strcpy (packages[n].name , package);
if (f.what[0]) if (f.what[0])
strcat (strcat (packages[n].name, "-"), f.what); strcat (strcat (packages[n].name, "-"), f.what);
int pkg_len = strlen(packages[n].name);
if (package_len < pkg_len+1)
package_len = pkg_len+1;
packages[n].ver = strdup (f.ver); packages[n].ver = strdup (f.ver);
int ver_len = strlen(packages[n].ver);
if (version_len < ver_len+1)
version_len = ver_len+1;
n++; n++;
if (strtok (NULL, " ") == NULL) if (strtok (NULL, " ") == NULL)
break; break;
@ -234,6 +239,7 @@ dump_setup (int verbose, char **argv, bool /*check_files*/)
qsort (packages, n, sizeof (packages[0]), compar); qsort (packages, n, sizeof (packages[0]), compar);
printf ("%-*s%-*s\n", package_len, "Package", version_len, "Version");
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
printf ("%-*s%-*s\n", package_len, packages[i].name, printf ("%-*s%-*s\n", package_len, packages[i].name,
version_len, packages[i].ver); version_len, packages[i].ver);