Attachment 160717 Details for Bug 250939 – patch fixing problems described herein

[patch] patch fixing problems described herein

dbus-1.0.2-terminate.patch (text/plain), 1.66 KB, created by Steve Grubb on 2007-08-05 18:58:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Grubb

Created: 2007-08-05 18:58:17 UTC

Size: 1.66 KB

patch

obsolete

>diff -urp dbus-1.0.2.orig/dbus/dbus-internals.c dbus-1.0.2/dbus/dbus-internals.c
>--- dbus-1.0.2.orig/dbus/dbus-internals.c	2006-12-11 14:21:06.000000000 -0500
>+++ dbus-1.0.2/dbus/dbus-internals.c	2007-08-05 14:29:42.000000000 -0400
>@@ -280,7 +280,7 @@ _dbus_warn_check_failed(const char *form
>   if (fatal_warnings_on_check_failed)
>     {
>       fflush (stderr);
>-      _dbus_abort ();
>+      _dbus_terminate ();
>     }
> }
> 
>diff -urp dbus-1.0.2.orig/dbus/dbus-sysdeps.c dbus-1.0.2/dbus/dbus-sysdeps.c
>--- dbus-1.0.2.orig/dbus/dbus-sysdeps.c	2006-12-11 14:21:06.000000000 -0500
>+++ dbus-1.0.2/dbus/dbus-sysdeps.c	2007-08-05 14:30:38.000000000 -0400
>@@ -45,6 +45,7 @@
> #ifdef HAVE_ERRNO_H
> #include <errno.h>
> #endif
>+#include <signal.h>
> 
> _DBUS_DEFINE_GLOBAL_LOCK (win_fds);
> _DBUS_DEFINE_GLOBAL_LOCK (sid_atom_cache);
>@@ -64,6 +65,20 @@ _DBUS_DEFINE_GLOBAL_LOCK (sid_atom_cache
>  */
> 
> /**
>+ * Terminates the program with SIGTERM.
>+ */
>+void
>+_dbus_terminate (void)
>+{
>+  
>+  _dbus_print_backtrace ();
>+  
>+  raise (SIGTERM);
>+  _dbus_sleep_milliseconds (1000);
>+  _dbus_exit (1); /* in case someone ignores SIGTERM ? */
>+}
>+
>+/**
>  * Aborts the program with SIGABRT (dumping core).
>  */
> void
>diff -urp dbus-1.0.2.orig/dbus/dbus-sysdeps.h dbus-1.0.2/dbus/dbus-sysdeps.h
>--- dbus-1.0.2.orig/dbus/dbus-sysdeps.h	2006-12-11 14:21:16.000000000 -0500
>+++ dbus-1.0.2/dbus/dbus-sysdeps.h	2007-08-05 14:29:42.000000000 -0400
>@@ -81,6 +81,7 @@ typedef struct DBusList DBusList;
>  * used to tell gcc about functions that never return, such as _dbus_abort()
>  */
> 
>+void _dbus_terminate (void) _DBUS_GNUC_NORETURN;
> void _dbus_abort (void) _DBUS_GNUC_NORETURN;
> 
> const char* _dbus_getenv (const char *varname);

Actions: View | Diff

Attachments on bug 250939: 160717