Commitaf331e2

committed

Ensure that we only create one ConsoleCtrlHandler per psql process,

so as to avoid performance issues and possible ultimate crash on longpsql scripts. Per Merlin Moncure.

1 parent081ed99 commitaf331e2Copy full SHA for af331e2

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2005, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.109 2005/10/27 13:34:47 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.110 2005/11/04 18:35:40 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"common.h"`
`@@ -268,6 +268,7 @@ handle_sigint(SIGNAL_ARGS)`
`268`	`268`	`}`
`269`	`269`	`errno=save_errno;/* just in case the write changed it */`
`270`	`270`	`}`
	`271`	`+`
`271`	`272`	`#else/* WIN32 */`
`272`	`273`
`273`	`274`	`staticBOOLWINAPI`
`@@ -313,8 +314,16 @@ setup_win32_locks(void)`
`313`	`314`	`void`
`314`	`315`	`setup_cancel_handler(void)`
`315`	`316`	`{`
`316`		`-SetConsoleCtrlHandler(consoleHandler, TRUE);`
	`317`	`+staticbooldone= false;`
	`318`	`+`
	`319`	`+/* only need one handler per process */`
	`320`	`+if (!done)`
	`321`	`+{`
	`322`	`+SetConsoleCtrlHandler(consoleHandler, TRUE);`
	`323`	`+done= true;`
	`324`	`+}`
`317`	`325`	`}`
	`326`	`+`
`318`	`327`	`#endif/* WIN32 */`
`319`	`328`
`320`	`329`

Comments

(0)