diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-11-11 09:16:18 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-11-11 09:16:18 +0300 |
| commit | da9e28d0fafc3f861e1f6626d772a8445a9094ab (patch) | |
| tree | d39c328628f91a57c9a86f879010ddf8ef11110b | |
| parent | d0d517913c0c66166bd895f0d14b79260eeb69bb (diff) | |
* cygcheck.cc (main): Display package info when '-s' is specified.
* dump_setup.cc (dump_setup): Change header. Remove typo. Always sort
packages output.
| -rw-r--r-- | winsup/utils/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/utils/cygcheck.cc | 9 | ||||
| -rw-r--r-- | winsup/utils/dump_setup.cc | 8 |
3 files changed, 17 insertions, 6 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 7aa807b86..79cbc0756 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,5 +1,11 @@ 2001-11-11 Christopher Faylor <cgf@redhat.com> + * cygcheck.cc (main): Display package info when '-s' is specified. + * dump_setup.cc (dump_setup): Change header. Remove typo. Always sort + packages output. + +2001-11-11 Christopher Faylor <cgf@redhat.com> + * dump_setup.cc: New file. * Makefile.in: Add info for dump_setup.o. * cygcheck.cc (main): Recognize '-c' option for checking setup diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index e9e800204..31d325f8e 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -1281,7 +1281,14 @@ main (int argc, char **argv) } if (sysinfo) - dump_sysinfo (); + { + dump_sysinfo (); + if (!check_setup) + { + dump_setup (verbose, NULL); + puts (""); + } + } if (!givehelp) printf ("Use -h to see help about each section\n"); diff --git a/winsup/utils/dump_setup.cc b/winsup/utils/dump_setup.cc index ac0fceed1..eacdc50de 100644 --- a/winsup/utils/dump_setup.cc +++ b/winsup/utils/dump_setup.cc @@ -166,7 +166,7 @@ compar (const void *a, const void *b) bool match_argv (char **argv, const char *name) { - if (!*argv) + if (!argv || !*argv) return true; for (char **a = argv; *a; a++) if (strcasecmp (*a, name) == 0) @@ -179,7 +179,7 @@ dump_setup (int verbose, char **argv) { char *setup = cygpath ("/etc/setup/installed.db", NULL); FILE *fp = fopen (setup, "rt"); - puts ("Cygwin Setup information"); + puts ("Cygwin Package Information"); if (fp == NULL) goto err; if (verbose) @@ -188,7 +188,6 @@ dump_setup (int verbose, char **argv) if (dump_file ("Last downloaded files from: ", "last-mirror") || need_nl) puts (""); } - if (!*argv) if (!fp) goto err; @@ -233,8 +232,7 @@ dump_setup (int verbose, char **argv) } } - if (!argv) - qsort (packages, n, sizeof (packages[0]), compar); + qsort (packages, n, sizeof (packages[0]), compar); for (int i = 0; i < n; i++) printf ("%-*s%-*s\n", package_len, packages[i].name, |