Fix Windows emulation of kill(pid, 0). This will now succeed, but only

tglsfdc · tglsfdc · commit 3e3f70a28ab0 · 2004-08-27T18:31:48.000Z
if the target PID is a PG postmaster or backend --- for our purposes that
is actually better than the Unix behavior.  Per Dave Page and Andrew Dunstan.
diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.4 2004/06/24 21:02:42 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.5 2004/08/27 18:31:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -162,7 +162,7 @@ pqsignal(int signum, pqsigfunc handler)
 void
 pg_queue_signal(int signum)
 {
-	if (signum >= PG_SIGNAL_COUNT || signum < 0)
+	if (signum >= PG_SIGNAL_COUNT || signum <= 0)
 		return;
 
 	EnterCriticalSection(&pg_signal_crit_sec);
diff --git a/src/port/kill.c b/src/port/kill.c
@@ -9,7 +9,7 @@
  *	signals that the backend can recognize.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/kill.c,v 1.2 2004/06/24 18:53:48 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/port/kill.c,v 1.3 2004/08/27 18:31:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,7 +26,8 @@ pgkill(int pid, int sig)
 	BYTE		sigRet = 0;
 	DWORD		bytes;
 
-	if (sig >= PG_SIGNAL_COUNT || sig <= 0)
+	/* we allow signal 0 here, but it will be ignored in pg_queue_signal */
+	if (sig >= PG_SIGNAL_COUNT || sig < 0)
 	{
 		errno = EINVAL;
 		return -1;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.4 2004/06/24 21:02:42 tgl Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.5 2004/08/27 18:31:48 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -162,7 +162,7 @@ pqsignal(int signum, pqsigfunc handler)`
`162`	`162`	`void`
`163`	`163`	`pg_queue_signal(int signum)`
`164`	`164`	`{`
`165`		`- if (signum >= PG_SIGNAL_COUNT \|\| signum < 0)`
	`165`	`+ if (signum >= PG_SIGNAL_COUNT \|\| signum <= 0)`
`166`	`166`	`return;`
`167`	`167`
`168`	`168`	`EnterCriticalSection(&pg_signal_crit_sec);`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* signals that the backend can recognize.`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/port/kill.c,v 1.2 2004/06/24 18:53:48 tgl Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/port/kill.c,v 1.3 2004/08/27 18:31:48 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -26,7 +26,8 @@ pgkill(int pid, int sig)`
`26`	`26`	`BYTE sigRet = 0;`
`27`	`27`	`DWORD bytes;`
`28`	`28`
`29`		`- if (sig >= PG_SIGNAL_COUNT \|\| sig <= 0)`
	`29`	`+ /* we allow signal 0 here, but it will be ignored in pg_queue_signal */`
	`30`	`+ if (sig >= PG_SIGNAL_COUNT \|\| sig < 0)`
`30`	`31`	`{`
`31`	`32`	`errno = EINVAL;`
`32`	`33`	`return -1;`