From 40c992c7dd6a2d0a057652f19804e0e500b2ab8e Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 12 May 2000 16:28:31 +0000
Subject: [PATCH] Back out -\?.  Didn't look good to Peter.

---
 src/bin/psql/startup.c | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 252caa2ff6..805d7be819 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.31 2000/05/11 03:14:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.32 2000/05/12 16:28:31 momjian Exp $
  */
 #include "postgres.h"
 
@@ -82,8 +82,7 @@ static void
 static void
 			showVersion(void);
 
-static void
-			explain_help_and_exit(void);
+
 
 /*
  *
@@ -514,7 +513,8 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
 				/* unknown option reported by getopt */
 				else
 				{
-					explain_help_and_exit();
+					fputs("Try -? for help.\n", stderr);
+					exit(EXIT_FAILURE);
 				}
 				break;
 #ifndef HAVE_GETOPT_LONG
@@ -525,7 +525,8 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
 				break;
 #endif
 			default:
-				explain_help_and_exit();
+				fputs("Try -? for help.\n", stderr);
+				exit(EXIT_FAILURE);
 				break;
 		}
 	}
@@ -639,17 +640,3 @@ showVersion(void)
 	puts("Read the file COPYRIGHT or use the command \\copyright to see the");
 	puts("usage and distribution terms.");
 }
-
-static void
-explain_help_and_exit(void)
-{
-
-#ifdef WIN32
-	fputs("Try -? for help.\n", stderr);
-#else /* !WIN32 */
-	fputs("Try -\\? for help.\n", stderr);
-#endif /* WIN32 */
-
-	exit(EXIT_FAILURE);
-}
-