add a comment to the previous thing
[citadel.git] / citadel / utils / ctdlload.c
index d3a2ae51f50eaa9c3c85a8c531f59df55160ed7d..0bb24e25dc1865930aa7749d67b99fb7bb2aa325 100644 (file)
@@ -1,6 +1,6 @@
-// Don't run this.  It doesn't work and if you try to run it you will immediately die.
+// Load (restore) the Citadel database from a flat file created by ctdldump
 //
-// Copyright (c) 2023 by Art Cancro citadel.org
+// Copyright (c) 2023-2024 by Art Cancro citadel.org
 //
 // This program is open source software.  Use, duplication, or disclosure
 // is subject to the terms of the GNU General Public License, version 3.
 #include <errno.h>
 #include <stdarg.h>
 #include <limits.h>
+#include <syslog.h>
 #include <libcitadel.h>
 #include <zlib.h>
-#include <db.h>
 #include "../server/sysdep.h"
 #include "../server/citadel_defs.h"
 #include "../server/server.h"
+#include "../server/makeuserkey.h"
 #include "../server/citadel_dirs.h"
-#include "ctdl3264_structs.h"
+#include "../server/database.h"
 
+uid_t ctdluid = 0;
 
 // Wrapper for realloc() that crashes and burns if the call fails.
 void *reallok(void *ptr, size_t size) {
        void *p = realloc(ptr, size);
        if (!p) {
                fprintf(stderr, "realloc() failed to resize %p to %ld bytes, error: %m\n", ptr, size);
-               exit(1);
+               abort();
        }
        return p;
 }
-#define realloc reallok
 
 
-// Open a database environment
-DB_ENV *open_dbenv(char *dirname) {
+// Convert a "msgtext" record to a message on disk.   NOT THREADSAFE
+// This also works for "bigmsg" records.
+int import_msgtext(char *line, struct cdbkeyval *kv) {
 
-       DB_ENV *dbenv = NULL;
+       static char *b64_decoded_msg = NULL;
+       static size_t b64_decoded_alloc = 0;
+       long msgnum;
+       char *token;
 
-       int ret;
-       int i;
-       u_int32_t flags = 0;
-       int dbversion_major, dbversion_minor, dbversion_patch;
+       token = strtok(line, "|");
+       msgnum = atol(strtok(NULL, "|"));
+       token = strtok(NULL, "|");
 
-       printf( "db: open_dbenv() starting\n"
-               "db:    Linked zlib: %s\n"
-               "db: Compiled libdb: %s\n"
-               "db:   Linked libdb: %s\n",
-               zlibVersion(),
-               DB_VERSION_STRING,
-               db_version(&dbversion_major, &dbversion_minor, &dbversion_patch)
-       );
+       // The record key will be the message number
+       kv->key.len = sizeof(long);
+       kv->key.ptr = reallok(kv->key.ptr, kv->key.len);
+       memcpy(kv->key.ptr, &msgnum, kv->key.len);
 
-       // Create synthetic integer version numbers and compare them.
-       // Never run with a libdb older than the one with which it was compiled.
-       int compiled_db_version = ( (DB_VERSION_MAJOR * 1000000) + (DB_VERSION_MINOR * 1000) + (DB_VERSION_PATCH) );
-       int linked_db_version = ( (dbversion_major * 1000000) + (dbversion_minor * 1000) + (dbversion_patch) );
-       if (compiled_db_version > linked_db_version) {
-               printf( "db: ctdl3264 is running with a version of libdb older than the one with which it was compiled.\n"
-                       "db: This is an invalid configuration.  ctdl3264 will now exit to prevent data loss.");
-               exit(CTDLEXIT_DB);
-       }
+       // The record data will be the decoded message text.
+       // We are allocating more memory than we need, but BDB will only write the number of bytes we tell it to.
+       kv->val.ptr = (char *) reallok(kv->val.ptr, strlen(token));
+       kv->val.len = CtdlDecodeBase64(kv->val.ptr, token, strlen(token));
+       return(1);
+}
 
-       printf("db: Setting up DB environment\n");
-       ret = db_env_create(&dbenv, 0);
-       if (ret) {
-               printf("db: db_env_create: %s\n", db_strerror(ret));
-               printf("db: exit code %d\n", ret);
-               exit(CTDLEXIT_DB);
-       }
 
-       // We want to specify the shared memory buffer pool cachesize, but everything else is the default.
-       ret = dbenv->set_cachesize(dbenv, 0, 64 * 1024, 0);
-       if (ret) {
-               printf("db: set_cachesize: %s\n", db_strerror(ret));
-               dbenv->close(dbenv, 0);
-               printf("db: exit code %d\n", ret);
-               exit(CTDLEXIT_DB);
-       }
+// Convert a "msgmeta" record to a message metadata record on disk.  NOT THREADSAFE
+int import_msgmeta(char *line, struct cdbkeyval *kv) {
+       char *token;
+       struct MetaData *m;
 
-       if ((ret = dbenv->set_lk_detect(dbenv, DB_LOCK_DEFAULT))) {
-               printf("db: set_lk_detect: %s\n", db_strerror(ret));
-               dbenv->close(dbenv, 0);
-               printf("db: exit code %d\n", ret);
-               exit(CTDLEXIT_DB);
+       m = malloc(sizeof(struct MetaData));
+       if (!m) {
+               fprintf(stderr, "import_msgmeta: malloc: %s\n", strerror(errno));
+               return(0);
        }
-
-       flags = DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_INIT_LOG;
-       printf("db: dbenv open(dir=%s, flags=%d)\n", dirname, flags);
-       ret = dbenv->open(dbenv, dirname, flags, 0);
-       if (ret) {
-               printf("db: dbenv->open: %s\n", db_strerror(ret));
-               dbenv->close(dbenv, 0);
-               printf("db: exit code %d\n", ret);
-               exit(CTDLEXIT_DB);
+       memset(m, 0, sizeof(struct MetaData));
+       char *p = line;
+
+       for (int i=0; (token = strsep(&p, "|")); ++i) {
+               switch(i) {
+                       case 1:
+                               m->meta_msgnum = atol(token);
+                               break;
+                       case 2:
+                               m->meta_refcount = atoi(token);
+                               break;
+                       case 3:
+                               strncpy(m->meta_content_type, token, sizeof(m->meta_content_type));
+                               break;
+                       case 4:
+                               m->meta_rfc822_length = atol(token);
+                               break;
+               }
        }
 
-       return(dbenv);
-}
+       // metadata records are stored in the CDB_MSGMAIN table,
+       // but with the index being the *negative* of the message number.
+       long index = 0 - m->meta_msgnum;
+       kv->key.len = sizeof(long);
+       kv->key.ptr = reallok(NULL, kv->key.len);
+       memcpy(kv->key.ptr, &index, kv->key.len);
 
+       // data
+       kv->val.len = sizeof(struct MetaData);
+       kv->val.ptr = (char *) m;                               // out_data owns this memory now
 
-void close_dbenv(DB_ENV *dbenv) {
-       printf("db: closing dbenv\n");
-       int ret = dbenv->close(dbenv, 0);
-       if (ret) {
-               printf("db: dbenv->close: %s\n", db_strerror(ret));
-       }
+       return(1);
 }
 
 
-// convert function for a message in msgmain
-void convert_msgmain(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
-       int32_t in_msgnum;
-       long out_msgnum;
-       memcpy(&in_msgnum, in_key->data, sizeof(in_msgnum));
-       out_msgnum = (long)in_msgnum;
+// Convert a "user" record to a record on disk.  (Source string is unusable after this function is called.)
+int import_user(char *line, struct cdbkeyval *kv) {
+       char userkey[USERNAME_SIZE];
+       char *token;
+       struct ctdluser *u;
 
-       if (in_key->size != 4) {
-               fprintf(stderr, "\033[31m\033[1m *** SOURCE DATABASE IS NOT 32-BIT *** ABORTING *** \033[0m\n");
-               abort();
+       u = malloc(sizeof(struct ctdluser));
+       if (!u) {
+               fprintf(stderr, "malloc failed\n");
+               return(0);
+       }
+       memset(u, 0, sizeof(struct ctdluser));
+       char *p = line;
+
+       for (int i=0; (token = strsep(&p, "|")); ++i) {
+               switch(i) {
+                       case 1:
+                               u->version = atoi(token);
+                               break;
+                       case 2:
+                               u->uid = atoi(token);
+                               break;
+                       case 3:
+                               safestrncpy(u->password, token, sizeof(u->password));
+                               break;
+                       case 4:
+                               u->flags = atoi(token);
+                               break;
+                       case 5:
+                               u->axlevel = atoi(token);
+                               break;
+                       case 6:
+                               u->usernum = atol(token);
+                               break;
+                       case 7:
+                               u->lastcall = atol(token);
+                               break;
+                       case 8:
+                               u->USuserpurge = atoi(token);
+                               break;
+                       case 9:
+                               safestrncpy(u->fullname, token, sizeof(u->fullname));
+                               break;
+                       case 10:
+                               u->msgnum_bio = atol(token);
+                               break;
+                       case 11:
+                               u->msgnum_pic = atol(token);
+                               break;
+                       case 12:
+                               CtdlDecodeBase64(token, token, strlen(token));                  // Decode in place
+                               safestrncpy(u->emailaddrs, token, sizeof(u->emailaddrs));
+                               break;
+                       case 13:
+                               u->msgnum_inboxrules = atol(token);
+                               break;
+                       case 14:
+                               u->lastproc_inboxrules = atol(token);
+                               break;
+               }
        }
 
-       // If the msgnum is negative, we are looking at METADATA
-       if (in_msgnum < 0) {
-               struct MetaData_32 *meta32 = (struct MetaData_32 *)in_data->data;
+       // reject any user records without names
+       if (strlen(u->fullname) == 0) {
+               free(u);
+               return(0);
+       }
+       
+       // ok, good to go
+       makeuserkey(userkey, u->fullname);
+       kv->key.len = strlen(userkey);
+       kv->key.ptr = strdup(userkey);
+       kv->val.len = sizeof(struct ctdluser);
+       kv->val.ptr = (char *) u;
+       return(1);
+}
 
-               // printf("\033[32m\033[1mMetadata: msgnum=%d , refcount=%d , content_type=\"%s\" , rfc822len=%d\033[0m\n", meta32->meta_msgnum, meta32->meta_refcount, meta32->meta_content_type, meta32->meta_rfc822_length);
 
-               out_key->size = sizeof(long);
-               out_key->data = realloc(out_key->data, out_key->size);
-               memcpy(out_key->data, &out_msgnum, sizeof(long));
+// Convert a "room" record to a record on disk.  (Source string is unusable after this function is called.)
+int import_room(char *line, struct cdbkeyval *kv) {
+       char *token;
+       struct ctdlroom *r;
 
-               out_data->size = sizeof(struct MetaData);
-               out_data->data = realloc(out_data->data, out_data->size);
-               struct MetaData *meta64 = (struct MetaData *)out_data->data;
-               memset(meta64, 0, sizeof(struct MetaData));
-               meta64->meta_msgnum             = (long)        meta32->meta_msgnum;
-               meta64->meta_refcount           = (int)         meta32->meta_refcount;
-               strcpy(meta64->meta_content_type,               meta32->meta_content_type);
-               meta64->meta_rfc822_length      = (long)        meta32->meta_rfc822_length;
+       r = malloc(sizeof(struct ctdlroom));
+       if (!r) {
+               fprintf(stderr, "import_room: malloc: %s\n", strerror(errno));
+               return(0);
        }
-
-       // If the msgnum is positive, we are looking at a MESSAGE
-       else if (in_msgnum > 0) {
-               out_key->size = sizeof(long);
-               out_key->data = realloc(out_key->data, out_key->size);
-               memcpy(out_key->data, &out_msgnum, sizeof(long));
-
-               // copy the message verbatim
-               out_data->size = in_data->size;
-               out_data->data = realloc(out_data->data, out_data->size);
-               memcpy(out_data->data, in_data->data, out_data->size);
-               // printf("\033[32m\033[1mMessage: %ld\033[0m\n", out_msgnum);
+       memset(r, 0, sizeof(struct ctdlroom));
+       char *p = line;
+
+       for (int i=0; (token = strsep(&p, "|")); ++i) {
+               switch(i) {
+                       case 1:
+                               strncpy(r->QRname, token, sizeof(r->QRname));
+                               break;
+                       case 2:
+                               strncpy(r->QRpasswd, token, sizeof (r->QRpasswd));
+                               break;
+                       case 3:
+                               r->QRroomaide = atol(token);
+                               break;
+                       case 4:
+                               r->QRhighest = atol(token);
+                               break;
+                       case 5:
+                               r->QRgen = atol(token);
+                               break;
+                       case 6:
+                               r->QRflags = atoi(token);
+                               break;
+                       case 7:
+                               strncpy(r->QRdirname, token, sizeof(r->QRdirname));
+                               break;
+                       case 8:
+                               r->msgnum_info = atol(token);
+                               break;
+                       case 9:
+                               r->QRfloor = atoi(token);
+                               break;
+                       case 10:
+                               r->QRmtime = atol(token);
+                               break;
+                       case 11:
+                               r->QRep.expire_mode = atoi(token);
+                               break;
+                       case 12:
+                               r->QRep.expire_value = atoi(token);
+                               break;
+                       case 13:
+                               r->QRnumber = atol(token);
+                               break;
+                       case 14:
+                               r->QRorder = atoi(token);
+                               break;
+                       case 15:
+                               r->QRflags2 = atoi(token);
+                               break;
+                       case 16:
+                               r->QRdefaultview = atoi(token);
+                               break;
+                       case 17:
+                               r->msgnum_pic = atol(token);
+                               break;
+               }
        }
 
-       // If the msgnum is 0 it's probably not a valid record.
-       else {
-               // printf("\033[31mmsgmain: message number 0 is impossible, skipping this record\033[0m\n");
+       // The key is the room name in all lower case
+       kv->key.len = strlen(r->QRname);
+       kv->key.ptr = strdup(r->QRname);
+       char *k = (char *)kv->key.ptr;
+       for (int i=0; i<=kv->key.len; ++i) {
+               k[i] = tolower(k[i]);
        }
-}
 
-
-// convert function for a user record
-void convert_users(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
-
-       // The key is a string so we can just copy it over
-       out_key->size = in_key->size;
-       out_key->data = realloc(out_key->data, out_key->size);
-       memcpy(out_key->data, in_key->data, in_key->size);
-
-       struct ctdluser_32 *user32 = (struct ctdluser_32 *)in_data->data;
-
-       out_data->size = sizeof(struct ctdluser);
-       out_data->data = realloc(out_data->data, out_data->size);
-       struct ctdluser *user64 = (struct ctdluser *)out_data->data;
-
-       user64->version                 = (int)         user32->version;
-       user64->uid                     = (uid_t)       user32->uid;
-       strcpy(user64->password,                        user32->password);
-       user64->flags                   = (unsigned)    user32->flags;
-       user64->axlevel                 = (cit_uint8_t) user32->axlevel;
-       user64->usernum                 = (long)        user32->usernum;
-       user64->lastcall                = (time_t)      user32->lastcall;
-       user64->USuserpurge             = (int)         user32->USuserpurge;
-       strcpy(user64->fullname,                        user32->fullname);
-       user64->msgnum_bio              = (long)        user32->msgnum_bio;
-       user64->msgnum_pic              = (long)        user32->msgnum_pic;
-       strcpy(user64->emailaddrs,                      user32->emailaddrs);
-       user64->msgnum_inboxrules       = (long)        user32->msgnum_inboxrules;
-       user64->lastproc_inboxrules     = (long)        user32->lastproc_inboxrules;
-
-       // printf("\033[32m\033[1mUser: %s\033[0m\n", user64->fullname);
+       kv->val.len = sizeof(struct ctdlroom);
+       kv->val.ptr = (char *) r;
+       return(1);
 }
 
 
-// convert function for a room record
-void convert_rooms(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
-
-       // The key is a string so we can just copy it over
-       out_key->size = in_key->size;
-       out_key->data = realloc(out_key->data, out_key->size);
-       memcpy(out_key->data, in_key->data, in_key->size);
+// Convert a floor record to a record on disk.
+int import_floor(char *line, struct cdbkeyval *kv) {
+       char *token;
+       struct floor *f;
+       int floor_num;
 
-       // data
-       struct ctdlroom_32 *room32 = (struct ctdlroom_32 *)in_data->data;
-       out_data->size = sizeof(struct ctdlroom);
-       out_data->data = realloc(out_data->data, out_data->size);
-       struct ctdlroom *room64 = (struct ctdlroom *)out_data->data;
-
-       strcpy(room64->QRname,                          room32->QRname);
-       strcpy(room64->QRpasswd,                        room32->QRpasswd);
-       room64->QRroomaide              = (long)        room32->QRroomaide;
-       room64->QRhighest               = (long)        room32->QRhighest;
-       room64->QRgen                   = (time_t)      room32->QRgen;
-       room64->QRflags                 = (unsigned)    room32->QRflags;
-       strcpy(room64->QRdirname,                       room32->QRdirname);
-       room64->msgnum_info             = (long)        room32->msgnum_info;
-       room64->QRfloor                 = (char)        room32->QRfloor;
-       room64->QRmtime                 = (time_t)      room32->QRmtime;
-       room64->QRep.expire_mode        = (int)         room32->QRep.expire_mode;
-       room64->QRep.expire_value       = (int)         room32->QRep.expire_value;
-       room64->QRnumber                = (long)        room32->QRnumber;
-       room64->QRorder                 = (char)        room32->QRorder;
-       room64->QRflags2                = (unsigned)    room32->QRflags2;
-       room64->QRdefaultview           = (int)         room32->QRdefaultview;
-       room64->msgnum_pic              = (long)        room32->msgnum_pic;
-
-       // printf("\033[32m\033[1mRoom: %s\033[0m\n", room64->QRname);
-}
-
-
-// convert function for a floor record
-void convert_floors(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
+       f = malloc(sizeof(struct floor));
+       if (!f) {
+               fprintf(stderr, "import_floor: malloc: %s\n", strerror(errno));
+               return(0);
+       }
+       memset(f, 0, sizeof(struct floor));
+       char *p = line;
+
+       for (int i=0; (token = strsep(&p, "|")); ++i) {
+               switch(i) {
+                       case 1:
+                               floor_num = atoi(token);
+                               break;
+                       case 2:
+                               f->f_flags = atoi(token);
+                               break;
+                       case 3:
+                               strncpy(f->f_name, token, sizeof(f->f_name));
+                               break;
+                       case 4:
+                               f->f_ref_count = atoi(token);
+                               break;
+                       case 5:
+                               f->f_ep.expire_mode = atoi(token);
+                               break;
+                       case 6:
+                               f->f_ep.expire_value = atoi(token);
+                               break;
+               }
+       }
 
-       // the key is an "int", and "int" is 32-bits on both 32 and 64 bit platforms.
-       out_key->size = in_key->size;
-       out_key->data = realloc(out_key->data, out_key->size);
-       memcpy(out_key->data, in_key->data, in_key->size);
+       kv->key.len = sizeof(int);
+       kv->key.ptr = malloc(kv->key.len);
+       memcpy(kv->key.ptr, &floor_num, kv->key.len);
 
-       // data
-       struct floor_32 *floor32 = (struct floor_32 *)in_data->data;
-       out_data->size = sizeof(struct floor);
-       out_data->data = realloc(out_data->data, out_data->size);
-       struct floor *floor64 = (struct floor *)out_data->data;
-
-       // these are probably bit-for-bit identical, actually ... but we do it the "right" way anyway
-       floor64->f_flags                = (unsigned short)      floor32->f_flags;
-       strcpy(floor64->f_name,                                 floor32->f_name);
-       floor64->f_ref_count            = (int)                 floor32->f_ref_count;
-       floor64->f_ep.expire_mode       = (int)                 floor32->f_ep.expire_mode;
-       floor64->f_ep.expire_value      = (int)                 floor32->f_ep.expire_value;
-
-       // printf("\033[32m\033[1mFloor: %s\033[0m\n", floor64->f_name);
+       kv->val.len = sizeof(struct floor);
+       kv->val.ptr = (char *) f;
+       return(1);
 }
 
 
-// convert function for a msglist or a fulltext index record
-// (both are indexed by a long and the data is arrays of longs)
-void convert_msglists(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
-       int i;
-
-       char *table = (which_cdb == CDB_FULLTEXT) ? "FullText" : "Msglist";
+// Import a msglist record
+// msglist|26|32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51|
+int import_msglist(char *line, struct cdbkeyval *kv) {
+       long roomnum;
+       char *token, *mtoken;
+       char *p = line;
+       char *q = NULL;
+       int num_msgs = 0;
+       long *msglist = NULL;
+
+       for (int i=0; (token = strsep(&p, "|")); ++i) {
+               switch(i) {
+                       case 1:
+                               roomnum = atol(token);
+                               break;
+                       case 2:
+                               q = token;
+                               for (int j=0; (mtoken = strsep(&q, ",")); ++j) {
+                                       msglist = realloc(msglist, (num_msgs+1) * sizeof(long));
+                                       msglist[num_msgs++] = atol(mtoken);
+                               }
+                               break;
+               }
+       }
 
-       // records are indexed by a single "long" and contains an array of zero or more "long"s
-       // and remember ... "long" is int32_t on the source system
-       int32_t in_roomnum;
-       long out_roomnum;
-       memcpy(&in_roomnum, in_key->data, sizeof(in_roomnum));
-       out_roomnum = (long) in_roomnum;
+       kv->key.len = sizeof(long);
+       kv->key.ptr = malloc(kv->key.len);
+       memcpy(kv->key.ptr, &roomnum, kv->key.len);
 
-       if (in_key->size != 4) {
-               fprintf(stderr, "\033[31m\033[1m *** SOURCE DATABASE IS NOT 32-BIT *** ABORTING *** \033[0m\n");
-               abort();
-       }
+       kv->val.len = num_msgs * sizeof(long);
+       kv->val.ptr = (char *) msglist;
 
-       int num_msgs = in_data->size / sizeof(int32_t);
-       // printf("\033[32m\033[1m%s: key %ld (%d messages)\033[0m\n", table, out_roomnum, num_msgs);
+       return(1);
+}
 
-       // the key is a "long"
-       out_key->size = sizeof(out_roomnum);
-       out_key->data = realloc(out_key->data, out_key->size);
-       memcpy(out_key->data, &out_roomnum, sizeof(out_roomnum));
 
-       // the data is another array, but a wider type
-       out_data->size = sizeof(long) * num_msgs;
-       out_data->data = realloc(out_data->data, out_data->size);
+// Convert a "visit" record to a record on disk.
+int import_visit(char *line, struct cdbkeyval *kv) {
+       char *token;
+       struct visit *v;
 
-       int32_t in_msg = 0;
-       long out_msg = 0;
-       for (i=0; i<num_msgs; ++i) {
-               memcpy(&in_msg, (in_data->data + (i * sizeof(int32_t))), sizeof(int32_t));
-               out_msg = (long) in_msg;
-               memcpy((out_data->data + (i * sizeof(long))), &out_msg, sizeof(long));
-               // printf("msg#%ld\n", out_msg);
+       v = malloc(sizeof(struct visit));
+       if (!v) {
+               fprintf(stderr, "import_visit: malloc: %s\n", strerror(errno));
+               return(0);
+       }
+       memset(v, 0, sizeof(struct visit));
+       char *p = line;
+
+       for (int i=0; (token = strsep(&p, "|")); ++i) {
+               switch(i) {
+                       case 1:
+                               v->v_roomnum = atol(token);
+                               break;
+                       case 2:
+                               v->v_roomgen = atol(token);
+                               break;
+                       case 3:
+                               v->v_usernum = atol(token);
+                               break;
+                       case 4:
+                               v->v_lastseen = atoi(token);
+                               break;
+                       case 5:
+                               v->v_flags = atoi(token);
+                               break;
+                       case 6:
+                               strncpy(v->v_seen, token, sizeof(v->v_seen));
+                               break;
+                       case 7:
+                               strncpy(v->v_answered, token, sizeof(v->v_answered));
+                               break;
+                       case 8:
+                               v->v_view = atoi(token);
+                               break;
+               }
        }
-}
-
 
-// convert function for a visit record
-void convert_visits(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
+       // The key is the same as the first three data members (3 x long)
+       kv->key.len = sizeof(long) * 3;
+       kv->key.ptr = reallok(NULL, kv->key.len);
+       memcpy(kv->key.ptr, v, kv->key.len);
 
-       // data
-       struct visit_32 *visit32 = (struct visit_32 *)in_data->data;
-       out_data->size = sizeof(struct visit);
-       out_data->data = realloc(out_data->data, out_data->size);
-       struct visit *visit64 = (struct visit *)out_data->data;
-
-       //  the data (zero it out so it will compress well)
-       memset(visit64, 0, sizeof(struct visit));
-       visit64->v_roomnum              = (long)        visit32->v_roomnum;
-       visit64->v_roomgen              = (long)        visit32->v_roomgen;
-       visit64->v_usernum              = (long)        visit32->v_usernum;
-       visit64->v_lastseen             = (long)        visit32->v_lastseen;
-       visit64->v_flags                = (unsigned)    visit32->v_flags;
-       strcpy(visit64->v_seen,                         visit32->v_seen);
-       strcpy(visit64->v_answered,                     visit32->v_answered);
-       visit64->v_view                 = (int)         visit32->v_view;
-
-       // printf("\033[32m\033[1mVisit: room %10ld, gen %10ld, user %10ld\033[0m\n", visit64->v_roomnum, visit64->v_roomgen, visit64->v_usernum);
-
-       // create the key (which is based on the data, so there is no need to convert the old key)
-       out_key->size = sizeof(struct visit_index);
-       out_key->data = realloc(out_key->data, out_key->size);
-       struct visit_index *newvisitindex = (struct visit_index *) out_key->data;
-       newvisitindex->iRoomID          =               visit64->v_roomnum;
-       newvisitindex->iRoomGen         =               visit64->v_roomgen;
-       newvisitindex->iUserID          =               visit64->v_usernum;
+       kv->val.len = sizeof(struct visit);
+       kv->val.ptr = (char *) v;
+       return(1);
 }
 
 
-// convert function for a directory record
-void convert_dir(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
+// Convert a "dir" record to a record on disk.
+int import_dir(char *line, struct cdbkeyval *kv) {
+       char dirkey[SIZ];
+       char username[USERNAME_SIZE];
+       char *token;
+
+       char *p = line;
+       for (int i=0; (token = strsep(&p, "|")); ++i) {
+               switch(i) {
+                       case 1:
+                               strncpy(dirkey, token, sizeof(dirkey));
+                               break;
+                       case 2:
+                               strncpy(username, token, sizeof(username));
+                               break;
+               }
+       }
 
-       // the key is a string
-       out_key->size = in_key->size;
-       out_key->data = realloc(out_key->data, out_key->size + 1);
-       memcpy(out_key->data, in_key->data, in_key->size);
-       char *k = (char *)out_key->data;
-       k[out_key->size] = 0;
+       kv->key.len = strlen(dirkey);
+       kv->key.ptr = reallok(NULL, kv->key.len);
+       memcpy(kv->key.ptr, dirkey, strlen(dirkey));
 
-       // the data is also a string
-       out_data->size = in_data->size;
-       out_data->data = realloc(out_data->data, out_data->size + 1);
-       memcpy(out_data->data, in_data->data, in_data->size);
-       char *d = (char *)out_data->data;
-       d[out_data->size] = 0;
+       kv->val.len = strlen(username) + 1;
+       kv->val.ptr = strdup(username);
 
-       // please excuse my friend, he isn't null terminated
-       // printf("\033[32m\033[1mDirectory entry: %s -> %s\033[0m\n", (char *)out_key->data, (char *)out_data->data);
+       return(1);
 }
 
 
-// convert function for a use table record
-void convert_usetable(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
+// Convert a "usetable" record to a record on disk.
+int import_usetable(char *line, struct cdbkeyval *kv) {
+       char *token;
+       struct UseTable *u;
 
-       // the key is an int, which is the same size (32 bits) on both 32 and 64 bit systems
-       out_key->size = in_key->size;
-       out_key->data = realloc(out_key->data, out_key->size);
-       memcpy(out_key->data, in_key->data, in_key->size);
-
-       // the data is a "struct UseTable"
-       struct UseTable_32 *use32 = (struct UseTable_32 *)in_data->data;
-       out_data->size = sizeof(struct UseTable);
-       out_data->data = realloc(out_data->data, out_data->size);
-       memset(out_data->data, 0, out_data->size);
-       struct UseTable *use64 = (struct UseTable *)out_data->data;
+       u = malloc(sizeof(struct UseTable));
+       if (!u) {
+               fprintf(stderr, "import_usetable: malloc: %s\n", strerror(errno));
+               return(0);
+       }
+       memset(u, 0, sizeof(struct UseTable));
+       char *p = line;
+
+       for (int i=0; (token = strsep(&p, "|")); ++i) {
+               switch(i) {
+                       case 1:
+                               u->hash = atoi(token);
+                               break;
+                       case 2:
+                               u->timestamp = atol(token);
+                               break;
+               }
+       }
 
-       //  the data
-       use64->hash                     =               use32->hash;
-       use64->timestamp                = (time_t)      use32->timestamp;
+       // the key is just an int (the hash)
+       kv->key.len = sizeof(int);
+       kv->key.ptr = reallok(NULL, kv->key.len);
+       memcpy(kv->key.ptr, &u->hash, kv->key.len);
 
-       // printf("\033[32m\033[1muse table: %d , %s\033[0m\n", use64->hash, asctime(localtime(&use64->timestamp)));
+       kv->val.len = sizeof(struct UseTable);
+       kv->val.ptr = (char *) u;
+       return(1);
 }
 
 
-// convert function for large message texts
-void convert_bigmsgs(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
-
-       // The key is a packed long
-       int32_t in_msgnum;
-       long out_msgnum;
-       memcpy(&in_msgnum, in_key->data, sizeof(in_msgnum));
-       out_msgnum = (long)in_msgnum;
-
-       if (in_key->size != 4) {
-               fprintf(stderr, "\033[31m\033[1m *** SOURCE DATABASE IS NOT 32-BIT *** ABORTING *** \033[0m\n");
-               abort();
+// Import a full text search index record.
+// It's just like a msglists record: a key and a list of message numbers, but the key is "int" instead of "long"
+int import_fulltext(char *line, struct cdbkeyval *kv) {
+       int indexnum;
+       char *token, *mtoken;
+       char *p = line;
+       char *q = NULL;
+       int num_msgs = 0;
+       long *msglist = NULL;
+
+       for (int i=0; (token = strsep(&p, "|")); ++i) {
+               switch(i) {
+                       case 1:
+                               indexnum = atoi(token);
+                               break;
+                       case 2:
+                               q = token;
+                               for (int j=0; (mtoken = strsep(&q, ",")); ++j) {
+                                       msglist = realloc(msglist, (num_msgs+1) * sizeof(long));
+                                       msglist[num_msgs++] = atol(mtoken);
+                               }
+                               break;
+               }
        }
 
-       out_key->size = sizeof(long);
-       out_key->data = realloc(out_key->data, out_key->size);
-       memcpy(out_key->data, &out_msgnum, sizeof(long));
+       kv->key.len = sizeof(int);
+       kv->key.ptr = malloc(kv->key.len);
+       memcpy(kv->key.ptr, &indexnum, kv->key.len);
 
-       // the data is binary-ish but has no packed integers
-       out_data->size = in_data->size;
-       out_data->data = realloc(out_data->data, out_data->size);
-       memcpy(out_data->data, in_data->data, in_data->size);
+       kv->val.len = num_msgs * sizeof(long);
+       kv->val.ptr = (char *) msglist;
 
-       // printf("\033[32m\033[1mBigmsg %ld , length %d\033[0m\n", out_msgnum, out_data->size);
+       return(1);
 }
 
 
-// convert function for EUID Index records
-void convert_euidindex(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
+// Import an EUID Index record
+// euidindex|msgnum|roomnum|euid|
+int import_euidindex(char *line, struct cdbkeyval *kv) {
+       char euid[SIZ];
+       long msgnum;
+       long roomnum;
+       char *token;
+
+       char *p = line;
+       for (int i=0; (token = strsep(&p, "|")); ++i) {
+               switch(i) {
+                       case 1:
+                               msgnum = atol(token);
+                               break;
+                       case 2:
+                               roomnum = atol(token);
+                               break;
+                       case 3:
+                               strncpy(euid, token, sizeof(euid));
+                               break;
+               }
+       }
 
        // The structure of an euidindex record *key* is:
        // |----room_number----|----------EUID-------------|
        //    (sizeof long)       (actual length of euid)
+       kv->key.len = sizeof(long) + strlen(euid) + 1;
+       kv->key.ptr = reallok(NULL, kv->key.len);
+       memcpy(kv->key.ptr, &roomnum, sizeof(long));
+       strcpy(kv->key.ptr + sizeof(long), euid);
 
        // The structure of an euidindex record *value* is:
        // |-----msg_number----|----room_number----|----------EUID-------------|
        //    (sizeof long)       (sizeof long)       (actual length of euid)
+       kv->val.len = sizeof(long) + sizeof(long) + strlen(euid) + 1;
+       kv->val.ptr = (char *) reallok(NULL, kv->val.len);
+       memcpy(kv->val.ptr, &msgnum, sizeof(long));
+       memcpy(kv->val.ptr + sizeof(long), &roomnum, sizeof(long));
+       strcpy(kv->val.ptr + sizeof(long) + sizeof(long), euid);
 
-       int32_t in_msgnum = 0;
-       int32_t in_roomnum = 0;
-       char euid[SIZ];
-       long out_msgnum = 0;
-       long out_roomnum = 0;
-
-       memcpy(&in_msgnum, in_data->data, sizeof(in_msgnum));
-       memcpy(&in_roomnum, in_data->data+sizeof(int32_t), sizeof(in_msgnum));
-       strcpy(euid, in_data->data+(sizeof(int32_t)*2));
-
-       out_msgnum = (long) in_msgnum;
-       out_roomnum = (long) in_roomnum;
-       // printf("euidindex: msgnum=%ld, roomnum=%ld, euid=\"%s\"\n", out_msgnum, out_roomnum, euid);
+       return(1);
+}
 
-       out_key->size = sizeof(long) + strlen(euid) + 1;
-       out_key->data = realloc(out_key->data, out_key->size);
-       memcpy(out_key->data, &out_roomnum, sizeof(out_roomnum));
-       strcpy(out_key->data+sizeof(out_roomnum), euid);
 
-       out_data->size = sizeof(long) + sizeof(long) + strlen(euid) + 1;
-       out_data->data = realloc(out_data->data, out_data->size);
-       memcpy(out_data->data, &out_msgnum, sizeof(out_msgnum));
-       memcpy(out_data->data+sizeof(out_msgnum), &out_roomnum, sizeof(out_roomnum));
-       strcpy(out_data->data+sizeof(out_msgnum)+sizeof(out_roomnum), euid);
+// Import a "users by number" (secondary index) record
+// The key is a "long"
+int import_usersbynumber(char *line, struct cdbkeyval *kv) {
+       char *token;
+       long usernum;
+
+       char *p = line;
+       for (int i=0; (token = strsep(&p, "|")); ++i) {
+               switch(i) {
+                       case 1:
+                               usernum = atol(token);
+                               break;
+                       case 2:
+                               kv->key.len = sizeof(long);
+                               kv->key.ptr = reallok(NULL, sizeof(long));
+                               memcpy(kv->key.ptr, &usernum, kv->key.len);
+                               kv->val.ptr = (char *) strdup(token);
+                               kv->val.len = strlen(kv->val.ptr) + 1;
+                               return(1);
+               }
+       }
 
+       return(0);              // should never get here unless it's a bad record
+}
 
-       //int i;
-       //char ch;
-//
-       //printf("  in_key:             ");
-       //for (i=0; i<in_key->size; ++i) {
-               //ch = 0;
-               //memcpy(&ch, in_key->data+i, 1);
-               //printf("%02X ", (int) ch);
-       //}
-       //printf("\n");
-//
-       //printf(" out_key: ");
-       //for (i=0; i<out_key->size; ++i) {
-               //ch = 0;
-               //memcpy(&ch, out_key->data+i, 1);
-               //printf("%02X ", (int) ch);
-       //}
-       //printf("\n");
-//
-       //printf(" in_data:                         ");
-       //for (i=0; i<in_data->size; ++i) {
-               //ch = 0;
-               //memcpy(&ch, in_data->data+i, 1);
-       //      printf("%02X ", (int) ch);
-       //}
-       //printf("\n");
-//
-       //printf("out_data: ");
-       //for (i=0; i<out_data->size; ++i) {
-               //ch = 0;
-               //memcpy(&ch, out_data->data+i, 1);
-               //printf("%02X ", (int) ch);
-       //}
-       //printf("\n");
 
+// Import a config record
+// The key is the config key
+// The data is the config key, a null, the value, and another null
+int import_config(char *line, struct cdbkeyval *kv) {
+       char *token;
+       char *p = line;
+       char *k, *v;
+
+       for (int i=0; (token = strsep(&p, "|")); ++i) {
+               switch(i) {
+                       case 1:
+                               k = token;
+                               kv->key.len = strlen(token);
+                               kv->key.ptr = strdup(token);
+                               break;
+                       case 2:
+                               v = token;
+                               kv->val.len = strlen(k) + strlen(v) + 2;
+                               kv->val.ptr = (char *) reallok(NULL, kv->val.len);
+                               strcpy(kv->val.ptr, k);
+                               strcpy(kv->val.ptr + strlen(k) + 1, v);
+                               break;
+               }
+       }
 
+       return(1);
 }
 
 
-// convert users-by-number records
-void convert_usersbynumber(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
+// Ingest one line of dump data.  NOT REENTRANT
+void ingest_one(char *line, struct cdbkeyval *kv) {
 
-       // key is a long
-       // and remember ... "long" is int32_t on the source system
-       int32_t in_usernum;
-       long out_usernum;
-       memcpy(&in_usernum, in_key->data, sizeof(in_usernum));
-       out_usernum = (long) in_usernum;
+       static int good_rows = 0;
+       static int bad_rows = 0;
+       static int current_cdb = -1 ;
+       char record_type[32];
+       int row_was_good;
 
-       if (in_key->size != 4) {
-               fprintf(stderr, "\033[31m\033[1m *** SOURCE DATABASE IS NOT 32-BIT *** ABORTING *** \033[0m\n");
-               abort();
+       // Clear out our record buffer
+       memset(kv, 0, sizeof(struct cdbkeyval));
+       row_was_good = 0;
+
+       // Identify the record type we are currently working with,
+       // then call the correct conversion function to load up our record buffer.
+       extract_token(record_type, line, 0, '|', sizeof record_type);
+       if (!strcasecmp(record_type, "msgtext")) {
+               current_cdb = CDB_MSGMAIN;
+               row_was_good = import_msgtext(line, kv);
+       }
+       else if (!strcasecmp(record_type, "msgmeta")) {
+               current_cdb = CDB_MSGMAIN;
+               row_was_good = import_msgmeta(line, kv);
+       }
+       else if (!strcasecmp(record_type, "user")) {
+               current_cdb = CDB_USERS;
+               row_was_good = import_user(line, kv);
+       }
+       else if (!strcasecmp(record_type, "room")) {
+               current_cdb = CDB_ROOMS;
+               row_was_good = import_room(line, kv);
+       }
+       else if (!strcasecmp(record_type, "floor")) {
+               current_cdb = CDB_FLOORTAB;
+               row_was_good = import_floor(line, kv);
+       }
+       else if (!strcasecmp(record_type, "msglist")) {
+               current_cdb = CDB_MSGLISTS;
+               row_was_good = import_msglist(line, kv);
+       }
+       else if (!strcasecmp(record_type, "visit")) {
+               current_cdb = CDB_VISIT;
+               row_was_good = import_visit(line, kv);
+       }
+       else if (!strcasecmp(record_type, "dir")) {
+               current_cdb = CDB_DIRECTORY;
+               row_was_good = import_dir(line, kv);
+       }
+       else if (!strcasecmp(record_type, "use")) {
+               current_cdb = CDB_USETABLE;
+               row_was_good = import_usetable(line, kv);
+       }
+       else if (!strcasecmp(record_type, "bigmsg")) {
+               current_cdb = CDB_BIGMSGS;
+               row_was_good = import_msgtext(line, kv);
+       }
+       else if (!strcasecmp(record_type, "fulltext")) {
+               current_cdb = CDB_FULLTEXT;
+               row_was_good = import_fulltext(line, kv);
+       }
+       else if (!strcasecmp(record_type, "euidindex")) {
+               current_cdb = CDB_EUIDINDEX;
+               row_was_good = import_euidindex(line, kv);
+       }
+       else if (!strcasecmp(record_type, "usersbynumber")) {
+               current_cdb = CDB_USERSBYNUMBER;
+               row_was_good = import_usersbynumber(line, kv);
+       }
+       else if (!strcasecmp(record_type, "config")) {
+               current_cdb = CDB_CONFIG;
+               row_was_good = import_config(line, kv);
+       }
+       else {
+               current_cdb = -1 ;
        }
 
-       out_key->size = sizeof(out_usernum);
-       out_key->data = realloc(out_key->data, out_key->size);
-       memcpy(out_key->data, &out_usernum, sizeof(out_usernum));
+       // If the conversion function was successful, write the record to the database.
+       if ( (row_was_good) && (current_cdb >= 0) ) {
+               cdb_store(current_cdb, kv->key.ptr, kv->key.len, kv->val.ptr, kv->val.len);
+               ++good_rows;
+       }
+       else {
+               ++bad_rows;
+       }
 
-       // value is a string
-       out_data->size = in_data->size;
-       out_data->data = realloc(out_data->data, out_data->size);
-       memcpy(out_data->data, in_data->data, in_data->size);
+       fprintf(stderr, "\r   \033[32m%9d\033[0m / \033[31m%8d\033[0m ", good_rows, bad_rows);
+       fflush(stderr);
 
-       // printf("usersbynumber: %ld --> %s\n", out_usernum, (char *)out_data->data);
 }
 
 
-// convert function for a config record
-void convert_config(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
-
-       // the key is a string
-       out_key->size = in_key->size;
-       out_key->data = realloc(out_key->data, out_key->size + 1);
-       memcpy(out_key->data, in_key->data, in_key->size);
-       char *k = (char *)out_key->data;
-       k[out_key->size] = 0;
-
-       // the data is a pair of strings
-       out_data->size = in_data->size;
-       out_data->data = realloc(out_data->data, out_data->size + 1);
-       memcpy(out_data->data, in_data->data, in_data->size);
-       char *d = (char *)out_data->data;
-       d[out_data->size] = 0;
-
-       // please excuse my friend, he isn't null terminated
-       // printf("\033[32m\033[1mConfig entry: %s -> %s\033[0m\n", (char *)out_key->data, (char *)out_data->data+strlen(out_data->data)+1);
-}
+// This is the loop that loads the dump data.  NOT REENTRANT
+void ingest(void) {
+       static size_t line_alloc = 1;
+       static char *line;
+       static size_t line_len = 0;
+       int ch;
+       int begin_found = 0;
+       int end_found = 0;
+       struct cdbkeyval kv;
 
+       memset(&kv, 0, sizeof(struct cdbkeyval));
 
-// For obsolete databases, zero all the output
-void zero_function(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
-       out_key->size = 0;
-       out_data->size = 0;
-}
+       line = reallok(NULL, line_alloc);
 
+       do {
+               line_len = 0;
 
-void (*convert_functions[])(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) = {
-       convert_msgmain,        // CDB_MSGMAIN
-       convert_users,          // CDB_USERS
-       convert_rooms,          // CDB_ROOMS
-       convert_floors,         // CDB_FLOORTAB
-       convert_msglists,       // CDB_MSGLISTS
-       convert_visits,         // CDB_VISIT
-       convert_dir,            // CDB_DIRECTORY
-       convert_usetable,       // CDB_USETABLE
-       convert_bigmsgs,        // CDB_BIGMSGS
-       convert_msglists,       // CDB_FULLTEXT
-       convert_euidindex,      // CDB_EUIDINDEX
-       convert_usersbynumber,  // CDB_USERSBYNUMBER
-       zero_function,          // CDB_UNUSED1 (obsolete)
-       convert_config          // CDB_CONFIG
-};
-
-
-void convert_table(int which_cdb, DB_ENV *src_dbenv, DB_ENV *dst_dbenv) {
-       int ret;
-       int compressed;
-       char dbfilename[32];
-       uLongf destLen = 0;
-
-       // shamelessly swiped from https://docs.oracle.com/database/bdb181/html/programmer_reference/am_cursor.html
-       DB *src_dbp, *dst_dbp;
-       DBC *src_dbcp;
-       DBT in_key, in_data, out_key, out_data, uncomp_data;
-       int num_good_rows = 0;
-       int num_bad_rows = 0;
-
-       snprintf(dbfilename, sizeof dbfilename, "cdb.%02x", which_cdb);
-
-       // create a database handle for the source table
-       ret = db_create(&src_dbp, src_dbenv, 0);
-       if (ret) {
-               printf("db: db_create: %s\n", db_strerror(ret));
-               printf("db: exit code %d\n", ret);
-               exit(CTDLEXIT_DB);
-       }
-
-       // open the file containing the source table
-       // printf("\033[33m\033[1mdb: opening source %s\033[0m\n", dbfilename);
-       ret = src_dbp->open(src_dbp, NULL, dbfilename, NULL, DB_BTREE, 0, 0600);
-       if (ret) {
-               printf("db: db_open: %s\n", db_strerror(ret));
-               printf("db: exit code %d\n", ret);
-               exit(CTDLEXIT_DB);
-       }
-
-       // create a database handle for the destination table
-       ret = db_create(&dst_dbp, dst_dbenv, 0);
-       if (ret) {
-               printf("db: db_create: %s\n", db_strerror(ret));
-               printf("db: exit code %d\n", ret);
-               exit(CTDLEXIT_DB);
-       }
-
-       // open the file containing the destination table
-       // printf("\033[33m\033[1mdb: opening destination %s\033[0m\n", dbfilename);
-       ret = dst_dbp->open(dst_dbp, NULL, dbfilename, NULL, DB_BTREE, (DB_CREATE | DB_TRUNCATE), 0600);
-       if (ret) {
-               printf("db: db_open: %s\n", db_strerror(ret));
-               printf("db: exit code %d\n", ret);
-               exit(CTDLEXIT_DB);
-       }
-
-       // Acquire a cursor to read the source table
-       // printf("\033[33m\033[1mdb: acquiring cursor\033[0m\n");
-       if ((ret = src_dbp->cursor(src_dbp, NULL, &src_dbcp, 0)) != 0) {
-               printf("db: db_cursor: %s\n", db_strerror(ret));
-               printf("db: exit code %d\n", ret);
-               exit(CTDLEXIT_DB);
-       }
-
-       // Zero out these database keys
-       memset(&in_key,         0, sizeof(DBT));        // input
-       memset(&in_data,        0, sizeof(DBT));
-       memset(&out_key,        0, sizeof(DBT));        // output
-       memset(&out_data,       0, sizeof(DBT));
-       memset(&uncomp_data,    0, sizeof(DBT));        // decompressed input (the key doesn't change)
-
-       // Walk through the database, calling convert functions as we go and clearing buffers before each call.
-       while (out_key.size = 0, out_data.size = 0, (ret = src_dbcp->get(src_dbcp, &in_key, &in_data, DB_NEXT)) == 0) {
+               while (ch = getc(stdin), ((ch != '\n') && (ch > 0))) {
+                       if ((line_len+2) > line_alloc) {
+                               line_alloc *= 2;
+                               line = reallok(line, line_alloc);
+                       }
+                       line[line_len++] = ch;
+                       line[line_len] = 0;
+               }
        
-               // If either the key or data are zero length, skip this record
-               if ((in_key.size == 0) || (in_data.size == 0)) {
-                       ++num_bad_rows;
-                       // printf("\033[31minput keylen=%d , datalen=%d , skipping record\033[0m\n", in_key.size, in_data.size);
+               if (ch <= 0) {
+                       return;
                }
 
-               else {  // Both key and data are >0 length so we're good to go
-
-                       // Do we need to decompress?
-                       static int32_t magic = COMPRESS_MAGIC;
-                       compressed = 0;
-                       if ( (in_data.size >= sizeof(struct CtdlCompressHeader_32)) && (!memcmp(in_data.data, &magic, sizeof(magic))) ) {
-       
-                               // yes, we need to decompress
-                               compressed = 1;
-                               struct CtdlCompressHeader_32 comp32;
-                               memcpy(&comp32, in_data.data, sizeof(struct CtdlCompressHeader_32));
-                               uncomp_data.size = comp32.uncompressed_len;
-                               uncomp_data.data = realloc(uncomp_data.data, uncomp_data.size);
-                               destLen = (uLongf)comp32.uncompressed_len;
-       
-                               ret = uncompress((Bytef *)uncomp_data.data, (uLongf *)&destLen, (const Bytef *)in_data.data+sizeof(struct CtdlCompressHeader_32), (uLong)comp32.compressed_len);
-                               if (ret != Z_OK) {
-                                       printf("db: uncompress() error %d\n", ret);
-                                       exit(CTDLEXIT_DB);
-                               }
-                               // printf("DB: %02x ,  in_keylen: %-3d ,  in_datalen: %-10d , dataptr: %012lx \033[31m(decompressed)\033[0m\n", which_cdb, (int)in_key.size, comp32.uncompressed_len, (long unsigned int)uncomp_data.data);
-                       }
-                       else {
-                               // printf("DB: %02x ,  in_keylen: %-3d ,  in_datalen: %-10d , dataptr: %012lx\n", which_cdb, (int)in_key.size, (int)in_data.size, (long unsigned int)in_data.data);
+               if (line_len > 0) {
+                       if ( (begin_found) && (!end_found) ) {
+                               ingest_one(line, &kv);
                        }
-       
-                       // Call the convert function registered to this table
-                       convert_functions[which_cdb](which_cdb, &in_key, (compressed ? &uncomp_data : &in_data), &out_key, &out_data);
-
-                       // write the converted record to the target database
-                       if (out_key.size > 0) {
-       
-                               // printf("DB: %02x , out_keylen: %-3d , out_datalen: %-10d , dataptr: %012lx\n", which_cdb, (int)out_key.size, (int)out_data.size, (long unsigned int)out_data.data);
-                               ret = dst_dbp->put(dst_dbp, NULL, &out_key, &out_data, 0);
-       
-                               if (ret) {
-                                       printf("db: cdb_put(%d): %s", which_cdb, db_strerror(ret));
-                                       exit(CTDLEXIT_DB);
-                               }
-                               ++num_good_rows;
+                       if (!strncasecmp(line, HKEY("begin|"))) {
+                               begin_found = 1;
+                               fprintf(stderr, "   good rows / bad rows:\n");
                        }
-                       else {
-                               ++num_bad_rows;
-                               // printf("\033[31moutput keylen=%d , skipping record\033[0m\n", out_key.size);
+                       if (!strncasecmp(line, HKEY("end|"))) {
+                               fprintf(stderr, "\n");
+                               end_found = 1;
                        }
-
-               // Knowing the total number of rows isn't critical to the program.  It's just for the user to know.
-               printf("\033[33m%5d\033[37m  \033[32m%9d\033[37m  \033[31m%8d\033[0m\r", which_cdb, num_good_rows, num_bad_rows);
-               fflush(stdout);
                }
-       }
-
-       if (ret != DB_NOTFOUND) {
-               printf("db: db_get: %s\n", db_strerror(ret));
-               printf("db: exit code %d\n", ret);
-               exit(CTDLEXIT_DB);
-       }
-
-       printf("\n");
 
-       // free any leftover out_data pointers
-       free(out_key.data);
-       free(out_data.data);
-       free(uncomp_data.data);
+       } while (ch >= 0);
 
-       // ...and close the database (table)
-       // printf("\033[33m\033[1mdb: closing source %02x\033[0m\n", which_cdb);
-       ret = src_dbp->close(src_dbp, 0);
-       if (ret) {
-               printf("db: db_close: %s\n", db_strerror(ret));
+       if (!begin_found) {
+               fprintf(stderr, "\033[31mWARNING: \"begin\" line was not found in the loaded data.\033[0m\n");
        }
-
-       // printf("\033[33m\033[1mdb: closing destination %02x\033[0m\n", which_cdb);
-       ret = dst_dbp->close(dst_dbp, 0);
-       if (ret) {
-               printf("db: db_close: %s\n", db_strerror(ret));
+       if (!end_found) {
+               fprintf(stderr, "\033[31mWARNING: \"end\" line was not found in the loaded data.\033[0m\n");
        }
-
-       // printf("\n");
-
 }
 
 
+// Main entry point
 int main(int argc, char **argv) {
-       char *src_dir = NULL;
-       char *dst_dir = NULL;
        int confirmed = 0;
-       static DB_ENV *src_dbenv;               // Source DB environment (global)
-       static DB_ENV *dst_dbenv;               // Source DB environment (global)
-
-       // Check to make sure we're running on the target 64-bit system
-       if (sizeof(void *) != 8) {
-               fprintf(stderr, "%s: this is a %ld-bit system.\n", argv[0], sizeof(void *)*8);
-               fprintf(stderr, "%s: you must run this on a 64-bit system, onto which a 32-bit database has been copied.\n", argv[0]);
-               exit(1);
-       }
+       char *ctdldir = CTDLDIR;
+
+       // display the greeting
+       fprintf(stderr,
+               "\033[44m\033[1m╔════════════════════════════════════════════════════════════════════════╗\033[0m\n"
+               "\033[44m\033[1m║ DB Load utility for Citadel                                            ║\033[0m\n"
+               "\033[44m\033[1m║ Copyright (c) 2023-2024 by citadel.org et al.                          ║\033[0m\n"
+               "\033[44m\033[1m║ This program is open source software.  Use, duplication, or disclosure ║\033[0m\n"
+               "\033[44m\033[1m║ is subject to the terms of the GNU General Public license v3.          ║\033[0m\n"
+               "\033[44m\033[1m╚════════════════════════════════════════════════════════════════════════╝\033[0m\n"
+       );
 
        // Parse command line
        int a;
-       while ((a = getopt(argc, argv, "h:d:y")) != EOF) {
+       while ((a = getopt(argc, argv, "h:y")) != EOF) {
                switch (a) {
                case 'h':
-                       src_dir = optarg;
-                       break;
-               case 'd':
-                       dst_dir = optarg;
+                       ctdldir = optarg;
                        break;
                case 'y':
                        confirmed = 1;
                        break;
                default:
-                       fprintf(stderr, "%s: usage: %s -s source_dir -d dest_dir\n", argv[0], argv[0]);
+                       fprintf(stderr, "%s: usage: %s -h citadel_dir [<dumpfile]\n", argv[0], argv[0]);
                        exit(2);
                }
        }
 
-       // Warn the user
-       printf("------------------------------------------------------------------------\n");
-       printf("ctdl3264 converts a Citadel database written on a 32-bit system to one  \n");
-       printf("that can be run on a 64-bit system.  It is intended to be run OFFLINE.  \n");
-       printf("Neither the source nor the target data directories should be mounted by \n");
-       printf("a running Citadel server.  We \033[1mguarantee\033[0m data corruption if you do not   \n");
-       printf("observe this warning!  The source [-s] directory should contain a copy  \n");
-       printf("of the database from your 32-bit system.  The destination [-d] directory\n");
-       printf("should be empty and will receive your 64-bit database.                  \n");
-       printf("------------------------------------------------------------------------\n");
-       printf("     Source 32-bit directory: %s\n", src_dir);
-       printf("Destination 64-bit directory: %s\n", dst_dir);
-       printf("------------------------------------------------------------------------\n");
-
        if (confirmed == 1) {
-               printf("You have specified the [-y] flag, so processing will continue.\n");
+               fprintf(stderr, "ctdlload: You have specified the [-y] flag, so processing will continue.\n");
        }
        else {
-               printf("Please read [ https://www.citadel.org/ctdl3264.html ] to learn how to proceed.\n");
-               exit(0);
+               fprintf(stderr, "ctdlload: usage: ctdlload -y -h[citadel_dir] <[dump_file]\n");
+               fprintf(stderr, "          -y : yes, I know this program can do damage and I want to run it anyway.\n");
+               fprintf(stderr, "          -h : [citadel_dir] is your server directory, usually /usr/local/citadel\n");
+               fprintf(stderr, "          Please read [ https://www.citadel.org/dump-and-load.html ] to learn how to proceed.\n");
+               exit(1);
        }
 
-
-       src_dbenv = open_dbenv(src_dir);
-       dst_dbenv = open_dbenv(dst_dir);
-       printf("table  good rows  bad rows\n");
-       printf("-----  ---------  --------\n");
-       for (int i = 0; i < MAXCDB; ++i) {
-               convert_table(i, src_dbenv, dst_dbenv);
+       if (chdir(ctdldir) != 0) {
+               fprintf(stderr, "ctdlload: unable to change directory to [%s]: %m", ctdldir);
+               exit(2);
        }
-       close_dbenv(src_dbenv);
-       close_dbenv(dst_dbenv);
 
+       // backend modules use syslog -- redirect to stderr
+       openlog("ctdlload", LOG_PERROR , LOG_DAEMON);
+
+       // Remove any database that is already in the target directory (yes, delete it, be careful)
+       system("rm -fv ./data/*");
+
+       // initialize the database backend
+       cdb_init_backends();
+       cdb_open_databases();
+
+       // Load rows from the input source
+       ingest();
+
+       // close databases
+       cdb_close_databases();
+
+       fprintf(stderr, "ctdlload: \033[32m\033[1mfinished\033[0m\n");
        exit(0);
 }