database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Ensure previous setting of pset.queryFout is restored after a failed

Browse Source 
backslash-g command.
This commit is contained in:
Tom Lane
2001-03-01 18:34:29 +00:00
parent 08372d4e03
commit ea7b4f1f04
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/bin/psql/common.c
View File

@ -3,7 +3,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Group * Copyright 2000 by PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.30 2001/02/10 02:31:28 tgl Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.31 2001/03/01 18:34:29 tgl Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
@ -429,34 +429,35 @@ SendQuery(const char *query)
FILE *queryFout_copy = pset.queryFout; FILE *queryFout_copy = pset.queryFout;
bool queryFoutPipe_copy = pset.queryFoutPipe; bool queryFoutPipe_copy = pset.queryFoutPipe;
pset.queryFout = NULL; /* so it doesn't get pset.queryFout = stdout; /* so it doesn't get
* closed */ * closed */
/* open file/pipe */ /* open file/pipe */
if (!setQFout(pset.gfname)) if (!setQFout(pset.gfname))
{ {
pset.queryFout = queryFout_copy;
pset.queryFoutPipe = queryFoutPipe_copy;
success = false; success = false;
break; break;
} }
printQuery(results, &pset.popt, pset.queryFout); printQuery(results, &pset.popt, pset.queryFout);
/* close file/pipe */ /* close file/pipe, restore old setting */
setQFout(NULL); setQFout(NULL);
free(pset.gfname);
pset.gfname = NULL;
pset.queryFout = queryFout_copy; pset.queryFout = queryFout_copy;
pset.queryFoutPipe = queryFoutPipe_copy; pset.queryFoutPipe = queryFoutPipe_copy;
free(pset.gfname);
pset.gfname = NULL;
success = true; success = true;
break;
} }
else else
{ {
success = true;
printQuery(results, &pset.popt, pset.queryFout); printQuery(results, &pset.popt, pset.queryFout);
success = true;
} }
break; break;
case PGRES_EMPTY_QUERY: case PGRES_EMPTY_QUERY: