Attachment 125215 Details for Bug 97008 – dbus-launch: use _dbus_ensure_standard_fds() in the babysitter

[patch] dbus-launch: use _dbus_ensure_standard_fds() in the babysitter

dbus-launch-use-dbusensurestandardfds-in-the-babys.patch (text/plain), 1.91 KB, created by Simon McVittie on 2016-07-21 10:23:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2016-07-21 10:23:34 UTC

Size: 1.91 KB

patch

obsolete

>From 5275ab027cf9abd0db260baa9135ddec9d776851 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@debian.org>
>Date: Thu, 21 Jul 2016 08:26:40 +0100
>Subject: [PATCH] dbus-launch: use _dbus_ensure_standard_fds() in the
> babysitter
>
>Signed-off-by: Simon McVittie <smcv@debian.org>
>---
> tools/dbus-launch.c | 32 +++++++++++++++-----------------
> 1 file changed, 15 insertions(+), 17 deletions(-)
>
>diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
>index 763c7b8..1a39800 100644
>--- a/tools/dbus-launch.c
>+++ b/tools/dbus-launch.c
>@@ -612,8 +612,8 @@ babysit (int   exit_with_session,
>          pid_t child_pid,
>          int   read_bus_pid_fd)  /* read pid from here */
> {
>+  DBusEnsureStandardFdsFlags flags;
>   int ret;
>-  int dev_null_fd;
>   const char *s;
> 
>   verbose ("babysitting, exit_with_session = %d, child_pid = %ld, read_bus_pid_fd = %d\n",
>@@ -633,28 +633,26 @@ babysit (int   exit_with_session,
>       exit (1);
>     }
> 
>+  flags = DBUS_FORCE_STDOUT_NULL;
>+
>+  if (!exit_with_session)
>+    flags |= DBUS_FORCE_STDIN_NULL;
>+
>+  s = getenv ("DBUS_DEBUG_OUTPUT");
>+
>+  if (s == NULL || *s == '\0')
>+    flags |= DBUS_FORCE_STDERR_NULL;
>+
>   /* Close stdout/stderr so we don't block an "eval" or otherwise
>    * lock up. stdout is still chaining through to dbus-launch
>    * and in turn to the parent shell.
>    */
>-  dev_null_fd = open ("/dev/null", O_RDWR);
>-  if (dev_null_fd >= 0)
>+  if (!_dbus_ensure_standard_fds (flags, &s))
>     {
>-      if (!exit_with_session)
>-        dup2 (dev_null_fd, 0);
>-      dup2 (dev_null_fd, 1);
>-      s = getenv ("DBUS_DEBUG_OUTPUT");
>-      if (s == NULL || *s == '\0')
>-        dup2 (dev_null_fd, 2);
>-      close (dev_null_fd);
>-    }
>-  else
>-    {
>-      fprintf (stderr, "Failed to open /dev/null: %s\n",
>-               strerror (errno));
>-      /* continue, why not */
>+      fprintf (stderr, "%s: %s\n", s, strerror (errno));
>+      exit (1);
>     }
>-  
>+
>   ret = fork ();
> 
>   if (ret < 0)
>-- 
>2.8.1

Actions: View | Splinter Review

Attachments on bug 97008: 125161 | 125162 | 125163 | 125164 | 125165 | 125166 | 125167 | 125168 | 125169 | 125170 | 125207 | 125208 | 125210 | 125212 | 125213 | 125215 | 125217 | 125218 | 125219 | 125220 | 125221

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.