diff options
author | Eric S. Raymond <esr@thyrsus.com> | 2015-03-02 09:04:57 -0500 |
---|---|---|
committer | Eric S. Raymond <esr@thyrsus.com> | 2015-03-02 09:06:02 -0500 |
commit | 46278e05fb0394e57019240f75c18ed71b1bb375 (patch) | |
tree | 07f94320bca506111d609091c4e3f4aab384a561 | |
parent | 8868f9806fecf0be39b299e62534f685855c2653 (diff) | |
download | gpsd-46278e05fb0394e57019240f75c18ed71b1bb375.tar.gz |
Generqte -V messages in a uniform way.
All regression tests pass.
-rw-r--r-- | cgps.c | 4 | ||||
-rw-r--r-- | gpsctl.c | 4 | ||||
-rw-r--r-- | gpsd.c | 2 | ||||
-rw-r--r-- | gpsmon.c | 2 | ||||
-rw-r--r-- | gpxlogger.c | 3 | ||||
-rw-r--r-- | ntpshmmon.c | 4 |
6 files changed, 10 insertions, 9 deletions
@@ -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]) { @@ -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: @@ -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 '?': @@ -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: |