diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 68ac59fd9..3c9b1bfa2 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,20 @@ +2003-04-26 Joshua Daniel Franklin + + * cygcheck.cc (usage) Add description output. + * cygpath.cc (usage) Add description output. + * dumper.cc (usage) Add newline to description output. + * kill.cc (usage) Add description output. + * mkgroup.c (usage) Grammatical change to description output. + * mkpasswd.c (usage) Grammatical change to description output. + * mount.cc (usage) Add description output. + * passwd.c (usage) Add description output. + * ps.cc (usage) Add description output. + * regtool.cc (usage) Add description output. + * setfacl.c (usage) Remove extra newline from description output. + * ssp.c (usage) Add description output. + * strace.cc (usage) Add description output. + * umount.cc (usage) Add description output. + 2003-04-10 Pierre Humblet * mkpasswd.c (current_user): print uid and gid as unsigned. diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index 090d077a1..34522d50d 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -1314,7 +1314,9 @@ static void usage (FILE * stream, int status) { fprintf (stream, "\ -Usage: cygcheck [OPTIONS] [program ...]\n\ +Usage: cygcheck [OPTIONS] [PROGRAM...]\n\ +Check system information or PROGRAM library dependencies\n\ +\n\ -c, --check-setup check packages installed via setup.exe\n\ -s, --sysinfo system information (not with -k)\n\ -v, --verbose verbose output (indented) (for -s or programs)\n\ diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc index c78404a95..74f3f660b 100644 --- a/winsup/utils/cygpath.cc +++ b/winsup/utils/cygpath.cc @@ -65,6 +65,8 @@ usage (FILE * stream, int status) fprintf (stream, "\ Usage: %s (-d|-m|-u|-w|-t TYPE) [-c HANDLE] [-f FILE] [options] NAME\n\ %s [-ADHPSW] \n\ +Convert Unix and Windows format paths, or output system path information\n\ +\n\ Output type options:\n\ -d, --dos print DOS (short) form of NAME (C:\\PROGRA~1\\)\n\ -m, --mixed like --windows, but with regular slashes (C:/WINNT)\n\ diff --git a/winsup/utils/dumper.cc b/winsup/utils/dumper.cc index b898ebdbd..5a9beec93 100644 --- a/winsup/utils/dumper.cc +++ b/winsup/utils/dumper.cc @@ -777,6 +777,7 @@ usage (FILE *stream, int status) fprintf (stream, "\ Usage: dumper [OPTION] FILENAME WIN32PID\n\ Dump core from WIN32PID to FILENAME.core\n\ +\n\ -d, --verbose be verbose while dumping\n\ -h, --help output help information and exit\n\ -q, --quiet be quiet while dumping (default)\n\ diff --git a/winsup/utils/kill.cc b/winsup/utils/kill.cc index 4313ac677..b0a2e1f65 100644 --- a/winsup/utils/kill.cc +++ b/winsup/utils/kill.cc @@ -41,6 +41,8 @@ usage (FILE *where = stderr) fprintf (where , "" "Usage: %s [-f] [-signal] [-s signal] pid1 [pid2 ...]\n" " %s -l [signal]\n" + "Send signals to processes\n" + "\n" " -f, --force force, using win32 interface if necessary\n" " -l, --list print a list of signal names\n" " -s, --signal send signal (use %s --list for a list)\n" diff --git a/winsup/utils/mkgroup.c b/winsup/utils/mkgroup.c index 634ca2280..c9de68390 100644 --- a/winsup/utils/mkgroup.c +++ b/winsup/utils/mkgroup.c @@ -481,8 +481,8 @@ current_group (int print_sids, int print_users, int id_offset) int usage (FILE * stream, int isNT) { - fprintf (stream, "Usage: mkgroup [OPTION]... [domain]...\n\n" - "This program prints a /etc/group file to stdout\n\n" + fprintf (stream, "Usage: mkgroup [OPTION]... [domain]...\n" + "Print /etc/group file to stdout\n\n" "Options:\n"); if (isNT) fprintf (stream, " -l,--local print local group information\n" diff --git a/winsup/utils/mkpasswd.c b/winsup/utils/mkpasswd.c index 0e8f02835..111d24b51 100644 --- a/winsup/utils/mkpasswd.c +++ b/winsup/utils/mkpasswd.c @@ -485,7 +485,7 @@ int usage (FILE * stream, int isNT) { fprintf (stream, "Usage: mkpasswd [OPTION]... [domain]...\n\n" - "This program prints a /etc/passwd file to stdout\n\n" + "Print /etc/passwd file to stdout\n\n" "Options:\n"); if (isNT) fprintf (stream, " -l,--local print local user accounts\n" diff --git a/winsup/utils/mount.cc b/winsup/utils/mount.cc index d4852e50f..62509c5cc 100644 --- a/winsup/utils/mount.cc +++ b/winsup/utils/mount.cc @@ -134,6 +134,8 @@ static void usage (FILE *where = stderr) { fprintf (where, "Usage: %s [OPTION] [ ]\n\ +Display information about mounted filesystems, or mount a filesystem\n\ +\n\ -b, --binary (default) text files are equivalent to binary files\n\ (newline = \\n)\n\ -c, --change-cygdrive-prefix change the cygdrive path prefix to \n\ diff --git a/winsup/utils/passwd.c b/winsup/utils/passwd.c index dc1aa0073..2251290a9 100644 --- a/winsup/utils/passwd.c +++ b/winsup/utils/passwd.c @@ -243,6 +243,7 @@ usage (FILE * stream, int status) fprintf (stream, "" "Usage: %s (-l|-u|-S) [USER]\n" " %s [-i NUM] [-n MINDAYS] [-x MAXDAYS] [-L LEN]\n" + "Change USER's password or password attributes\n" "\n" "User operations:\n" " -l, --lock lock USER's account\n" diff --git a/winsup/utils/ps.cc b/winsup/utils/ps.cc index 8714895ad..b6307fd33 100644 --- a/winsup/utils/ps.cc +++ b/winsup/utils/ps.cc @@ -201,6 +201,8 @@ usage (FILE * stream, int status) { fprintf (stream, "\ Usage: %s [-aefls] [-u UID]\n\ +Report process status\n\ +\n\ -a, --all show processes of all users\n\ -e, --everyone show processes of all users\n\ -f, --full show process uids, ppids\n\ diff --git a/winsup/utils/regtool.cc b/winsup/utils/regtool.cc index 74a76922e..2a94c98c0 100644 --- a/winsup/utils/regtool.cc +++ b/winsup/utils/regtool.cc @@ -63,6 +63,7 @@ usage (FILE *where = stderr) { fprintf (where, "" "Usage: %s [OPTION] (add | check | get | list | remove | unset) KEY\n" + "View or edit the Win32 registry\n" "\n" "", prog_name); if (where == stdout) diff --git a/winsup/utils/setfacl.c b/winsup/utils/setfacl.c index cb541b665..734035ec0 100644 --- a/winsup/utils/setfacl.c +++ b/winsup/utils/setfacl.c @@ -284,7 +284,6 @@ usage (FILE * stream) fprintf (stream, "" "Usage: %s [-r] (-f ACL_FILE | -s acl_entries) FILE...\n" " %s [-r] ([-d acl_entries] [-m acl_entries]) FILE...\n" - "\n" "Modify file and directory access control lists (ACLs)\n" "\n" " -d, --delete delete one or more specified ACL entries\n" diff --git a/winsup/utils/ssp.c b/winsup/utils/ssp.c index 611c57a55..aadfa5cfe 100644 --- a/winsup/utils/ssp.c +++ b/winsup/utils/ssp.c @@ -648,6 +648,8 @@ usage (FILE * stream) { fprintf (stream , "" "Usage: %s [options] low_pc high_pc command...\n" + "Single-step profile COMMAND\n" + "\n" " -c, --console-trace trace every EIP value to the console. *Lots* slower.\n" " -d, --disable disable single-stepping by default; use\n" " OutputDebugString (\"ssp on\") to enable stepping\n" diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc index 861c7ff2d..47e5aa6cc 100644 --- a/winsup/utils/strace.cc +++ b/winsup/utils/strace.cc @@ -800,6 +800,8 @@ usage (FILE *where = stderr) fprintf (where, "\ Usage: %s [OPTIONS] \n\ Usage: %s [OPTIONS] -p \n\ +Trace system calls and signals\n\ +\n\ -b, --buffer-size=SIZE set size of output file buffer\n\ -d, --no-delta don't display the delta-t microsecond timestamp\n\ -f, --trace-children trace child processes (toggle - default true)\n\ diff --git a/winsup/utils/umount.cc b/winsup/utils/umount.cc index 8cb8ddcd1..bae371ba0 100644 --- a/winsup/utils/umount.cc +++ b/winsup/utils/umount.cc @@ -44,6 +44,8 @@ usage (FILE *where = stderr) { fprintf (where, "\ Usage: %s [OPTION] []\n\ +Unmount filesystems\n\ +\n\ -A, --remove-all-mounts remove all mounts\n\ -c, --remove-cygdrive-prefix remove cygdrive prefix\n\ -h, --help output usage information and exit\n\