Attachment 9944 Details for Bug 10929 – Ignore SIGPIPE when writing PID

[patch] Ignore SIGPIPE when writing PID

dbus.diff (text/plain), 1.67 KB, created by Joe Marcus Clarke on 2007-05-12 09:18:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joe Marcus Clarke

Created: 2007-05-12 09:18:14 UTC

Size: 1.67 KB

patch

obsolete

>--- bus/bus.c.orig	Wed Mar 21 16:20:57 2007
>+++ bus/bus.c	Wed Mar 21 16:22:08 2007
>@@ -21,6 +21,7 @@
>  *
>  */
> 
>+#include <signal.h>
> #include "bus.h"
> #include "activation.h"
> #include "connection.h"
>@@ -731,14 +732,18 @@ bus_context_new (const DBusString *confi
>         }
> 
>       bytes = _dbus_string_get_length (&pid);
>-      if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes)
>+      signal (SIGPIPE, SIG_IGN);
>+      if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes &&
>+          errno != EPIPE)
>         {
>           dbus_set_error (error, DBUS_ERROR_FAILED,
>                           "Printing message bus PID: %s\n",
>                           _dbus_strerror (errno));
>           _dbus_string_free (&pid);
>+	  signal (SIGPIPE, SIG_DFL);
>           goto failed;
>         }
>+      signal (SIGPIPE, SIG_DFL);
> 
>       if (print_pid_fd > 2)
>         _dbus_close_socket (print_pid_fd, NULL);
>--- dbus/dbus-sysdeps-util-unix.c.orig	Mon Dec 11 14:21:10 2006
>+++ dbus/dbus-sysdeps-util-unix.c	Wed Mar 21 16:22:45 2007
>@@ -157,15 +157,19 @@ _dbus_become_daemon (const DBusString *p
> 	    }
> 	  
> 	  bytes = _dbus_string_get_length (&pid);
>-	  if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes)
>+	  signal (SIGPIPE, SIG_IGN);
>+	  if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes &&
>+              errno != EPIPE)
> 	    {
> 	      dbus_set_error (error, DBUS_ERROR_FAILED,
> 			      "Printing message bus PID: %s\n",
> 			      _dbus_strerror (errno));
> 	      _dbus_string_free (&pid);
>               kill (child_pid, SIGTERM);
>+	      signal (SIGPIPE, SIG_DFL);
> 	      return FALSE;
> 	    }
>+	  signal (SIGPIPE, SIG_DFL);
> 	  
> 	  _dbus_string_free (&pid);
> 	}

Actions: View | Splinter Review

Attachments on bug 10929: 9944 | 13764

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.