From 46278e05fb0394e57019240f75c18ed71b1bb375 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 2 Mar 2015 09:04:57 -0500
Subject: Generqte -V messages in a uniform way.

All regression tests pass.
---
 cgps.c      | 4 ++--
 gpsctl.c    | 4 ++--
 gpsd.c      | 2 +-
 gpsmon.c    | 2 +-
 gpxlogger.c | 3 ++-
 ntpshmmon.c | 4 ++--
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cgps.c b/cgps.c
index e2c9a7f8..a470745b 100644
--- a/cgps.c
+++ b/cgps.c
@@ -751,8 +751,8 @@ int main(int argc, char *argv[])
 	    break;
 	    /*@ +observertrans @*/
 	case 'V':
-	    (void)fprintf(stderr, "cgps: %s (revision %s)\n",
-			  VERSION, REVISION);
+	    (void)fprintf(stderr, "%s: %s (revision %s)\n",
+			  argv[0], VERSION, REVISION);
 	    exit(EXIT_SUCCESS);
 	case 'l':
 	    switch (optarg[0]) {
diff --git a/gpsctl.c b/gpsctl.c
index 0f000956..7f655959 100644
--- a/gpsctl.c
+++ b/gpsctl.c
@@ -315,8 +315,8 @@ int main(int argc, char **argv)
 #endif /* CLIENTDEBUG_ENABLE */
 	    break;
 	case 'V':
-	    (void)fprintf(stderr, "version %s (revision %s)\n",
-			  VERSION, REVISION);
+	    (void)fprintf(stderr, "%s: version %s (revision %s)\n",
+			  argv[0], VERSION, REVISION);
 	    exit(EXIT_SUCCESS);
 	case 'h':
 	default:
diff --git a/gpsd.c b/gpsd.c
index 01bf6e8c..ff42b7cb 100644
--- a/gpsd.c
+++ b/gpsd.c
@@ -1860,7 +1860,7 @@ int main(int argc, char *argv[])
 	    pid_file = optarg;
 	    break;
 	case 'V':
-	    (void)printf("gpsd: %s (revision %s)\n", VERSION, REVISION);
+	    (void)printf("%s: %s (revision %s)\n", argv[0], VERSION, REVISION);
 	    exit(EXIT_SUCCESS);
 	case 'h':
 	case '?':
diff --git a/gpsmon.c b/gpsmon.c
index 106f3a1c..04739324 100644
--- a/gpsmon.c
+++ b/gpsmon.c
@@ -1228,7 +1228,7 @@ int main(int argc, char **argv)
 	    }
 	    exit(EXIT_SUCCESS);
 	case 'V':
-	    (void)printf("gpsmon: %s (revision %s)\n", VERSION, REVISION);
+	    (void)printf("%s: %s (revision %s)\n", argv[0], VERSION, REVISION);
 	    exit(EXIT_SUCCESS);
 	case 'l':		/* enable logging at startup */
 	    logfile = fopen(optarg, "w");
diff --git a/gpxlogger.c b/gpxlogger.c
index 9f100746..b149729d 100644
--- a/gpxlogger.c
+++ b/gpxlogger.c
@@ -276,7 +276,8 @@ int main(int argc, char **argv)
 	    minmove = (double )atoi(optarg);
 	    break;
 	case 'V':
-	    (void)fprintf(stderr, "%s revision " REVISION "\n", progname);
+	    (void)fprintf(stderr, "%s: version %s (revision %s)\n", 
+			  progname, VERSION, REVISION);
 	    exit(EXIT_SUCCESS);
 	default:
 	    usage();
diff --git a/ntpshmmon.c b/ntpshmmon.c
index 8a3b5321..56d7a66f 100644
--- a/ntpshmmon.c
+++ b/ntpshmmon.c
@@ -53,8 +53,8 @@ int main(int argc, char **argv)
 	    verbose = true;
 	    break;
 	case 'V':
-	    (void)fprintf(stderr, "version %s (revision %s)\n",
-			  VERSION, REVISION);
+	    (void)fprintf(stderr, "%s: version %s (revision %s)\n",
+			  argv[0], VERSION, REVISION);
 	    exit(EXIT_SUCCESS);
 	case 'h':
 	default:
-- 
cgit v1.2.1