[Pkg-wmaker-commits] [wmix] 25/44: wmix: always display the version information when verbose is asked

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository wmix.

commit bfb9f803b1d81d8580663c35de58167206014664
Author: Christophe CURIS <christophe.curis at free.fr>
Date:   Sat Jun 7 21:21:53 2014 +0200

    wmix: always display the version information when verbose is asked
    
    Signed-off-by: Christophe CURIS <christophe.curis at free.fr>
---
 config.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/config.c b/config.c
index ee0a024..6a3c822 100644
--- a/config.c
+++ b/config.c
@@ -32,8 +32,10 @@
 #include "include/config.h"
 
 
-#define HELP_TEXT	  \
-	"WMixer " VERSION " by timecop at japan.co.jp + skunk at mit.edu\n" \
+#define VERSION_TEXT \
+	"WMixer " VERSION " by timecop at japan.co.jp + skunk at mit.edu\n"
+
+#define HELP_TEXT \
 	"usage:\n" \
 	"  -d <dsp>  connect to remote X display\n" \
 	"  -e <name> exclude channel, can be used many times\n" \
@@ -151,6 +153,7 @@ void parse_cli_options(int argc, char **argv)
 			break;
 
 		case 'h':
+			fputs(VERSION_TEXT, stdout);
 			fputs(HELP_TEXT, stdout);
 			exit(0);
 			break;
@@ -178,6 +181,9 @@ void parse_cli_options(int argc, char **argv)
 
 	if (error_found)
 		exit(EXIT_FAILURE);
+
+	if (config.verbose)
+		fputs(VERSION_TEXT, stdout);
 }
 
 /*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmix.git