From 3e8d2aa23e88ef60ec6672c5ba9fdee17daa6a11 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 8 Feb 2012 14:14:01 +0000 Subject: [PATCH 2/3] dbus-send.1, dbus-send: document --print-reply=literal consistently Bug: https://bugs.freedesktop.org/show_bug.cgi?id=14005 Signed-off-by: Simon McVittie --- doc/dbus-send.1 | 10 ++++++++-- tools/dbus-send.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/dbus-send.1 b/doc/dbus-send.1 index 1042cbb..a70dc3f 100644 --- a/doc/dbus-send.1 +++ b/doc/dbus-send.1 @@ -10,7 +10,7 @@ dbus\-send \- Send a message to a message bus .B dbus\-send [\fB\-\-system\fP | \fB\-\-session\fP] [\fB\-\-dest=\fINAME\fP] -[\fB\-\-print\-reply\fP] +[\fB\-\-print\-reply\fP[\fB=literal\fP]] [\fB\-\-type=\fITYPE\fP] \fIOBJECT_PATH\fP \fIINTERFACE\fB.\fIMEMBER\fP [\fICONTENTS\fP ...] @@ -79,7 +79,13 @@ The following options are supported: Specify the name of the connection to receive the message. .TP .B "\-\-print\-reply" -Block for a reply to the message sent, and print any reply received. +Block for a reply to the message sent, and print any reply received +in a human-readable form. +.TP +.B "\-\-print\-reply=literal" +Block for a reply to the message sent, and print the body of the +reply. If the reply is an object path or a string, it is printed +literally, with no punctuation, escape characters etc. .TP .B "\-\-system" Send to the system message bus. diff --git a/tools/dbus-send.c b/tools/dbus-send.c index e5df15c..e403a58 100644 --- 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 | --address=ADDRESS] [--dest=NAME] [--type=TYPE] [--print-reply=(literal)] [--reply-timeout=MSEC] [contents ...]\n", appname); + fprintf (stderr, "Usage: %s [--help] [--system | --session | --address=ADDRESS] [--dest=NAME] [--type=TYPE] [--print-reply[=literal]] [--reply-timeout=MSEC] [contents ...]\n", appname); exit (ecode); } -- 1.7.9