X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/71b70599a2cd81c13cc4326499a5d0c45358cd7d..64c12487df48a8b90f663fefda6b82980fd3a059:/server/dump.c
diff --git a/server/dump.c b/server/dump.c
index 119875f..e08b32f 100644
--- a/server/dump.c
+++ b/server/dump.c
@@ -1,49 +1,24 @@
/*
* This file is part of DisOrder.
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see .
*/
-
-#include
-#include "types.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "configuration.h"
-#include "syscalls.h"
-#include "log.h"
-#include "client.h"
-#include "sink.h"
-#include "mem.h"
-#include "defs.h"
-#include "printf.h"
-#include "kvp.h"
-#include "vector.h"
-#include "inputline.h"
-#include "trackdb.h"
-#include "trackdb-int.h"
-#include "charset.h"
+/** @file server/dump.c
+ * @brief Dump and restore database contents
+ */
+#include "disorder-server.h"
static const struct option options[] = {
{ "help", no_argument, 0, 'h' },
@@ -80,13 +55,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);
-}
-
/* dump prefs to FP, return nonzero on error */
static void do_dump(FILE *fp, const char *tag,
int tracksdb, int searchdb) {
@@ -140,6 +108,41 @@ static void do_dump(FILE *fp, const char *tag,
if(trackdb_closecursor(cursor)) { cursor = 0; goto fail; }
cursor = 0;
+ /* dump the users */
+ cursor = trackdb_opencursor(trackdb_usersdb, tid);
+ err = cursor->c_get(cursor, prepare_data(&k), prepare_data(&d),
+ DB_FIRST);
+ while(err == 0) {
+ if(fputc('U', fp) < 0
+ || urlencode(s, k.data, k.size)
+ || fputc('\n', fp) < 0
+ || urlencode(s, d.data, d.size)
+ || fputc('\n', fp) < 0)
+ fatal(errno, "error writing to %s", tag);
+ err = cursor->c_get(cursor, prepare_data(&k), prepare_data(&d),
+ DB_NEXT);
+ }
+ if(trackdb_closecursor(cursor)) { cursor = 0; goto fail; }
+ cursor = 0;
+
+ /* dump the schedule */
+ cursor = trackdb_opencursor(trackdb_scheduledb, tid);
+ err = cursor->c_get(cursor, prepare_data(&k), prepare_data(&d),
+ DB_FIRST);
+ while(err == 0) {
+ if(fputc('W', fp) < 0
+ || urlencode(s, k.data, k.size)
+ || fputc('\n', fp) < 0
+ || urlencode(s, d.data, d.size)
+ || fputc('\n', fp) < 0)
+ fatal(errno, "error writing to %s", tag);
+ err = cursor->c_get(cursor, prepare_data(&k), prepare_data(&d),
+ DB_NEXT);
+ }
+ if(trackdb_closecursor(cursor)) { cursor = 0; goto fail; }
+ cursor = 0;
+
+
if(tracksdb) {
cursor = trackdb_opencursor(trackdb_tracksdb, tid);
err = cursor->c_get(cursor, prepare_data(&k), prepare_data(&d),
@@ -284,6 +287,8 @@ static int undump_from_fp(DB_TXN *tid, FILE *fp, const char *tag) {
if((err = truncdb(tid, trackdb_globaldb))) return err;
if((err = truncdb(tid, trackdb_searchdb))) return err;
if((err = truncdb(tid, trackdb_tagsdb))) return err;
+ if((err = truncdb(tid, trackdb_usersdb))) return err;
+ if((err = truncdb(tid, trackdb_scheduledb))) return err;
c = getc(fp);
while(!ferror(fp) && !feof(fp)) {
switch(c) {
@@ -296,17 +301,32 @@ static int undump_from_fp(DB_TXN *tid, FILE *fp, const char *tag) {
return 0;
case 'P':
case 'G':
- if(c == 'P') {
+ case 'U':
+ case 'W':
+ switch(c) {
+ case 'P':
which_db = trackdb_prefsdb;
which_name = "prefs.db";
- } else {
+ break;
+ case 'G':
which_db = trackdb_globaldb;
which_name = "global.db";
+ break;
+ case 'U':
+ which_db = trackdb_usersdb;
+ which_name = "users.db";
+ break;
+ case 'W': /* for 'when' */
+ which_db = trackdb_scheduledb;
+ which_name = "scheduledb.db";
+ break;
+ default:
+ abort();
}
if(undump_dbt(fp, tag, prepare_data(&k))
|| undump_dbt(fp, tag, prepare_data(&d)))
break;
- switch(err = trackdb_prefsdb->put(which_db, tid, &k, &d, 0)) {
+ switch(err = which_db->put(which_db, tid, &k, &d, 0)) {
case 0:
break;
case DB_LOCK_DEADLOCK:
@@ -415,7 +435,7 @@ fail:
int main(int argc, char **argv) {
int n, dump = 0, undump = 0, recover = TRACKDB_NO_RECOVER, recompute = 0;
- int tracksdb = 0, searchdb = 0, remove_pathless = 0;
+ int tracksdb = 0, searchdb = 0, remove_pathless = 0, fd;
const char *path;
char *tmp;
FILE *fp;
@@ -424,7 +444,7 @@ int main(int argc, char **argv) {
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;
@@ -454,12 +474,16 @@ int main(int argc, char **argv) {
path = argv[optind];
}
if(config_read(0)) fatal(0, "cannot read configuration");
- trackdb_init(recover);
+ trackdb_init(recover|TRACKDB_MAY_CREATE);
trackdb_open(TRACKDB_NO_UPGRADE);
if(dump) {
- /* we write to a temporary file and rename into place */
+ /* We write to a temporary file and rename into place. We make
+ * sure the permissions are tight from the start. */
byte_xasprintf(&tmp, "%s.%lx.tmp", path, (unsigned long)getpid());
- if(!(fp = fopen(tmp, "w"))) fatal(errno, "error opening %s", tmp);
+ if((fd = open(tmp, O_CREAT|O_TRUNC|O_WRONLY, 0600)) < 0)
+ fatal(errno, "error opening %s", tmp);
+ if(!(fp = fdopen(fd, "w")))
+ fatal(errno, "fdopen on %s", tmp);
do_dump(fp, tmp, tracksdb, searchdb);
if(fclose(fp) < 0) fatal(errno, "error closing %s", tmp);
if(rename(tmp, path) < 0)