Commita560657

committed

Move setup_cancel_handler() up near start of psql main(), where the

setup_win32_locks() call formerly was, to ensure that cancelConnLock isvalid when it needs to be. Per Yoshiyuki Asaba.

1 parent59fd249 commita560657Copy full SHA for a560657

File tree

-6

lines changed

-6

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2006, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.133 2006/06/14 16:49:02 tgl Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.134 2006/06/21 19:40:31 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`
`@@ -130,11 +130,14 @@ main(int argc, char *argv[])`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
`133`		`-pset.progname=get_progname(argv[0]);`
`134`		`-`
`135`	`133`	`#ifdefWIN32`
`136`	`134`	`setvbuf(stderr,NULL,_IONBF,0);`
`137`	`135`	`#endif`
	`136`	`+`
	`137`	`+setup_cancel_handler();`
	`138`	`+`
	`139`	`+pset.progname=get_progname(argv[0]);`
	`140`	`+`
`138`	`141`	`setDecimalLocale();`
`139`	`142`	`pset.cur_cmd_source=stdin;`
`140`	`143`	`pset.cur_cmd_interactive= false;`
`@@ -370,9 +373,6 @@ main(int argc, char *argv[])`
`370`	`373`	`if (options.action_string)/* -f - was used */`
`371`	`374`	`pset.inputfile="<stdin>";`
`372`	`375`
`373`		`-/* establish control-C handling for interactive operation */`
`374`		`-setup_cancel_handler();`
`375`		`-`
`376`	`376`	`successResult=MainLoop(stdin);`
`377`	`377`	`}`
`378`	`378`

Comments

(0)