Ensure fflush(stdout) happens in all cases, per gripe from Jon Sablatnig.

tglsfdc · tglsfdc · commit 4d2e94ef04d3 · 2004-01-21T22:05:44.000Z
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.58 2003/11/29 19:52:06 pgsql Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.59 2004/01/21 22:05:44 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "mainloop.h"
@@ -103,7 +103,6 @@ MainLoop(FILE *source)
 			}
 
 			cancel_pressed = false;
-			fflush(stdout);
 		}
 
 #ifndef WIN32
@@ -122,7 +121,6 @@ MainLoop(FILE *source)
 				paren_level = 0;
 				count_eof = 0;
 				slashCmdStatus = CMD_UNKNOWN;
-				fflush(stdout);
 			}
 			else
 			{
@@ -138,6 +136,8 @@ MainLoop(FILE *source)
 		pqsignal(SIGINT, handle_sigint);		/* control-C => cancel */
 #endif   /* not WIN32 */
 
+		fflush(stdout);
+
 		if (slashCmdStatus == CMD_NEWEDIT)
 		{
 			/*
@@ -161,8 +161,6 @@ MainLoop(FILE *source)
 		{
 			int			prompt_status;
 
-			fflush(stdout);
-
 			if (in_quote && in_quote == '\'')
 				prompt_status = PROMPT_SINGLEQUOTE;
 			else if (in_quote && in_quote == '"')
@@ -181,7 +179,6 @@ MainLoop(FILE *source)
 		else
 			line = gets_fromFile(source);
 
-
 		/* Setting this will not have effect until next line. */
 		die_on_error = GetVariableBool(pset.vars, "ON_ERROR_STOP");
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2003, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.58 2003/11/29 19:52:06 pgsql Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.59 2004/01/21 22:05:44 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "mainloop.h"`
`@@ -103,7 +103,6 @@ MainLoop(FILE *source)`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`cancel_pressed = false;`
`106`		`- fflush(stdout);`
`107`	`106`	`}`
`108`	`107`
`109`	`108`	`#ifndef WIN32`
`@@ -122,7 +121,6 @@ MainLoop(FILE *source)`
`122`	`121`	`paren_level = 0;`
`123`	`122`	`count_eof = 0;`
`124`	`123`	`slashCmdStatus = CMD_UNKNOWN;`
`125`		`- fflush(stdout);`
`126`	`124`	`}`
`127`	`125`	`else`
`128`	`126`	`{`
`@@ -138,6 +136,8 @@ MainLoop(FILE *source)`
`138`	`136`	`pqsignal(SIGINT, handle_sigint); /* control-C => cancel */`
`139`	`137`	`#endif /* not WIN32 */`
`140`	`138`
	`139`	`+ fflush(stdout);`
	`140`	`+`
`141`	`141`	`if (slashCmdStatus == CMD_NEWEDIT)`
`142`	`142`	`{`
`143`	`143`	`/*`
`@@ -161,8 +161,6 @@ MainLoop(FILE *source)`
`161`	`161`	`{`
`162`	`162`	`int prompt_status;`
`163`	`163`
`164`		`- fflush(stdout);`
`165`		`-`
`166`	`164`	`if (in_quote && in_quote == '\'')`
`167`	`165`	`prompt_status = PROMPT_SINGLEQUOTE;`
`168`	`166`	`else if (in_quote && in_quote == '"')`
`@@ -181,7 +179,6 @@ MainLoop(FILE *source)`
`181`	`179`	`else`
`182`	`180`	`line = gets_fromFile(source);`
`183`	`181`
`184`		`-`
`185`	`182`	`/* Setting this will not have effect until next line. */`
`186`	`183`	`die_on_error = GetVariableBool(pset.vars, "ON_ERROR_STOP");`
`187`	`184`