Removed un-needed signal suff from pginterface.

bmomjian · bmomjian · commit f03b75e4a3ce · 1997-09-16T15:36:09.000Z
diff --git a/contrib/pginterface/README b/contrib/pginterface/README
@@ -22,14 +22,6 @@ useful if you are running the query engine on a system with a different
 architecture than the database server.  If you pass a NULL pointer, the
 column is skipped, and you can use libpq to handle it as you wish.
 
-I have used sigprocmask() to block the reception of certain signals
-while the program is executing SQL queries.  This prevents a user
-pressing Control-C from stopping all the back ends.  It blocks SIGHUP,
-SIGINT, and SIGTERM, but does not block SIGQUIT or obviously kill -9. 
-If your platform does not support sigprocmask(), you can remove those
-function calls.  ( Am I correct that abnormal termination can cause
-shared memory resynchronization?)
-
 There is a demo program called pginsert that demonstrates how the
 library can be used.
 
diff --git a/contrib/pginterface/pginsert.c b/contrib/pginterface/pginsert.c
@@ -4,8 +4,6 @@
 */
 
 #include <stdio.h>
-#include <signal.h>
-#include <time.h>
 #include <libpq-fe.h>
 #include "halt.h"
 #include "pginterface.h"
diff --git a/contrib/pginterface/pginterface.c b/contrib/pginterface/pginterface.c
@@ -4,17 +4,13 @@
 */
 
 #include <stdio.h>
-#include <signal.h>
 #include <string.h>
 #include <stdarg.h>
 
 #include <libpq-fe.h>
 #include "halt.h"
 #include "pginterface.h"
 
-static void sig_disconnect();
-static void set_signals();
-
 #define NUL '\0'
 
 /* GLOBAL VARIABLES */
@@ -27,8 +23,6 @@ static PGresult *res = NULL;
 static int	on_error_state = ON_ERROR_STOP;
 
 /* LOCAL VARIABLES */
-static sigset_t block_sigs,
-			unblock_sigs;
 static int	tuple;
 
 /*
@@ -48,7 +42,6 @@ connectdb(char *dbName,
 	if (PQstatus(conn) == CONNECTION_BAD)
 		halt("Connection to database '%s' failed.\n%s\n", dbName,
 			 PQerrorMessage(conn));
-	set_signals();
 	return conn;
 }
 
@@ -74,9 +67,7 @@ doquery(char *query)
 	if (res != NULL)
 		PQclear(res);
 
-	sigprocmask(SIG_SETMASK, &block_sigs, NULL);
 	res = PQexec(conn, query);
-	sigprocmask(SIG_SETMASK, &unblock_sigs, NULL);
 
 	if (on_error_state == ON_ERROR_STOP &&
 		(res == NULL ||
@@ -196,37 +187,3 @@ on_error_continue()
 {
 	on_error_state = ON_ERROR_CONTINUE;
 }
-
-/*
-**
-**		sig_disconnect
-**
-*/
-static void
-sig_disconnect()
-{
-	fprintf(stderr, "exiting...\n");
-	PQfinish(conn);
-	exit(1);
-}
-
-/*
-**
-**		set_signals
-**
-*/
-static void
-set_signals()
-{
-	sigemptyset(&block_sigs);
-	sigemptyset(&unblock_sigs);
-	sigaddset(&block_sigs, SIGTERM);
-	sigaddset(&block_sigs, SIGHUP);
-	sigaddset(&block_sigs, SIGINT);
-/*		sigaddset(&block_sigs,SIGQUIT); no block */
-	sigprocmask(SIG_SETMASK, &unblock_sigs, NULL);
-	signal(SIGTERM, sig_disconnect);
-	signal(SIGHUP, sig_disconnect);
-	signal(SIGINT, sig_disconnect);
-	signal(SIGQUIT, sig_disconnect);
-}
diff --git a/contrib/pginterface/pgnulltest.c b/contrib/pginterface/pgnulltest.c
@@ -6,8 +6,6 @@
 #define TEST_NON_NULLS
 
 #include <stdio.h>
-#include <signal.h>
-#include <time.h>
 #include <halt.h>
 #include <libpq-fe.h>
 #include <pginterface.h>
diff --git a/contrib/pginterface/pgwordcount.c b/contrib/pginterface/pgwordcount.c
@@ -4,8 +4,6 @@
 */
 
 #include <stdio.h>
-#include <signal.h>
-#include <time.h>
 #include "halt.h"
 #include <libpq-fe.h>
 #include "pginterface.h"
