diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2013-10-02 21:05:08 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2013-10-02 21:05:08 -0400 |
| commit | 9099e4afe0e4101bc79f078be3e15639a048e633 (patch) | |
| tree | 47014fa67626fd8069dc97f506717eb10f198e30 /src | |
| parent | eb5d87e5f3b827f5b26fe551006655d80c063d66 (diff) | |
| download | postgresql-9099e4afe0e4101bc79f078be3e15639a048e633.tar.gz postgresql-9099e4afe0e4101bc79f078be3e15639a048e633.zip | |
psql: Set up cancel handler later
The cancel handler was uselessly set up even before the first connection
was opened. By setting it up afterwards, the user can use Ctrl+C to
abort psql if the initial connection attempt hangs.
Reviewed-by: Dean Rasheed <dean.a.rasheed@gmail.com>
Reviewed-by: Ryan Kelly <rpkelly22@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/psql/startup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index b2264c91fac..dc06f667027 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -111,8 +111,6 @@ main(int argc, char *argv[]) setvbuf(stderr, NULL, _IONBF, 0); #endif - setup_cancel_handler(); - pset.progname = get_progname(argv[0]); pset.db = NULL; @@ -246,6 +244,8 @@ main(int argc, char *argv[]) exit(EXIT_BADCONN); } + setup_cancel_handler(); + PQsetNoticeProcessor(pset.db, NoticeProcessor, NULL); SyncVariables(); |