disorder-choose rejects tracks in queue/recent list

[disorder] / server / dump.c

diff --git a/server/dump.c b/server/dump.c
index 3be14be56f9daaf1485f5bdbd10bc38f937afa38..18a2f6ee8816665f096d8cb8d2e5f61e79ae7987 100644 (file)
--- a/server/dump.c
+++ b/server/dump.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
 /*
  * This file is part of DisOrder.

- * Copyright (C) 2004, 2005, 2007 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -46,6 +46,7 @@
 #include "trackdb.h"
 #include "trackdb-int.h"
 #include "charset.h"
 #include "trackdb.h"
 #include "trackdb-int.h"
 #include "charset.h"

+#include "version.h"

 
 static const struct option options[] = {
   { "help", no_argument, 0, 'h' },
 
 static const struct option options[] = {
   { "help", no_argument, 0, 'h' },


@@ -82,13 +83,6 @@ static void help(void) {
   exit(0);
 }
 
   exit(0);
 }
 

-/* display version number and terminate */
-static void version(void) {
-  xprintf("%s", disorder_version_string);
-  xfclose(stdout);
-  exit(0);
-}
-

 /* dump prefs to FP, return nonzero on error */
 static void do_dump(FILE *fp, const char *tag,
                    int tracksdb, int searchdb) {
 /* dump prefs to FP, return nonzero on error */
 static void do_dump(FILE *fp, const char *tag,
                    int tracksdb, int searchdb) {


@@ -454,7 +448,7 @@ int main(int argc, char **argv) {
   while((n = getopt_long(argc, argv, "hVc:dDutsrRaP", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
   while((n = getopt_long(argc, argv, "hVc:dDutsrRaP", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();

-    case 'V': version();
+    case 'V': version("disorder-dump");

     case 'c': configfile = optarg; break;
     case 'd': dump = 1; break;
     case 'u': undump = 1; break;
     case 'c': configfile = optarg; break;
     case 'd': dump = 1; break;
     case 'u': undump = 1; break;