fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-09 07:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2004-08-11 Colin Walters <walters@redhat.com>

Browse source 
* tools/dbus-send.c (main, usage): Add --reply-timeout
	argument.
This commit is contained in:
Colin Walters 2004-08-11 14:59:34 +00:00
parent eb37885909
commit fefa40496b
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-08-11 Colin Walters <walters@redhat.com>
* tools/dbus-send.c (main, usage): Add --reply-timeout
argument.
2004-08-10 Olivier Andrieu <oliv__a@users.sourceforge.net> 2004-08-10 Olivier Andrieu <oliv__a@users.sourceforge.net>
* bus/bus.c (process_config_first_time_only): get rid of an unused * bus/bus.c (process_config_first_time_only): get rid of an unused

11
tools/dbus-send.c
View file

@ -30,7 +30,7 @@
static void static void
usage (char *name, int ecode) usage (char *name, int ecode)
{ {
fprintf (stderr, "Usage: %s [--help] [--system | --session] [--dest=SERVICE] [--type=TYPE] [--print-reply] <destination object path> <message name> [contents ...]\n", name); fprintf (stderr, "Usage: %s [--help] [--system | --session] [--dest=SERVICE] [--type=TYPE] [--print-reply] [--reply-timeout=MSEC] <destination object path> <message name> [contents ...]\n", name);
exit (ecode); exit (ecode);
} }
@ -41,6 +41,7 @@ main (int argc, char *argv[])
DBusError error; DBusError error;
DBusMessage *message; DBusMessage *message;
int print_reply; int print_reply;
int reply_timeout;
DBusMessageIter iter; DBusMessageIter iter;
int i; int i;
DBusBusType type = DBUS_BUS_SESSION; DBusBusType type = DBUS_BUS_SESSION;
@ -54,6 +55,7 @@ main (int argc, char *argv[])
usage (argv[0], 1); usage (argv[0], 1);
print_reply = FALSE; print_reply = FALSE;
reply_timeout = -1;
for (i = 1; i < argc && name == NULL; i++) for (i = 1; i < argc && name == NULL; i++)
{ {
@ -68,6 +70,11 @@ main (int argc, char *argv[])
print_reply = TRUE; print_reply = TRUE;
message_type = DBUS_MESSAGE_TYPE_METHOD_CALL; message_type = DBUS_MESSAGE_TYPE_METHOD_CALL;
} }
else if (strstr (arg, "--reply-timeout=") == arg)
{
reply_timeout = strtol (strchr (arg, '=') + 1,
NULL, 10);
}
else if (strstr (arg, "--dest=") == arg) else if (strstr (arg, "--dest=") == arg)
dest = strchr (arg, '=') + 1; dest = strchr (arg, '=') + 1;
else if (strstr (arg, "--type=") == arg) else if (strstr (arg, "--type=") == arg)
@ -254,7 +261,7 @@ main (int argc, char *argv[])
dbus_error_init (&error); dbus_error_init (&error);
reply = dbus_connection_send_with_reply_and_block (connection, reply = dbus_connection_send_with_reply_and_block (connection,
message, -1, message, reply_timeout,
&error); &error);
if (dbus_error_is_set (&error)) if (dbus_error_is_set (&error))
{ {