chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge more 3.0 branch changes
[disorder]
/
server
/
dbupgrade.c
diff --git
a/server/dbupgrade.c
b/server/dbupgrade.c
index 0d8600d7e8ab8b93cfe8dad1f41b696552ce0102..f972b5984f25e5746e6fef8274fc5b9c7388106b 100644
(file)
--- a/
server/dbupgrade.c
+++ b/
server/dbupgrade.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder
/*
* 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
*
* 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
@@
-40,6
+40,7
@@
#include "mem.h"
#include "configuration.h"
#include "unicode.h"
#include "mem.h"
#include "configuration.h"
#include "unicode.h"
+#include "version.h"
static DB_TXN *global_tid;
static DB_TXN *global_tid;
@@
-85,13
+86,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);
-}
-
/** @brief Visit each key in a database and call @p callback
* @return 0 or DB_LOCK_DEADLOCK
*
/** @brief Visit each key in a database and call @p callback
* @return 0 or DB_LOCK_DEADLOCK
*
@@
-343,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();
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;
case 'c': configfile = optarg; break;
case 'd': debugging = 1; break;
case 'D': debugging = 0; break;