From f03b75e4a3cea63307b92e94a65fd0c991777ba8 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 16 Sep 1997 15:36:09 +0000
Subject: [PATCH] Removed un-needed signal suff from pginterface.
---
contrib/pginterface/README | 8 ------
contrib/pginterface/pginsert.c | 2 --
contrib/pginterface/pginterface.c | 43 -------------------------------
contrib/pginterface/pgnulltest.c | 2 --
contrib/pginterface/pgwordcount.c | 2 --
5 files changed, 57 deletions(-)
diff --git a/contrib/pginterface/README b/contrib/pginterface/README
index c52b5d1190a..42fd0a5dfe7 100644
--- 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
index 82838c2f8cc..46e3c2743ba 100644
--- 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
index cdc419352aa..1335baa1928 100644
--- a/contrib/pginterface/pginterface.c
+++ b/contrib/pginterface/pginterface.c
@@ -4,7 +4,6 @@
*/
#include <stdio.h>
-#include <signal.h>
#include <string.h>
#include <stdarg.h>
@@ -12,9 +11,6 @@
#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
index 96873ca7c81..69a1d44e854 100644
--- 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
index 859cf90b2ad..4fe23187f02 100644
--- 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"
--
GitLab