-// Attempt to convert your database from 32-bit to 64-bit.
+// Attempt to your database from 32-bit to 64-bit.
// Don't run this. It doesn't work and if you try to run it you will immediately die.
//
// Copyright (c) 2023 by Art Cancro citadel.org
#include "../server/citadel_dirs.h"
#include "ctdl3264_structs.h"
-static DB_ENV *dbenv; // The DB environment (global)
+// Open a database environment
+DB_ENV *open_dbenv(char *dirname) {
+
+ DB_ENV *dbenv = NULL;
-// Open the database environment
-void open_dbenv(char *src_dir) {
int ret;
int i;
u_int32_t flags = 0;
);
// Create synthetic integer version numbers and compare them.
- // Never allow citserver to run with a libdb older then the one with which it was compiled.
+ // 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) {
}
flags = DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_INIT_LOG;
- printf("db: dbenv open(dir=%s, flags=%d)\n", src_dir, flags);
- ret = dbenv->open(dbenv, src_dir, flags, 0);
+ 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);
}
+
+ return(dbenv);
}
-void close_dbenv(void) {
+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));
+ printf("db: dbenv->close: %s\n", db_strerror(ret));
}
}
-// placeholder convert function for the data types not yet implemented
-void null_function(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
-}
-
-
// 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;
if (in_key->size != 4) {
printf("\033[31m\033[1m *** SOURCE DATABASE IS NOT 32-BIT *** ABORTING *** \033[0m\n");
abort();
}
-
// If the msgnum is negative, we are looking at METADATA
if (in_msgnum < 0) {
struct MetaData_32 *meta32 = (struct MetaData_32 *)in_data->data;
- //printf("metadata: msgnum=%d , refcount=%d , content_type=\"%s\" , rfc822len=%d\n",
- //meta32->meta_msgnum, meta32->meta_refcount, meta32->meta_content_type, meta32->meta_rfc822_length);
+ 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);
- out_msgnum = (long)in_msgnum;
memcpy(out_key->data, &out_msgnum, sizeof(long));
out_data->size = sizeof(struct MetaData);
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;
-
}
// 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);
- out_msgnum = (long)in_msgnum;
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);
}
// If the msgnum is 0 it's probably not a valid record.
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);
}
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);
}
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);
+}
+
+
+// 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";
+
+ // 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;
+
+ if (in_key->size != 4) {
+ printf("\033[31m\033[1m *** SOURCE DATABASE IS NOT 32-BIT *** ABORTING *** \033[0m\n");
+ abort();
+ }
+
+ 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);
+
+ // 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);
+
+ 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);
+ }
+}
+
+
+// convert function for a visit record
+void convert_visits(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
+
+ // 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 %ld, gen %ld, user %ld\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 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;
+}
+
+
+// convert function for a directory record
+void convert_dir(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 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;
+
+ // 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);
+}
+
+
+// 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) {
+
+ // the key is a string
+ 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;
+
+ // the data
+ strcpy(use64->ut_msgid, use32->ut_msgid);
+ use64->ut_timestamp = (time_t) use32->ut_timestamp;
+}
+
+
+// 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) {
+ printf("\033[31m\033[1m *** SOURCE DATABASE IS NOT 32-BIT *** ABORTING *** \033[0m\n");
+ abort();
+ }
+
+ // 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);
+
+ printf("\033[32m\033[1mBigmsg %ld , length %d\033[0m\n", out_msgnum, out_data->size);
+}
+
+
+// convert function for EUID Index records
+void convert_euidindex(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
+
+ // The structure of an euidindex record *key* is:
+ // |----room_number----|----------EUID-------------|
+ // (sizeof long) (actual length of euid)
+
+ // The structure of an euidindex record *value* is:
+ // |-----msg_number----|----room_number----|----------EUID-------------|
+ // (sizeof long) (sizeof long) (actual length of 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);
+
+ 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);
+
+
+ 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");
+
+
+}
+
+
+// convert users-by-number records
+void convert_usersbynumber(int which_cdb, DBT *in_key, DBT *in_data, DBT *out_key, DBT *out_data) {
+
+ // 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;
+
+ if (in_key->size != 4) {
+ printf("\033[31m\033[1m *** SOURCE DATABASE IS NOT 32-BIT *** ABORTING *** \033[0m\n");
+ abort();
+ }
+
+ 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));
+
+ // 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);
+
+ 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);
+}
+
+
+// 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;
}
convert_users, // CDB_USERS
convert_rooms, // CDB_ROOMS
convert_floors, // CDB_FLOORTAB
- null_function, // CDB_MSGLISTS
- null_function, // CDB_VISIT
- null_function, // CDB_DIRECTORY
- null_function, // CDB_USETABLE
- null_function, // CDB_BIGMSGS
- null_function, // CDB_FULLTEXT
- null_function, // CDB_EUIDINDEX
- null_function, // CDB_USERSBYNUMBER
- null_function, // CDB_EXTAUTH
- null_function // CDB_CONFIG
+ 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) {
+void convert_table(int which_cdb, DB_ENV *src_dbenv, DB_ENV *dst_dbenv) {
int ret;
+ int compressed;
char dbfilename[32];
+ uLongf destLen = 0;
- printf("\033[32m\033[1mConverting table %d\033[0m\n", which_cdb);
+ printf("\033[43m\033[K\033[0m\n");
+ printf("\033[43m\033[30m Converting table %02x \033[K\033[0m\n", which_cdb);
+ printf("\033[43m\033[K\033[0m\n");
// shamelessly swiped from https://docs.oracle.com/database/bdb181/html/programmer_reference/am_cursor.html
- DB *dbp;
- DBC *dbcp;
- DBT in_key, in_data, out_key, out_data;
+ DB *src_dbp, *dst_dbp;
+ DBC *src_dbcp;
+ DBT in_key, in_data, out_key, out_data, uncomp_data, recomp_data;
int num_rows = 0;
- // create a database handle
- ret = db_create(&dbp, dbenv, 0);
+ // 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
+ // open the file containing the source table
snprintf(dbfilename, sizeof dbfilename, "cdb.%02x", which_cdb);
- printf("\033[33m\033[1mdb: opening %s\033[0m\n", dbfilename);
- ret = dbp->open(dbp, NULL, dbfilename, NULL, DB_BTREE, 0, 0600);
+ 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);
}
- // Acquire a cursor
- if ((ret = dbp->cursor(dbp, NULL, &dbcp, 0)) != 0) {
+ // 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
+ snprintf(dbfilename, sizeof dbfilename, "cdb.%02x", which_cdb);
+ 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
+ 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(in_key));
- memset(&in_data, 0, sizeof(in_data));
- memset(&out_key, 0, sizeof(out_key));
- memset(&out_data, 0, sizeof(out_data));
+ 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)
+ memset(&recomp_data, 0, sizeof(DBT)); // recompressed 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 = dbcp->get(dbcp, &in_key, &in_data, DB_NEXT)) == 0) {
-
- // FIXME handle compressed records here
+ while (out_key.size = 0, out_data.size = 0, (ret = src_dbcp->get(src_dbcp, &in_key, &in_data, DB_NEXT)) == 0) {
+
+ // 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);
+ }
// Call the convert function registered to this table
- convert_functions[which_cdb](which_cdb, &in_key, &in_data, &out_key, &out_data);
-
- // write the converted record to the new database
- printf("DB: %02x , in_keylen: %3d , in_datalen: %d , dataptr: %lx\n", which_cdb, (int)in_key.size, (int)in_data.size, (long unsigned int)in_data.data);
- printf("DB: %02x , out_keylen: %3d , out_datalen: %d , dataptr: %lx\n", which_cdb, (int)out_key.size, (int)out_data.size, (long unsigned int)out_data.data);
+ convert_functions[which_cdb](which_cdb, &in_key, (compressed ? &uncomp_data : &in_data), &out_key, &out_data);
+
+ // The logic here is that if the source data was compressed, we compress the output too
+ if (compressed) {
+ struct CtdlCompressHeader zheader;
+ memset(&zheader, 0, sizeof(struct CtdlCompressHeader));
+ zheader.magic = COMPRESS_MAGIC;
+ zheader.uncompressed_len = out_data.size;
+ recomp_data.data = realloc(recomp_data.data, ((out_data.size * 101) / 100) + 100 + sizeof(struct CtdlCompressHeader));
+
+ if (compress2((Bytef *)(recomp_data.data + sizeof(struct CtdlCompressHeader)), &destLen, (Bytef *)out_data.data, (uLongf) out_data.size, 1) != Z_OK) {
+ printf("db: compress() error\n");
+ exit(CTDLEXIT_DB);
+ }
+ recomp_data.size = destLen;
+ }
- // Knowing the total number of rows isn't critical to the program. It's just for the user to know.
- ++num_rows;
+ // write the converted record to the target database
+ if (out_key.size > 0) {
+
+ // If we compressed the output, write recomp_data instead of out_data
+ if (compressed) {
+ printf("DB: %02x , out_keylen: %-3d , out_datalen: %-10d , dataptr: %012lx \033[31m(compressed)\033[0m\n", which_cdb, (int)out_key.size, (int)recomp_data.size, (long unsigned int)recomp_data.data);
+ ret = dst_dbp->put(dst_dbp, NULL, &out_key, &recomp_data, 0);
+ }
+ else {
+ 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);
+ }
+
+ // Knowing the total number of rows isn't critical to the program. It's just for the user to know.
+ ++num_rows;
+ }
}
if (ret != DB_NOTFOUND) {
// free any leftover out_data pointers
free(out_key.data);
free(out_data.data);
+ free(uncomp_data.data);
+ free(recomp_data.data);
// Flush the logs...
//printf("\033[33m\033[1mdb: flushing the database logs\033[0m\n");
- //if ((ret = dbenv->log_flush(dbenv, NULL))) {
+ //if ((ret = src_dbenv->log_flush(src_dbenv, NULL))) {
//printf("db: log_flush: %s\n", db_strerror(ret));
//}
// ...and close the database (table)
printf("\033[33m\033[1mdb: closing database %02x\033[0m\n", which_cdb);
- ret = dbp->close(dbp, 0);
+ ret = src_dbp->close(src_dbp, 0);
if (ret) {
printf("db: db_close: %s\n", db_strerror(ret));
}
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) {
case 's':
src_dir = optarg;
break;
+ case 'd':
+ dst_dir = optarg;
+ break;
case 'y':
confirmed = 1;
break;
// Warn the user
printf("------------------------------------------------------------------------\n");
- printf("ctdl3264 converts a Citadel database written on a 32-bit system to one \n");
+ printf("ctdl3264 s 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 guarantee data corruption if you do not \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", "FIXME");
+ 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");
}
else {
- printf("Please consult the documentation to learn how to proceed.\n");
+ printf("Please read [ https://www.citadel.org/ctdl3264.html ] to learn how to proceed.\n");
exit(0);
}
- open_dbenv(src_dir);
+ src_dbenv = open_dbenv(src_dir);
+ dst_dbenv = open_dbenv(dst_dir);
for (int i = 0; i < MAXCDB; ++i) {
- convert_table(i);
+ convert_table(i, src_dbenv, dst_dbenv);
}
- close_dbenv();
+ close_dbenv(src_dbenv);
+ close_dbenv(dst_dbenv);
exit(0);
}