Mercurial > pidgin3 / changeset

--- a/pidgin/libpidgin.c	Tue Aug 15 15:49:01 2023 -0500
+++ b/pidgin/libpidgin.c	Thu Aug 17 21:41:12 2023 -0500
@@ -27,8 +27,6 @@
 # include <config.h>
 #endif
 
-#include <errno.h>
-
 #include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
 
@@ -39,211 +37,6 @@
 #include "pidginapplication.h"
 #include "pidgincore.h"
 
-#ifndef _WIN32
-#include <signal.h>
-#endif
-
-#ifndef _WIN32
-
-/*
- * Lists of signals we wish to catch and those we wish to ignore.
- * Each list terminated with -1
- */
-static const int catch_sig_list[] = {
-	SIGSEGV,
-	SIGINT,
-	SIGTERM,
-	SIGQUIT,
-	SIGCHLD,
-	-1
-};
-
-static const int ignore_sig_list[] = {
-	SIGPIPE,
-	-1
-};
-#endif /* !_WIN32 */
-
-#ifndef _WIN32
-static char *segfault_message;
-
-static guint signal_channel_watcher;
-
-static int signal_sockets[2];
-
-static void sighandler(int sig);
-
-static void sighandler(int sig)
-{
-	ssize_t written;
-
-	/*
-	 * We won't do any of the heavy lifting for the signal handling here
-	 * because we have no idea what was interrupted.  Previously this signal
-	 * handler could result in some calls to malloc/free, which can cause
-	 * deadlock in libc when the signal handler was interrupting a previous
-	 * malloc or free.  So instead we'll do an ugly hack where we write the
-	 * signal number to one end of a socket pair.  The other half of the
-	 * socket pair is watched by our main loop.  When the main loop sees new
-	 * data on the socket it reads in the signal and performs the appropriate
-	 * action without fear of interrupting stuff.
-	 */
-	if (sig == SIGSEGV) {
-		fprintf(stderr, "%s", segfault_message);
-		abort();
-		return;
-	}
-
-	written = write(signal_sockets[0], &sig, sizeof(int));
-	if (written != sizeof(int)) {
-		/* This should never happen */
-		purple_debug_error("sighandler", "Received signal %d but only "
-				"wrote %" G_GSSIZE_FORMAT " bytes out of %"
-				G_GSIZE_FORMAT ": %s\n",
-				sig, written, sizeof(int), g_strerror(errno));
-		exit(1);
-	}
-}
-
-static gboolean
-mainloop_sighandler(GIOChannel *source, G_GNUC_UNUSED GIOCondition cond,
-                    G_GNUC_UNUSED gpointer data)
-{
-	GIOStatus stat;
-	int sig;
-	gsize bytes_read;
-	GError *error = NULL;
-
-	/* read the signal number off of the io channel */
-	stat = g_io_channel_read_chars(source, (gchar *)&sig, sizeof(int),
-			&bytes_read, &error);
-	if (stat != G_IO_STATUS_NORMAL) {
-		purple_debug_error("sighandler", "Signal callback failed to read "
-				"from signal socket: %s", error->message);
-		g_clear_error(&error);
-		purple_core_quit();
-		return FALSE;
-	}
-
-	switch (sig) {
-		case SIGCHLD:
-			/* Restore signal catching */
-			signal(SIGCHLD, sighandler);
-			break;
-		default:
-			purple_debug_warning("sighandler", "Caught signal %d\n", sig);
-			purple_core_quit();
-	}
-
-	return TRUE;
-}
-#endif /* !_WIN32 */
-
-#ifndef _WIN32
-static void
-pidgin_setup_error_handler(void)
-{
-	int sig_indx;	/* for setting up signal catching */
-	sigset_t sigset;
-	char errmsg[BUFSIZ];
-	GIOChannel *signal_channel;
-	GIOStatus signal_status;
-	GError *error = NULL;
-	char *segfault_message_tmp;
-
-	/* We translate this here in case the crash breaks gettext. */
-	segfault_message_tmp = g_strdup_printf(_(
-		"%s %s has segfaulted and attempted to dump a core file.\n"
-		"This is a bug in the software and has happened through\n"
-		"no fault of your own.\n\n"
-		"If you can reproduce the crash, please notify the developers\n"
-		"by reporting a bug at:\n"
-		"%snewissue\n\n"
-		"Please make sure to specify what you were doing at the time\n"
-		"and post the backtrace from the core file.  If you do not know\n"
-		"how to get the backtrace, please read the instructions at\n"
-		"https://developer.pidgin.im/wiki/GetABacktrace\n"),
-		PIDGIN_NAME, DISPLAY_VERSION, PURPLE_WEBSITE
-	);
-
-	/* we have to convert the message (UTF-8 to console
-	   charset) early because after a segmentation fault
-	   it's not a good practice to allocate memory */
-	segfault_message = g_locale_from_utf8(segfault_message_tmp, -1, NULL, NULL,
-	                                      &error);
-	if(segfault_message != NULL) {
-		g_free(segfault_message_tmp);
-	} else {
-		/* use 'segfault_message_tmp' (UTF-8) as a fallback */
-		g_warning("%s\n", error->message);
-		g_clear_error(&error);
-		segfault_message = segfault_message_tmp;
-	}
-
-	/*
-	 * Create a socket pair for receiving unix signals from a signal
-	 * handler.
-	 */
-	if (socketpair(AF_UNIX, SOCK_STREAM, 0, signal_sockets) < 0) {
-		perror("Failed to create sockets for GLib signal handling");
-		exit(1);
-	}
-	signal_channel = g_io_channel_unix_new(signal_sockets[1]);
-
-	/*
-	 * Set the channel encoding to raw binary instead of the default of
-	 * UTF-8, because we'll be sending integers across instead of strings.
-	 */
-	signal_status = g_io_channel_set_encoding(signal_channel, NULL, &error);
-	if (signal_status != G_IO_STATUS_NORMAL) {
-		fprintf(stderr, "Failed to set the signal channel to raw "
-				"binary: %s", error->message);
-		g_clear_error(&error);
-		exit(1);
-	}
-	signal_channel_watcher = g_io_add_watch(signal_channel, G_IO_IN, mainloop_sighandler, NULL);
-	g_io_channel_unref(signal_channel);
-
-	/* Let's not violate any PLA's!!!! */
-	/* jseymour: whatever the fsck that means */
-	/* Robot101: for some reason things like gdm like to block     *
-	 * useful signals like SIGCHLD, so we unblock all the ones we  *
-	 * declare a handler for. thanks JSeymour and Vann.            */
-	if (sigemptyset(&sigset)) {
-		g_snprintf(errmsg, sizeof(errmsg),
-		           "Warning: couldn't initialise empty signal set");
-		perror(errmsg);
-	}
-	for(sig_indx = 0; catch_sig_list[sig_indx] != -1; ++sig_indx) {
-		if(signal(catch_sig_list[sig_indx], sighandler) == SIG_ERR) {
-			g_snprintf(errmsg, sizeof(errmsg),
-			           "Warning: couldn't set signal %d for catching",
-			           catch_sig_list[sig_indx]);
-			perror(errmsg);
-		}
-		if(sigaddset(&sigset, catch_sig_list[sig_indx])) {
-			g_snprintf(errmsg, sizeof(errmsg),
-			           "Warning: couldn't include signal %d for unblocking",
-			           catch_sig_list[sig_indx]);
-			perror(errmsg);
-		}
-	}
-	for(sig_indx = 0; ignore_sig_list[sig_indx] != -1; ++sig_indx) {
-		if(signal(ignore_sig_list[sig_indx], SIG_IGN) == SIG_ERR) {
-			g_snprintf(errmsg, sizeof(errmsg),
-			           "Warning: couldn't set signal %d to ignore",
-			           ignore_sig_list[sig_indx]);
-			perror(errmsg);
-		}
-	}
-
-	if (sigprocmask(SIG_UNBLOCK, &sigset, NULL)) {
-		g_snprintf(errmsg, sizeof(errmsg), "Warning: couldn't unblock signals");
-		perror(errmsg);
-	}
-}
-#endif /* !_WIN32 */
-
 int pidgin_start(int argc, char *argv[])
 {
 	GApplication *app;
@@ -256,10 +49,6 @@
 	/* Locale initialization is not complete here.  See gtk_init_check() */
 	setlocale(LC_ALL, "");
 
-#ifndef _WIN32
-	pidgin_setup_error_handler();
-#endif
-
 	app = pidgin_application_new();
 	g_application_set_default(app);
 
@@ -284,13 +73,6 @@
 	 */
 	g_object_unref(app);
 
-#ifndef _WIN32
-	g_free(segfault_message);
-	g_source_remove(signal_channel_watcher);
-	close(signal_sockets[0]);
-	close(signal_sockets[1]);
-#endif
-
 #ifdef _WIN32
 	winpidgin_cleanup();
 #endif