X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/a05e4467dee55248f2135dcb532b4729154d69c5..f6b388d05bcded62082eb4e97f3e97f1b638ba1f:/server/dbupgrade.c diff --git a/server/dbupgrade.c b/server/dbupgrade.c index b4cf58e..f972b59 100644 --- a/server/dbupgrade.c +++ b/server/dbupgrade.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 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 @@ -34,11 +34,13 @@ #include "log.h" #include "defs.h" #include "kvp.h" +#include "rights.h" #include "trackdb.h" #include "trackdb-int.h" #include "mem.h" #include "configuration.h" #include "unicode.h" +#include "version.h" static DB_TXN *global_tid; @@ -84,13 +86,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); -} - /** @brief Visit each key in a database and call @p callback * @return 0 or DB_LOCK_DEADLOCK * @@ -342,7 +337,7 @@ int main(int argc, char **argv) { while((n = getopt_long(argc, argv, "hVc:dDSsxX", options, 0)) >= 0) { switch(n) { case 'h': help(); - case 'V': version(); + case 'V': version("disorder-dbupgrade"); case 'c': configfile = optarg; break; case 'd': debugging = 1; break; case 'D': debugging = 0; break;