dbus: add _dbus_transport_open_unixexec()

Split _dbus_transport_open_unix_socket() to leave the "unixexec:"
handling to the unix-specific unit.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

diff --git a/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c
index 9931da5141d23611d5c08e993572588c7bc48fef..3afcb9397708f8d3f9573b0ca12b8a211e921265 100644 (file)
--- a/dbus/dbus-transport-unix.c
+++ b/dbus/dbus-transport-unix.c
@@ -272,7 +272,24 @@ _dbus_transport_open_unix_socket (DBusAddressEntry  *entry,
           return DBUS_TRANSPORT_OPEN_OK;
         }
     }
-  else if (strcmp (method, "unixexec") == 0)
+  else
+    {
+      _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+      return DBUS_TRANSPORT_OPEN_NOT_HANDLED;
+    }
+}
+
+DBusTransportOpenResult
+_dbus_transport_open_unixexec (DBusAddressEntry  *entry,
+                               DBusTransport    **transport_p,
+                               DBusError         *error)
+{
+  const char *method;
+
+  method = dbus_address_entry_get_method (entry);
+  _dbus_assert (method != NULL);
+
+  if (strcmp (method, "unixexec") == 0)
     {
       const char *path;
       unsigned i;

diff --git a/dbus/dbus-transport-unix.h b/dbus/dbus-transport-unix.h
index 952fa0a45626e2e5e7880459c7e75ddc8517ef58..137311d7622442d157579ffd55bf5598c2878d51 100644 (file)
--- a/dbus/dbus-transport-unix.h
+++ b/dbus/dbus-transport-unix.h
@@ -35,6 +35,9 @@ DBusTransportOpenResult _dbus_transport_open_unix_socket (DBusAddressEntry  *ent
                                                           DBusTransport    **transport_p,
                                                           DBusError         *error);
 
+DBusTransportOpenResult _dbus_transport_open_unixexec (DBusAddressEntry  *entry,
+                                                       DBusTransport    **transport_p,
+                                                       DBusError         *error);
 DBUS_END_DECLS
 
 #endif /* DBUS_TRANSPORT_UNIX_H */

diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
index 9e189f84074d33463d09d0f06fe6a5f334b7b5f3..dcb7440487097c62cdf49bd61c765a8c989d46e2 100644 (file)
--- a/dbus/dbus-transport.c
+++ b/dbus/dbus-transport.c
@@ -350,6 +350,7 @@ static const struct {
   { _dbus_transport_open_socket },
 #ifndef _WIN32 /* FIXME: removed in next patch */
   { _dbus_transport_open_unix_socket },
+  { _dbus_transport_open_unixexec },
 #endif
   { _dbus_transport_open_platform_specific },
   { _dbus_transport_open_autolaunch }