33 *
44 * Copyright 2000 by PostgreSQL Global Development Group
55 *
6- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.31 2000/05/11 03:14:19 momjian Exp $
6+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.32 2000/05/12 16:28:31 momjian Exp $
77 */
88#include "postgres.h"
99
@@ -82,8 +82,7 @@ static void
8282static void
8383showVersion (void );
8484
85- static void
86- explain_help_and_exit (void );
85+
8786
8887/*
8988 *
@@ -514,7 +513,8 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
514513/* unknown option reported by getopt */
515514else
516515{
517- explain_help_and_exit ();
516+ fputs ("Try -? for help.\n" ,stderr );
517+ exit (EXIT_FAILURE );
518518}
519519break ;
520520#ifndef HAVE_GETOPT_LONG
@@ -525,7 +525,8 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
525525break ;
526526#endif
527527default :
528- explain_help_and_exit ();
528+ fputs ("Try -? for help.\n" ,stderr );
529+ exit (EXIT_FAILURE );
529530break ;
530531}
531532}
@@ -639,17 +640,3 @@ showVersion(void)
639640puts ("Read the file COPYRIGHT or use the command \\copyright to see the" );
640641puts ("usage and distribution terms." );
641642}
642-
643- static void
644- explain_help_and_exit (void )
645- {
646-
647- #ifdef WIN32
648- fputs ("Try -? for help.\n" ,stderr );
649- #else /* !WIN32 */
650- fputs ("Try -\\? for help.\n" ,stderr );
651- #endif /* WIN32 */
652-
653- exit (EXIT_FAILURE );
654- }
655-