From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 14 May 2001 04:27:18 +0000 (+0000)
Subject:   Clarify the wintty purpose and syntax.
X-Git-Tag: 2.0.18~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f045d56d7989687fc49a80cf813131c574f88c7d;p=thirdparty%2Fapache%2Fhttpd.git

  Clarify the wintty purpose and syntax.

  Still some todos: an option to just abort user feedback and close the
  window instantly upon loosing the stdin pipe, allow the stdin pipe to
  be tee'ed on win32, and still add some graceful error handling for a
  real-world deployment.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89110 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/support/win32/wintty.c b/support/win32/wintty.c
index 28c5979cce0..6aad446cb42 100644
--- a/support/win32/wintty.c
+++ b/support/win32/wintty.c
@@ -71,14 +71,18 @@
 #include <windows.h>
 
 const char *options = 
-"Syntax: wintty [opts] [-?]\n\n"
+"\nwintty: a utility for echoing the stdin stream to a new console window,\n"
+"\teven when invoked from within a service (such as the Apache server.)\n"
+"\tAlso reflects the console input back to the stdout stream, allowing\n"
+"\tthe operator to respond to prompts from the context of a service.\n\n"
+"Syntax: %s [opts]\n\n"
 "  opts: -c{haracter}   or -l{ine} input\n"
 "\t-q{uiet}       or -e{cho} input\n"
-"\topts: -u{nprocessed} or -p{rocessed} input\n"
-"\topts: -n{owrap}      or -w{rap} output lines\n"
-"\topts: -f{ormatted}   or -r{aw} output lines\n"
-"\topts: -v{erbose} error checking\n"
-"\topts: -? for this message\n\n";
+"\t-u{nprocessed} or -p{rocessed} input\n"
+"\t-n{owrap}      or -w{rap} output lines\n"
+"\t-f{ormatted}   or -r{aw} output lines\n"
+"\t-v{erbose} error checking\n"
+"\t-? for this message\n\n";
 
 HANDLE herrout;
 BOOL verbose = FALSE;
@@ -112,6 +116,7 @@ int main(int argc, char** argv)
     DWORD tid;
     DWORD len;
     BOOL isservice = FALSE;
+    char *arg0 = argv[0];
 
     while (--argc) {
         ++argv;
@@ -145,7 +150,7 @@ int main(int argc, char** argv)
                     --argc;
                     break;
                 case '?':
-                    printf(options);
+                    printf(options, arg0);
                     exit(1);
 		default:
                     printf("wintty option %s not recognized, use -? for help.\n\n", *argv);