summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <bcameron@src.gnome.org>2002-07-12 14:15:57 +0000
committerBrian Cameron <bcameron@src.gnome.org>2002-07-12 14:15:57 +0000
commitabc7513224e5322992b7cfce07e7cb5deb974709 (patch)
tree21847144d5a6f640e24ef7ef8534c9e9d9381faa
parent497ce4591a41dc65699aa3aae640ce448c464ed2 (diff)
downloadgconf-abc7513224e5322992b7cfce07e7cb5deb974709.tar.gz
gconf/gconfd.c Removed reference to gnome_segv2 since it was not used.
* gconf/gconfd.c Removed reference to gnome_segv2 since it was not used.
-rw-r--r--ChangeLog7
-rw-r--r--gconf/gconfd.c76
2 files changed, 6 insertions, 77 deletions
diff --git a/ChangeLog b/ChangeLog
index b40dc647..126ee4d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2002-07-11 Brian Cameron <Brian.Cameron@sun.ie>
+2002-07-12 Brian Cameron <Brian.Cameron@sun.com>
+
+ * gconf/gconfd.c
+ Removed reference to gnome_segv2 since it was not used.
+
+2002-07-11 Brian Cameron <Brian.Cameron@sun.com>
* gconf-2.0.pc.in
* gconf.spec.in
diff --git a/gconf/gconfd.c b/gconf/gconfd.c
index c790b052..69a12828 100644
--- a/gconf/gconfd.c
+++ b/gconf/gconfd.c
@@ -2304,82 +2304,6 @@ client_count (void)
static void
gconf_handle_segv (int signum)
{
- static int in_segv = 0;
- pid_t pid;
-
return;
-
- in_segv++;
-
- if (in_segv > 2)
- {
- /* The fprintf() was segfaulting, we are just totally hosed */
- _exit(1);
- }
- else if (in_segv > 1)
- {
- /* dialog display isn't working out */
- fprintf (stderr, _("Multiple segmentation faults occurred; can't display error dialog\n"));
- _exit(1);
- }
-
- pid = fork();
-
- if (pid < 0)
- {
- /* Eeeek! Can't show dialog */
- fprintf (stderr, _("Segmentation fault!\n"
- "Cannot display crash dialog: %s\n"),
- strerror (errno));
- fflush (stderr);
-
- /* Don't use app attributes here - a lot of things are probably hosed */
- if (g_getenv ("GNOME_DUMP_CORE"))
- abort ();
-
- _exit (1);
- }
- else if (pid > 0)
- {
- /* Wait for user to see the dialog, then exit. */
- /* Why wait at all? Because we want to allow people to attach to the
- process */
- int estatus;
- pid_t eret;
-
- eret = waitpid (pid, &estatus, 0);
-
- /* Don't use app attributes here - a lot of things are probably hosed */
- if(g_getenv ("GNOME_DUMP_CORE"))
- abort ();
-
- _exit (1);
- }
- else /* pid == 0 */
- {
- char buf[32];
-
- g_snprintf (buf, sizeof (buf), "%d", signum);
-
- /* Child process */
- execl (GCONF_BINDIR "/gnome_segv2", GCONF_BINDIR "/gnome_segv2",
- GCONF_SERVERDIR"/"GCONFD, buf,
- VERSION, NULL);
-
- execlp ("gnome_segv2", "gnome_segv2",
- GCONF_SERVERDIR"/"GCONFD, buf,
- GCONFD, NULL);
-
- _exit (99);
- }
-
- in_segv--;
}
-
-
-
-
-
-
-