* cygpath.cc (usage): Clarify help output to indicate acceptance

of multiple file names as arguments.

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 24ef18a..2e24ff2 100644 (file)
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-23  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
+
+       * cygpath.cc (usage): Clarify help output to indicate acceptance
+       of multiple file names as arguments.
+
 2005-01-16  Christopher Faylor  <cgf@timesys.com>
 
        * ps.cc (main): Eliminate use of PID_ZOMBIE.

diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc
index 45372e3..782ac50 100644 (file)
--- a/winsup/utils/cygpath.cc
+++ b/winsup/utils/cygpath.cc
@@ -65,22 +65,23 @@ usage (FILE * stream, int status)
 {
   if (!ignore_flag || !status)
     fprintf (stream, "\
-Usage: %s (-d|-m|-u|-w|-t TYPE) [-c HANDLE] [-f FILE] [options] NAME\n\
+Usage: %s (-d|-m|-u|-w|-t TYPE) [-f FILE] [OPTION]... NAME...\n\
+       %s [-c HANDLE] \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\
+  -d, --dos            print DOS (short) form of NAMEs (C:\\PROGRA~1\\)\n\
   -m, --mixed           like --windows, but with regular slashes (C:/WINNT)\n\
   -M, --mode           report on mode of file (binmode or textmode)\n\
-  -u, --unix           (default) print Unix form of NAME (/cygdrive/c/winnt)\n\
-  -w, --windows         print Windows form of NAME (C:\\WINNT)\n\
+  -u, --unix           (default) print Unix form of NAMEs (/cygdrive/c/winnt)\n\
+  -w, --windows         print Windows form of NAMEs (C:\\WINNT)\n\
   -t, --type TYPE       print TYPE form: 'dos', 'mixed', 'unix', or 'windows'\n\
 Path conversion options:\n\
   -a, --absolute        output absolute path\n\
-  -l, --long-name      print Windows long form of NAME (with -w, -m only)\n\
+  -l, --long-name      print Windows long form of NAMEs (with -w, -m only)\n\
   -p, --path           NAME is a PATH list (i.e., '/bin:/usr/bin')\n\
-  -s, --short-name     print DOS (short) form of NAME (with -w, -m only)\n\
+  -s, --short-name     print DOS (short) form of NAMEs (with -w, -m only)\n\
 System information:\n\
   -A, --allusers        use `All Users' instead of current user for -D, -P\n\
   -D, --desktop                output `Desktop' directory and exit\n\

diff --git a/winsup/utils/utils.sgml b/winsup/utils/utils.sgml
index 8011c0a..1377eba 100644 (file)
--- a/winsup/utils/utils.sgml
+++ b/winsup/utils/utils.sgml
@@ -112,22 +112,23 @@ for example:</para>
 <sect2 id="cygpath"><title>cygpath</title>
 
 <screen>
-Usage: cygpath (-d|-m|-u|-w|-t TYPE) [-c HANDLE] [-f FILE] [options] NAME
+Usage: cygpath (-d|-m|-u|-w|-t TYPE) [-f FILE] [OPTION]... NAME...
+       cygpath [-c HANDLE] 
        cygpath [-ADHPSW] 
 Convert Unix and Windows format paths, or output system path information
 
 Output type options:
-  -d, --dos             print DOS (short) form of NAME (C:\PROGRA~1\)
+  -d, --dos             print DOS (short) form of NAMEs (C:\PROGRA~1\)
   -m, --mixed           like --windows, but with regular slashes (C:/WINNT)
   -M, --mode           report on mode of file (currently binmode or textmode)
-  -u, --unix            (default) print Unix form of NAME (/cygdrive/c/winnt)
-  -w, --windows         print Windows form of NAME (C:\WINNT)
+  -u, --unix            (default) print Unix form of NAMEs (/cygdrive/c/winnt)
+  -w, --windows         print Windows form of NAMEs (C:\WINNT)
   -t, --type TYPE       print TYPE form: 'dos', 'mixed', 'unix', or 'windows'
 Path conversion options:
   -a, --absolute        output absolute path
-  -l, --long-name       print Windows long form of NAME (with -w, -m only)
+  -l, --long-name       print Windows long form of NAMEs (with -w, -m only)
   -p, --path            NAME is a PATH list (i.e., '/bin:/usr/bin')
-  -s, --short-name      print DOS (short) form of NAME (with -w, -m only)
+  -s, --short-name      print DOS (short) form of NAMEs (with -w, -m only)
 System information:
   -A, --allusers        use `All Users' instead of current user for -D, -P
   -D, --desktop         output `Desktop' directory and exit