Attachment 125213 Details for Bug 97008 – _dbus_become_daemon: use _dbus_ensure_standard_fds, and report errors

[patch] _dbus_become_daemon: use _dbus_ensure_standard_fds, and report errors

dbusbecomedaemon-use-dbusensurestandardfds-and-rep.patch (text/plain), 1.94 KB, created by Simon McVittie on 2016-07-21 10:22:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

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

Size: 1.94 KB

patch

obsolete

>From d7d9018bc4522f563c76b1e0f72aaa8d70432d58 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@debian.org>
>Date: Thu, 21 Jul 2016 08:25:21 +0100
>Subject: [PATCH] _dbus_become_daemon: use _dbus_ensure_standard_fds, and
> report errors
>
>Signed-off-by: Simon McVittie <smcv@debian.org>
>---
> dbus/dbus-sysdeps-util-unix.c | 29 ++++++++++++-----------------
> 1 file changed, 12 insertions(+), 17 deletions(-)
>
>diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
>index 1f9ddb9..32599f7 100644
>--- a/dbus/dbus-sysdeps-util-unix.c
>+++ b/dbus/dbus-sysdeps-util-unix.c
>@@ -89,7 +89,7 @@ _dbus_become_daemon (const DBusString *pidfile,
> {
>   const char *s;
>   pid_t child_pid;
>-  int dev_null_fd;
>+  DBusEnsureStandardFdsFlags flags;
> 
>   _dbus_verbose ("Becoming a daemon...\n");
> 
>@@ -114,23 +114,18 @@ _dbus_become_daemon (const DBusString *pidfile,
>     case 0:
>       _dbus_verbose ("in child, closing std file descriptors\n");
> 
>-      /* silently ignore failures here, if someone
>-       * doesn't have /dev/null we may as well try
>-       * to continue anyhow
>-       */
>-      
>-      dev_null_fd = open ("/dev/null", O_RDWR);
>-      if (dev_null_fd >= 0)
>+      flags = DBUS_FORCE_STDIN_NULL | DBUS_FORCE_STDOUT_NULL;
>+      s = _dbus_getenv ("DBUS_DEBUG_OUTPUT");
>+
>+      if (s == NULL || *s == '\0')
>+        flags |= DBUS_FORCE_STDERR_NULL;
>+      else
>+        _dbus_verbose ("keeping stderr open due to DBUS_DEBUG_OUTPUT\n");
>+
>+      if (!_dbus_ensure_standard_fds (flags, &s))
>         {
>-          dup2 (dev_null_fd, 0);
>-          dup2 (dev_null_fd, 1);
>-          
>-          s = _dbus_getenv ("DBUS_DEBUG_OUTPUT");
>-          if (s == NULL || *s == '\0')
>-            dup2 (dev_null_fd, 2);
>-          else
>-            _dbus_verbose ("keeping stderr open due to DBUS_DEBUG_OUTPUT\n");
>-          close (dev_null_fd);
>+          _dbus_warn ("%s: %s", s, _dbus_strerror (errno));
>+          _exit (1);
>         }
> 
>       if (!keep_umask)
>-- 
>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.