Attachment 15813 Details for Bug 15412 – Add --address=ADDRESS option

[patch] Add --address=ADDRESS option

dbus-send.c.address.patch (text/plain), 2.61 KB, created by Lawrence R. Steeger on 2008-04-10 12:01:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lawrence R. Steeger

Created: 2008-04-10 12:01:39 UTC

Size: 2.61 KB

patch

obsolete

>--- tools/dbus-send.c.git	2008-04-10 06:36:00.000000000 -0500
>+++ tools/dbus-send.c	2008-04-10 12:16:59.000000000 -0500
>@@ -33,7 +33,7 @@
> static void
> usage (int ecode)
> {
>-  fprintf (stderr, "Usage: %s [--help] [--system | --session] [--dest=NAME] [--type=TYPE] [--print-reply=(literal)] [--reply-timeout=MSEC] <destination object path> <message name> [contents ...]\n", appname);
>+  fprintf (stderr, "Usage: %s [--help] [--system | --session | --address=ADDRESS] [--dest=NAME] [--type=TYPE] [--print-reply=(literal)] [--reply-timeout=MSEC] <destination object path> <message name> [contents ...]\n", appname);
>   exit (ecode);
> }
> 
>@@ -222,6 +222,8 @@
>   const char *path = NULL;
>   int message_type = DBUS_MESSAGE_TYPE_SIGNAL;
>   const char *type_str = NULL;
>+  const char *address = NULL;
>+  int session_or_system = FALSE;
> 
>   appname = argv[0];
>   
>@@ -237,9 +239,25 @@
>       char *arg = argv[i];
> 
>       if (strcmp (arg, "--system") == 0)
>-	type = DBUS_BUS_SYSTEM;
>+        {
>+          type = DBUS_BUS_SYSTEM;
>+          session_or_system = TRUE;
>+        }
>       else if (strcmp (arg, "--session") == 0)
>-	type = DBUS_BUS_SESSION;
>+        {
>+          type = DBUS_BUS_SESSION;
>+          session_or_system = TRUE;
>+        }
>+      else if (strstr (arg, "--address=") == arg)
>+        {
>+          address = strchr (arg, '=') + 1;
>+
>+          if (address == NULL) 
>+            {
>+              fprintf (stderr, "\"--address=\" requires an ADDRESS\n");
>+              usage (1);
>+            }
>+        }
>       else if (strncmp (arg, "--print-reply", 13) == 0)
> 	{
> 	  print_reply = TRUE;
>@@ -271,6 +289,13 @@
>   if (name == NULL)
>     usage (1);
> 
>+  if (session_or_system &&
>+      (address != NULL))
>+    {
>+      fprintf (stderr, "\"--address\" may not be used with \"--system\" or \"--session\"\n");
>+      usage (1);
>+    }
>+
>   if (type_str != NULL)
>     {
>       message_type = dbus_message_type_from_string (type_str);
>@@ -284,11 +309,21 @@
>     }
>   
>   dbus_error_init (&error);
>-  connection = dbus_bus_get (type, &error);
>+
>+  if (address != NULL)
>+    {
>+      connection = dbus_connection_open (address, &error);
>+    }
>+  else
>+    {
>+      connection = dbus_bus_get (type, &error);
>+    }
>+
>   if (connection == NULL)
>     {
>-      fprintf (stderr, "Failed to open connection to %s message bus: %s\n",
>-	       (type == DBUS_BUS_SYSTEM) ? "system" : "session",
>+      fprintf (stderr, "Failed to open connection to \"%s\" message bus: %s\n",
>+               (address != NULL) ? address :
>+                 ((type == DBUS_BUS_SYSTEM) ? "system" : "session"),
>                error.message);
>       dbus_error_free (&error);
>       exit (1);

Actions: View | Splinter Review

Attachments on bug 15412: 15772 | 15781 | 15782 | 15801 | 15813 | 15814 | 15815 | 15816 | 15818 | 15819 | 15820 | 15822 | 15823

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.