Revert "dbus-send: replace --address"... to fix attribution

This reverts commit 5b74af796c8f1d9f3f60594f22c6bfd4c097ad8b.

diff --git a/tools/dbus-send.c b/tools/dbus-send.c
index d3ff2589895fae611523d0f7b623cd6935f9e5d3..2e37b08982166b442d46671319805946efdcc793 100644 (file)
--- a/tools/dbus-send.c
+++ b/tools/dbus-send.c
@@ -51,7 +51,7 @@ static const char *appname;
 static void
 usage (int ecode)
 {
-  fprintf (stderr, "Usage: %s [--help] [--system | --session | --bus=ADDRESS | --peer=ADDRESS] [--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);
 }
 
@@ -241,7 +241,6 @@ main (int argc, char *argv[])
   int message_type = DBUS_MESSAGE_TYPE_SIGNAL;
   const char *type_str = NULL;
   const char *address = NULL;
-  int is_bus = FALSE;
   int session_or_system = FALSE;
 
   appname = argv[0];
@@ -267,28 +266,14 @@ main (int argc, char *argv[])
          type = DBUS_BUS_SESSION;
           session_or_system = TRUE;
         }
-      else if ((strstr (arg, "--bus=") == arg) || (strstr (arg, "--peer=") == arg) || (strstr (arg, "--address=") == arg))
+      else if (strstr (arg, "--address=") == arg)
         {
-          if (arg[2] == 'b') /* bus */
+          if (*(strchr (arg, '=') + 1) == '\0')
             {
-              is_bus = TRUE;
-            }
-          else if (arg[2] == 'p') /* peer */
-            {
-              is_bus = FALSE;
-            }
-          else /* address; keeping backwards compatibility */
-            {
-              is_bus = FALSE;
-            }
-
-          address = strchr (arg, '=') + 1;
-
-          if (address[0] == '\0')
-            {
-              fprintf (stderr, "\"--peer=\" and \"--bus=\" require an ADDRESS\n");
+              fprintf (stderr, "\"--address=\" requires an ADDRESS\n");
               usage (1);
             }
+          address = strchr (arg, '=') + 1;
         }
       else if (strncmp (arg, "--print-reply", 13) == 0)
        {
@@ -345,7 +330,7 @@ main (int argc, char *argv[])
   if (session_or_system &&
       (address != NULL))
     {
-      fprintf (stderr, "\"--peer\" and \"--bus\" may not be used with \"--system\" or \"--session\"\n");
+      fprintf (stderr, "\"--address\" may not be used with \"--system\" or \"--session\"\n");
       usage (1);
     }
 
@@ -387,16 +372,6 @@ main (int argc, char *argv[])
       dbus_error_free (&error);
       exit (1);
     }
-  else if ((address != NULL) && is_bus)
-    {
-      if (!dbus_bus_register (connection, &error))
-        {
-          fprintf (stderr, "Failed to register on connection to \"%s\" message bus: %s\n",
-                   address, error.message);
-          dbus_error_free (&error);
-          exit (1);
-        }
-    }
 
   if (message_type == DBUS_MESSAGE_TYPE_METHOD_CALL)
     {