From a12d698ba1edea4960aec9e3f60dcb77a3f04ed4 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 1 Mar 2001 18:34:29 +0000 Subject: [PATCH] Ensure previous setting of pset.queryFout is restored after a failed backslash-g command. --- src/bin/psql/common.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index d64df4434c..ca06e10e98 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -429,34 +429,35 @@ SendQuery(const char *query) FILE *queryFout_copy = pset.queryFout; bool queryFoutPipe_copy = pset.queryFoutPipe; - pset.queryFout = NULL; /* so it doesn't get + pset.queryFout = stdout; /* so it doesn't get * closed */ /* open file/pipe */ if (!setQFout(pset.gfname)) { + pset.queryFout = queryFout_copy; + pset.queryFoutPipe = queryFoutPipe_copy; success = false; break; } printQuery(results, &pset.popt, pset.queryFout); - /* close file/pipe */ + /* close file/pipe, restore old setting */ setQFout(NULL); - free(pset.gfname); - pset.gfname = NULL; - pset.queryFout = queryFout_copy; pset.queryFoutPipe = queryFoutPipe_copy; + free(pset.gfname); + pset.gfname = NULL; + success = true; - break; } else { - success = true; printQuery(results, &pset.popt, pset.queryFout); + success = true; } break; case PGRES_EMPTY_QUERY: -- 2.39.5