fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-01 14:00:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit 5b74af796c.
This commit is contained in:
Simon McVittie 2013-10-09 11:17:20 +01:00
parent d842e6edd1
commit 39673b945c
1 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
tools/dbus-send.c
View file

@ -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)
{