* cygpath.cc (usage): Don't issue helpful message if -i is used.

(from Igor Pechtchanski)

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 1aa9e1ffcdc4f19179b34be52844b4904abf70c0..825efbaa3677eff5455986c5ce5b9d0d1b488ee4 100644 (file)
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-15  Christopher Faylor  <cgf@redhat.com>
+
+       * cygpath.cc (usage): Don't issue helpful message if -i is used.
+       (from Igor Pechtchanski)
+
 2004-03-13  Rob Siklos  <rob2@siklos.ca>
 
        * kill.cc (get_debug_priv): New function.

diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc
index fe727dfb85b01683abfa617286d61d8fd2583728..45372e327e771c648c1271940c6771e603c88102 100644 (file)
--- a/winsup/utils/cygpath.cc
+++ b/winsup/utils/cygpath.cc
@@ -89,9 +89,13 @@ System information:\n\
   -S, --sysdir         output system directory and exit\n\
   -W, --windir         output `Windows' directory and exit\n\
 ", prog_name, prog_name);
-  if (stream == stdout)
+  if (ignore_flag)
+    /* nothing to do */;
+  else if (stream != stdout)
+    fprintf(stream, "Try `%s --help' for more information.\n", prog_name);
+  else
     {
-    fprintf (stream, "\
+      fprintf (stream, "\
 Other options:\n\
   -f, --file FILE       read FILE for input; use - to read from STDIN\n\
   -o, --option          read options from FILE as well (for use with --file)\n\
@@ -101,8 +105,6 @@ Other options:\n\
   -v, --version                output version information and exit\n\
 ");
     }
-  else
-    fprintf(stream, "Try `%s --help' for more information.\n", prog_name);
   exit (ignore_flag ? 0 : status);
 }