/*
* This file is part of DisOrder.
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007 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
#include <pcre.h>
#include <unistd.h>
#include <db.h>
+#include <fcntl.h>
#include "configuration.h"
#include "syscalls.h"
#include "kvp.h"
#include "vector.h"
#include "inputline.h"
+#include "rights.h"
#include "trackdb.h"
#include "trackdb-int.h"
#include "charset.h"
/* display version number and terminate */
static void version(void) {
- xprintf("disorder-dump version %s\n", disorder_version_string);
+ xprintf("%s", disorder_version_string);
xfclose(stdout);
exit(0);
}
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);
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),
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) {
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':
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;
- mem_init(1);
+ mem_init();
while((n = getopt_long(argc, argv, "hVc:dDutsrRaP", options, 0)) >= 0) {
switch(n) {
case 'h': help();
fatal(0, "specify only a dump file name");
path = argv[optind];
}
- if(config_read()) fatal(0, "cannot read configuration");
- trackdb_init(recover);
- trackdb_open();
+ if(config_read(0)) fatal(0, "cannot read configuration");
+ 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)
~mdw / disorder / blobdiff