|
3 | 3 | * |
4 | 4 | * Copyright 2000 by PostgreSQL Global Development Group |
5 | 5 | * |
6 | | - * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.30 2001/02/10 02:31:28 tgl Exp $ |
| 6 | + * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.31 2001/03/01 18:34:29 tgl Exp $ |
7 | 7 | */ |
8 | 8 | #include"postgres_fe.h" |
9 | 9 |
|
@@ -429,34 +429,35 @@ SendQuery(const char *query) |
429 | 429 | FILE*queryFout_copy=pset.queryFout; |
430 | 430 | boolqueryFoutPipe_copy=pset.queryFoutPipe; |
431 | 431 |
|
432 | | -pset.queryFout=NULL;/* so it doesn't get |
| 432 | +pset.queryFout=stdout;/* so it doesn't get |
433 | 433 | * closed */ |
434 | 434 |
|
435 | 435 | /* open file/pipe */ |
436 | 436 | if (!setQFout(pset.gfname)) |
437 | 437 | { |
| 438 | +pset.queryFout=queryFout_copy; |
| 439 | +pset.queryFoutPipe=queryFoutPipe_copy; |
438 | 440 | success= false; |
439 | 441 | break; |
440 | 442 | } |
441 | 443 |
|
442 | 444 | printQuery(results,&pset.popt,pset.queryFout); |
443 | 445 |
|
444 | | -/* close file/pipe */ |
| 446 | +/* close file/pipe, restore old setting */ |
445 | 447 | setQFout(NULL); |
446 | 448 |
|
447 | | -free(pset.gfname); |
448 | | -pset.gfname=NULL; |
449 | | - |
450 | 449 | pset.queryFout=queryFout_copy; |
451 | 450 | pset.queryFoutPipe=queryFoutPipe_copy; |
452 | 451 |
|
| 452 | +free(pset.gfname); |
| 453 | +pset.gfname=NULL; |
| 454 | + |
453 | 455 | success= true; |
454 | | -break; |
455 | 456 | } |
456 | 457 | else |
457 | 458 | { |
458 | | -success= true; |
459 | 459 | printQuery(results,&pset.popt,pset.queryFout); |
| 460 | +success= true; |
460 | 461 | } |
461 | 462 | break; |
462 | 463 | casePGRES_EMPTY_QUERY: |
|