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

* cygcheck.cc (main): don't imply -d from -s option to cygcheck

This commit is contained in:
Corinna Vinschen 2011-01-10 12:51:02 +00:00
parent 1991358fe5
commit 0a18555e4f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/utils/ChangeLog
View File

@ -1,3 +1,7 @@
2011-01-10 Jon TURNEY <jon.turney@dronecode.org.uk>
* cygcheck.cc (main): don't imply -d from -s option to cygcheck
2010-12-11 Corinna Vinschen <corinna@vinschen.de>
* setfacl.c (strchrnul): New function.

6
winsup/utils/cygcheck.cc
View File

@ -2180,7 +2180,7 @@ At least one command option or a PROGRAM is required, as shown above.\n\
-c, --check-setup show installed version of PACKAGE and verify integrity\n\
(or for all installed packages if none specified)\n\
-d, --dump-only just list packages, do not verify (with -c)\n\
-s, --sysinfo produce diagnostic system information (implies -c -d)\n\
-s, --sysinfo produce diagnostic system information (implies -c)\n\
-r, --registry also scan registry for Cygwin settings (with -s)\n\
-k, --keycheck perform a keyboard check session (must be run from a\n\
plain console only, not from a pty/rxvt/xterm)\n\
@ -2406,7 +2406,7 @@ main (int argc, char **argv)
&& unique_object_name_opt)
usage (stderr, 1);
if (dump_only && !check_setup)
if (dump_only && !check_setup && !sysinfo)
usage (stderr, 1);
if (find_package + list_package + grep_packages > 1)
@ -2454,7 +2454,7 @@ main (int argc, char **argv)
if (!check_setup)
{
puts ("");
dump_setup (verbose, NULL, false);
dump_setup (verbose, NULL, !dump_only);
}
if (!givehelp)