X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/299a14ee0d61b7994dc4ce5246b55b4d75fdcb2e..74b1f70dbce97198dc741ddd61214e55138f826f:/server/dump.c diff --git a/server/dump.c b/server/dump.c index 84b45d0..18a2f6e 100644 --- a/server/dump.c +++ b/server/dump.c @@ -1,6 +1,6 @@ /* * 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 * it under the terms of the GNU General Public License as published by @@ -29,6 +29,7 @@ #include #include #include +#include #include "configuration.h" #include "syscalls.h" @@ -41,9 +42,11 @@ #include "kvp.h" #include "vector.h" #include "inputline.h" +#include "rights.h" #include "trackdb.h" #include "trackdb-int.h" #include "charset.h" +#include "version.h" static const struct option options[] = { { "help", no_argument, 0, 'h' }, @@ -80,13 +83,6 @@ static void help(void) { exit(0); } -/* display version number and terminate */ -static void version(void) { - xprintf("disorder-dump version %s\n", 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) { @@ -106,6 +102,7 @@ static void do_dump(FILE *fp, const char *tag, fatal(errno, "error calling ftruncate"); if(fprintf(fp, "V%c\n", (tracksdb || searchdb) ? '1' : '0') < 0) fatal(errno, "error writing to %s", tag); + /* dump the preferences */ cursor = trackdb_opencursor(trackdb_prefsdb, tid); err = cursor->c_get(cursor, prepare_data(&k), prepare_data(&d), DB_FIRST); @@ -122,6 +119,40 @@ static void do_dump(FILE *fp, const char *tag, if(trackdb_closecursor(cursor)) { cursor = 0; goto fail; } cursor = 0; + /* dump the global preferences */ + cursor = trackdb_opencursor(trackdb_globaldb, tid); + err = cursor->c_get(cursor, prepare_data(&k), prepare_data(&d), + DB_FIRST); + while(err == 0) { + if(fputc('G', 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 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; + if(tracksdb) { cursor = trackdb_opencursor(trackdb_tracksdb, tid); err = cursor->c_get(cursor, prepare_data(&k), prepare_data(&d), @@ -256,12 +287,17 @@ static int undump_dbt(FILE *fp, const char *tag, DBT *dbt) { static int undump_from_fp(DB_TXN *tid, FILE *fp, const char *tag) { int err, c; DBT k, d; + const char *which_name; + DB *which_db; info("undumping"); if(fseek(fp, 0, SEEK_SET) < 0) fatal(errno, "error calling fseek on %s", tag); if((err = truncdb(tid, trackdb_prefsdb))) return err; + 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; c = getc(fp); while(!ferror(fp) && !feof(fp)) { switch(c) { @@ -273,17 +309,35 @@ static int undump_from_fp(DB_TXN *tid, FILE *fp, const char *tag) { case 'E': return 0; case 'P': + case 'G': + case 'U': + switch(c) { + case 'P': + which_db = trackdb_prefsdb; + which_name = "prefs.db"; + break; + case 'G': + which_db = trackdb_globaldb; + which_name = "global.db"; + break; + case 'U': + which_db = trackdb_usersdb; + which_name = "users.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(trackdb_prefsdb, tid, &k, &d, 0)) { + switch(err = trackdb_prefsdb->put(which_db, tid, &k, &d, 0)) { case 0: break; case DB_LOCK_DEADLOCK: - error(0, "error updating prefs.db: %s", db_strerror(err)); + error(0, "error updating %s: %s", which_name, db_strerror(err)); return err; default: - fatal(0, "error updating prefs.db: %s", db_strerror(err)); + fatal(0, "error updating %s: %s", which_name, db_strerror(err)); } break; case 'T': @@ -385,7 +439,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; @@ -394,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(); - case 'V': version(); + case 'V': version("disorder-dump"); case 'c': configfile = optarg; break; case 'd': dump = 1; break; case 'u': undump = 1; break; @@ -424,12 +478,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)