From 8ef0764aacf913cb70ea90bb6d33910d92280a51 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 17 Jan 2008 06:14:43 +0200
Subject: [PATCH] s-s-d: Move version output from --help to --version

---
 ChangeLog                 |  6 ++++++
 utils/start-stop-daemon.c | 16 ++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index acc6ee1b..73293e6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-17  Guillem Jover  <guillem@debian.org>
+
+	* utils/start-stop-daemon.c (do_help): Move version printing to ...
+	(do_version): ... here. New function.
+	(main): Call do_version instead of printf.
+
 2008-01-17  Raphael Hertzog  <hertzog@debian.org>
 
 	* scripts/dpkg-genchanges.pl: Reinstate support of the ${Format}
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index c384031e..7994b5b5 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -338,9 +338,6 @@ static void
 do_help(void)
 {
 	printf(
-"start-stop-daemon %s for Debian - small and fast C version written by\n"
-"Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>, public domain.\n"
-"\n"
 "Usage: start-stop-daemon [<option> ...] <command>\n"
 "\n"
 "Commands:\n"
@@ -379,8 +376,15 @@ do_help(void)
 "or <schedule> may be just <timeout>, meaning <signal>/<timeout>/KILL/<timeout>\n"
 "\n"
 "Exit status:  0 = done      1 = nothing done (=> 0 if --oknodo)\n"
-"              3 = trouble   2 = with --retry, processes wouldn't die\n",
-	       VERSION);
+"              3 = trouble   2 = with --retry, processes wouldn't die\n");
+}
+
+static void
+do_version(void)
+{
+	printf("start-stop-daemon %s for Debian\n\n", VERSION)
+
+	printf("Written by Marek Michalkiewicz, public domain.\n");
 }
 
 static void
@@ -597,7 +601,7 @@ parse_options(int argc, char * const *argv)
 			start = 1;
 			break;
 		case 'V':  /* --version */
-			printf("start-stop-daemon " VERSION "\n");
+			do_version();
 			exit(0);
 		case 'a':  /* --startas <pathname> */
 			startas = optarg;
-- 
2.39.5