From eceb45bdff22351e8880b9350df51fe07354d358 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 7 Feb 2003 21:11:44 +0000 Subject: [PATCH] * dump_setup.cc (dump_setup): Compute the longest package name and align columns properly. --- winsup/utils/ChangeLog | 5 +++++ winsup/utils/dump_setup.cc | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 236f44d8f..ec98c1bd5 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,8 @@ +2003-02-07 Igor Pechtchanski + + * dump_setup.cc (dump_setup): Compute the longest package name + and align columns properly. + 2003-02-06 Christopher Faylor * cygcheck.cc (common_apps): Add some more apps. diff --git a/winsup/utils/dump_setup.cc b/winsup/utils/dump_setup.cc index d551098b9..0cac2b129 100644 --- a/winsup/utils/dump_setup.cc +++ b/winsup/utils/dump_setup.cc @@ -204,7 +204,6 @@ dump_setup (int verbose, char **argv, bool /*check_files*/) pkgver *packages; packages = (pkgver *) calloc (nlines, sizeof(packages[0])); - printf ("%-*s%-*s\n", package_len, "Package", version_len, "Version"); int n; 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); if (f.what[0]) 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); + int ver_len = strlen(packages[n].ver); + if (version_len < ver_len+1) + version_len = ver_len+1; n++; if (strtok (NULL, " ") == NULL) break; @@ -234,6 +239,7 @@ dump_setup (int verbose, char **argv, bool /*check_files*/) qsort (packages, n, sizeof (packages[0]), compar); + printf ("%-*s%-*s\n", package_len, "Package", version_len, "Version"); for (int i = 0; i < n; i++) printf ("%-*s%-*s\n", package_len, packages[i].name, version_len, packages[i].ver);