X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/f15929695c1154fc9959e66ecb1d4aad1558fe0a..30d030b163ea4224ff2eaaf7708d794d76b93cee:/clients/disorder.c

diff --git a/clients/disorder.c b/clients/disorder.c
index 2d3cb9f..caeac18 100644
--- a/clients/disorder.c
+++ b/clients/disorder.c
@@ -53,6 +53,7 @@
 #include "defs.h"
 #include "authorize.h"
 #include "vector.h"
+#include "version.h"
 
 static disorder_client *client;
 
@@ -84,13 +85,6 @@ static void help(void) {
   exit(0);
 }
 
-/* display version number and terminate */
-static void version(void) {
-  xprintf("%s", disorder_version_string);
-  xfclose(stdout);
-  exit(0);
-}
-
 static disorder_client *getclient(void) {
   if(!client) {
     if(!(client = disorder_new(1))) exit(EXIT_FAILURE);
@@ -618,11 +612,11 @@ int main(int argc, char **argv) {
   pcre_malloc = xmalloc;
   pcre_free = xfree;
   if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
-  while((n = getopt_long(argc, argv, "hVc:dHlNu:p:", options, 0)) >= 0) {
+  while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
     case 'H': help_commands();
-    case 'V': version();
+    case 'V': version("disorder");
     case 'c': configfile = optarg; break;
     case 'd': debugging = 1; break;
     case 'l': local = 1; break;