tdb: add restore
authorVolker Lendecke <vl@samba.org>
Sat, 18 Sep 2010 06:56:10 +0000 (10:56 +0400)
committerRusty Russell <rusty@rustcorp.com.au>
Thu, 7 Oct 2010 04:45:45 +0000 (15:15 +1030)
Based on an idea by Simon McVittie, largely rewritten

lib/tdb/config.mk
lib/tdb/tdb.mk
lib/tdb/tools/tdbrestore.c [new file with mode: 0644]

index b2e322c..22caada 100644 (file)
@@ -34,6 +34,15 @@ PRIVATE_DEPENDENCIES = \
 
 tdbtorture_OBJ_FILES = $(tdbsrcdir)/tools/tdbtorture.o
 
+################################################
+# Start BINARY tdbrestore
+[BINARY::tdbrestore]
+INSTALLDIR = BINDIR
+PRIVATE_DEPENDENCIES = \
+               LIBTDB
+# End BINARY tdbrestore
+################################################
+
 ################################################
 # Start BINARY tdbdump
 [BINARY::tdbdump]
index 267c2d1..3c52b73 100644 (file)
@@ -1,7 +1,7 @@
 dirs::
        @mkdir -p bin common tools
 
-PROGS = bin/tdbtool$(EXEEXT) bin/tdbdump$(EXEEXT) bin/tdbbackup$(EXEEXT)
+PROGS = bin/tdbtool$(EXEEXT) bin/tdbrestore$(EXEEXT) bin/tdbdump$(EXEEXT) bin/tdbbackup$(EXEEXT)
 PROGS_NOINSTALL = bin/tdbtest$(EXEEXT) bin/tdbtorture$(EXEEXT)
 ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL)
 
@@ -23,6 +23,9 @@ bin/tdbtorture$(EXEEXT): tools/tdbtorture.o $(TDB_LIB)
 bin/tdbdump$(EXEEXT): tools/tdbdump.o $(TDB_LIB)
        $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb
 
+bin/tdbrestore$(EXEEXT): tools/tdbrestore.o $(TDB_LIB)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbrestore tools/tdbrestore.o -L. -ltdb $(TDB_DEPS)
+
 bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(TDB_LIB)
        $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb
 
diff --git a/lib/tdb/tools/tdbrestore.c b/lib/tdb/tools/tdbrestore.c
new file mode 100644 (file)
index 0000000..485c440
--- /dev/null
@@ -0,0 +1,226 @@
+/*
+   tdbrestore -- construct a tdb from tdbdump output.
+   Copyright (C) Volker Lendecke               2010
+   Copyright (C) Simon McVittie                        2005
+
+   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
+   (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.
+
+   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., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <assert.h>
+#include "replace.h"
+#include "system/locale.h"
+#include "system/time.h"
+#include "system/filesys.h"
+#include "system/wait.h"
+#include "tdb.h"
+
+#define debug_fprintf(file, fmt, ...) do {/*nothing*/} while (0)
+
+static int read_linehead(FILE *f)
+{
+       int i, c;
+       int num_bytes;
+       char prefix[128];
+
+       while (1) {
+               c = getc(f);
+               if (c == EOF) {
+                       return -1;
+               }
+               if (c == '\(') {
+                       break;
+               }
+       }
+       for (i=0; i<sizeof(prefix); i++) {
+               c = getc(f);
+               if (c == EOF) {
+                       return -1;
+               }
+               prefix[i] = c;
+               if (c == '"') {
+                       break;
+               }
+       }
+       if (i == sizeof(prefix)) {
+               return -1;
+       }
+       prefix[i] = '\0';
+
+       if (sscanf(prefix, "%d) = ", &num_bytes) != 1) {
+               return -1;
+       }
+       return num_bytes;
+}
+
+static int read_hex(void) {
+       int c;
+       c = getchar();
+       if (c == EOF) {
+               fprintf(stderr, "Unexpected EOF in data\n");
+               return -1;
+       } else if (c == '"') {
+               fprintf(stderr, "Unexpected \\\" sequence\n");
+               return -1;
+       } else if ('0' <= c && c <= '9')  {
+               return c - '0';
+       } else if ('A' <= c && c <= 'F')  {
+               return c - 'A' + 10;
+       } else if ('a' <= c && c <= 'f')  {
+               return c - 'a' + 10;
+       } else {
+               fprintf(stderr, "Invalid hex: %c\n", c);
+               return -1;
+       }
+}
+
+static int read_data(FILE *f, TDB_DATA *d, size_t size) {
+       int c, low, high;
+       int i;
+
+       d->dptr = (unsigned char *)malloc(size);
+       if (d->dptr == NULL) {
+               return -1;
+       }
+       d->dsize = size;
+
+       for (i=0; i<size; i++) {
+               c = getc(f);
+               if (c == EOF) {
+                       fprintf(stderr, "Unexpected EOF in data\n");
+                       return 1;
+               } else if (c == '"') {
+                       return 0;
+               } else if (c == '\\') {
+                       high = read_hex();
+                       if (high < 0) {
+                               return -1;
+                       }
+                       high = high << 4;
+                       assert(high == (high & 0xf0));
+                       low = read_hex();
+                       if (low < 0) {
+                               return -1;
+                       }
+                       assert(low == (low & 0x0f));
+                       d->dptr[i] = (low|high);
+               } else {
+                       d->dptr[i] = c;
+               }
+       }
+       return 0;
+}
+
+static int swallow(FILE *f, const char *s, int *eof)
+{
+       char line[128];
+
+       if (fgets(line, sizeof(line), f) == NULL) {
+               if (eof != NULL) {
+                       *eof = 1;
+               }
+               return -1;
+       }
+       if (strcmp(line, s) != 0) {
+               return -1;
+       }
+       return 0;
+}
+
+static int read_rec(FILE *f, TDB_CONTEXT *tdb, int *eof)
+{
+       int length;
+       TDB_DATA key, data;
+       int ret = -1;
+
+       key.dptr = NULL;
+       data.dptr = NULL;
+
+       if (swallow(f, "{\n", eof) == -1) {
+               goto fail;
+       }
+       length = read_linehead(f);
+       if (length == -1) {
+               goto fail;
+       }
+       if (read_data(f, &key, length) == -1) {
+               goto fail;
+       }
+       if (swallow(f, "\"\n", NULL) == -1) {
+               goto fail;
+       }
+       length = read_linehead(f);
+       if (length == -1) {
+               goto fail;
+       }
+       if (read_data(f, &data, length) == -1) {
+               goto fail;
+       }
+       if ((swallow(f, "\"\n", NULL) == -1)
+           || (swallow(f, "}\n", NULL) == -1)) {
+               goto fail;
+       }
+       if (tdb_store(tdb, key, data, TDB_INSERT) == -1) {
+               fprintf(stderr, "TDB error: %s\n", tdb_errorstr(tdb));
+               goto fail;
+       }
+
+       ret = 0;
+fail:
+       free(key.dptr);
+       free(data.dptr);
+       return ret;
+}
+
+static int restore_tdb(const char *fname)
+{
+       TDB_CONTEXT *tdb;
+
+       tdb = tdb_open(fname, 0, 0, O_RDWR|O_CREAT|O_EXCL, 0666);
+       if (!tdb) {
+               perror("tdb_open");
+               fprintf(stderr, "Failed to open %s\n", fname);
+               return 1;
+       }
+
+       while (1) {
+               int eof = 0;
+               if (read_rec(stdin, tdb, &eof) == -1) {
+                       if (eof) {
+                               break;
+                       }
+                       return 1;
+               }
+       }
+       if (tdb_close(tdb)) {
+               fprintf(stderr, "Error closing tdb\n");
+               return 1;
+       }
+       fprintf(stderr, "EOF\n");
+       return 0;
+}
+
+int main(int argc, char *argv[])
+{
+       char *fname;
+
+       if (argc < 2) {
+               printf("Usage: %s dbname < tdbdump_output\n", argv[0]);
+               exit(1);
+       }
+
+       fname = argv[1];
+
+       return restore_tdb(fname);
+}