Commit 40c992c7 authored by Bruce Momjian's avatar Bruce Momjian

Back out -\?. Didn't look good to Peter.

parent 9d31e3a9
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Group * 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" #include "postgres.h"
...@@ -82,8 +82,7 @@ static void ...@@ -82,8 +82,7 @@ static void
static void static void
showVersion(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) ...@@ -514,7 +513,8 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
/* unknown option reported by getopt */ /* unknown option reported by getopt */
else else
{ {
explain_help_and_exit(); fputs("Try -? for help.\n", stderr);
exit(EXIT_FAILURE);
} }
break; break;
#ifndef HAVE_GETOPT_LONG #ifndef HAVE_GETOPT_LONG
...@@ -525,7 +525,8 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options) ...@@ -525,7 +525,8 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
break; break;
#endif #endif
default: default:
explain_help_and_exit(); fputs("Try -? for help.\n", stderr);
exit(EXIT_FAILURE);
break; break;
} }
} }
...@@ -639,17 +640,3 @@ showVersion(void) ...@@ -639,17 +640,3 @@ showVersion(void)
puts("Read the file COPYRIGHT or use the command \\copyright to see the"); puts("Read the file COPYRIGHT or use the command \\copyright to see the");
puts("usage and distribution terms."); 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);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment