Avoid 'clobbered by longjmp' warning in psql/copy.c.

anarazel · anarazel · commit afaefa1b31ba · 2014-09-19T16:47:27.000+02:00
This was introduced in 51bb795.
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
@@ -518,7 +518,7 @@ handleCopyIn(PGconn *conn, FILE *copystream, bool isbinary, PGresult **res)
 {
 	bool		OK;
 	char		buf[COPYBUFSIZ];
-	bool		showprompt = false;
+	bool		showprompt;
 
 	/*
 	 * Establish longjmp destination for exiting from wait-for-input. (This is
@@ -545,6 +545,8 @@ handleCopyIn(PGconn *conn, FILE *copystream, bool isbinary, PGresult **res)
 			puts(_("Enter data to be copied followed by a newline.\n"
 				   "End with a backslash and a period on a line by itself."));
 	}
+	else
+		showprompt = false;
 
 	OK = true;
 

Original file line number	Diff line number	Diff line change
`@@ -518,7 +518,7 @@ handleCopyIn(PGconn conn, FILE copystream, bool isbinary, PGresult **res)`
`518`	`518`	`{`
`519`	`519`	`bool OK;`
`520`	`520`	`char buf[COPYBUFSIZ];`
`521`		`- bool showprompt = false;`
	`521`	`+ bool showprompt;`
`522`	`522`
`523`	`523`	`/*`
`524`	`524`	`* Establish longjmp destination for exiting from wait-for-input. (This is`
`@@ -545,6 +545,8 @@ handleCopyIn(PGconn conn, FILE copystream, bool isbinary, PGresult **res)`
`545`	`545`	`puts(_("Enter data to be copied followed by a newline.\n"`
`546`	`546`	`"End with a backslash and a period on a line by itself."));`
`547`	`547`	`}`
	`548`	`+ else`
	`549`	`+ showprompt = false;`
`548`	`550`
`549`	`551`	`OK = true;`
`550`	`552`