diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index 6644da87ea808bc5eb92db14094d2636cffaa9db..4b1b5b00b7672d25f7d7d00cb227bc33bd679d66 100644
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.177 1999/05/03 19:10:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.178 1999/05/12 23:26:03 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -149,7 +149,7 @@ typedef struct _psqlSettings
  * of passing them around through many function parameter lists seems
  * worse.
  */
-static FILE * cur_cmd_source = stdin; /* current source of command input */
+static FILE * cur_cmd_source = NULL; /* current source of command input */
 static bool cur_cmd_interactive = false; /* is it an interactive source? */
 
 
@@ -2817,6 +2817,12 @@ main(int argc, char **argv)
 	char	   *home = NULL;	/* Used to store $HOME */
 	char       *version = NULL;     /* PostgreSQL version */
 
+	/* initialize cur_cmd_source in case we do not use MainLoop ...
+	 * some systems fail if we try to use a static initializer for this :-(
+	 */
+	cur_cmd_source = stdin;
+	cur_cmd_interactive = false;
+
 	MemSet(&settings, 0, sizeof settings);
 	settings.opt.align = 1;
 	settings.opt.header = 1;