From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 8 Feb 2012 14:14:01 +0000 (+0000)
Subject: dbus-send.1, dbus-send: document --print-reply=literal consistently
X-Git-Tag: dbus-1.5.10~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=666344fc6739e76e50811e9a72890387cfe37cb3;p=thirdparty%2Fdbus.git

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 <simon.mcvittie@collabora.co.uk>
Reviewed-by: Lennart Poettering <lennart@poettering.net>
---

diff --git a/doc/dbus-send.1 b/doc/dbus-send.1
index 1042cbbad..a70dc3ff0 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 e5df15cf6..e403a5873 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] <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);
 }