|
 |
a547b4 |
From e22b6b97a067d7c10bfba64fbef60afa777f6275 Mon Sep 17 00:00:00 2001
|
|
|
a547b4 |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
a547b4 |
Date: Thu, 6 Jun 2013 17:00:22 +0200
|
|
|
a547b4 |
Subject: [PATCH] vdagent[d]: Add printing of version to -h output
|
|
|
a547b4 |
|
|
|
a547b4 |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
a547b4 |
(cherry picked from commit 256e01c8c7b0c386525a0fac71537bb7bb05d271)
|
|
|
a547b4 |
---
|
|
|
a547b4 |
src/vdagent.c | 6 +++---
|
|
|
a547b4 |
src/vdagentd.c | 4 ++--
|
|
|
a547b4 |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
a547b4 |
|
|
|
a547b4 |
diff --git a/src/vdagent.c b/src/vdagent.c
|
|
|
a547b4 |
index 7e1b474..9e238d3 100644
|
|
|
a547b4 |
--- a/src/vdagent.c
|
|
|
a547b4 |
+++ b/src/vdagent.c
|
|
|
a547b4 |
@@ -132,15 +132,15 @@ static void usage(FILE *fp)
|
|
|
a547b4 |
{
|
|
|
a547b4 |
fprintf(fp,
|
|
|
a547b4 |
"Usage: spice-vdagent [OPTIONS]\n\n"
|
|
|
a547b4 |
- "Spice guest agent X11 session agent.\n\n"
|
|
|
a547b4 |
+ "Spice guest agent X11 session agent, version %s.\n\n"
|
|
|
a547b4 |
"Options:\n"
|
|
|
a547b4 |
" -h print this text\n"
|
|
|
a547b4 |
" -d log debug messages\n"
|
|
|
a547b4 |
" -s <port> set virtio serial port\n"
|
|
|
a547b4 |
" -x don't daemonize\n"
|
|
|
a547b4 |
" -f <dir|xdg-desktop|xdg-download> file xfer save dir\n"
|
|
|
a547b4 |
- " -o <0|1> open dir on file xfer completion\n"
|
|
|
a547b4 |
- );
|
|
|
a547b4 |
+ " -o <0|1> open dir on file xfer completion\n",
|
|
|
a547b4 |
+ VERSION);
|
|
|
a547b4 |
}
|
|
|
a547b4 |
|
|
|
a547b4 |
static void quit_handler(int sig)
|
|
|
a547b4 |
diff --git a/src/vdagentd.c b/src/vdagentd.c
|
|
|
a547b4 |
index fbbe315..1ba957a 100644
|
|
|
a547b4 |
--- a/src/vdagentd.c
|
|
|
a547b4 |
+++ b/src/vdagentd.c
|
|
|
a547b4 |
@@ -718,7 +718,7 @@ static void usage(FILE *fp)
|
|
|
a547b4 |
{
|
|
|
a547b4 |
fprintf(fp,
|
|
|
a547b4 |
"Usage: spice-vdagentd [OPTIONS]\n\n"
|
|
|
a547b4 |
- "Spice guest agent daemon.\n\n"
|
|
|
a547b4 |
+ "Spice guest agent daemon, version %s.\n\n"
|
|
|
a547b4 |
"Options:\n"
|
|
|
a547b4 |
" -h print this text\n"
|
|
|
a547b4 |
" -d log debug messages (use twice for extra info)\n"
|
|
|
a547b4 |
@@ -731,7 +731,7 @@ static void usage(FILE *fp)
|
|
|
a547b4 |
#ifdef HAVE_LIBSYSTEMD_LOGIN
|
|
|
a547b4 |
" -X Disable systemd-logind integration\n"
|
|
|
a547b4 |
#endif
|
|
|
a547b4 |
- ,portdev, uinput_device);
|
|
|
a547b4 |
+ ,VERSION, portdev, uinput_device);
|
|
|
a547b4 |
}
|
|
|
a547b4 |
|
|
|
a547b4 |
void daemonize(void)
|