From c5e418161641b539bc9442e6db0ddb04c8940294 Mon Sep 17 00:00:00 2001
From: Nathan Bryant <loanshark@uncensored.citadel.org>
Date: Tue, 9 Mar 1999 03:59:54 +0000
Subject: [PATCH]         * sysdep.c: call DLoader_Init() with an absolute path
 so that gdb can           find module symbols         * database.c: bail out
 if opening databases fails

---
 citadel/ChangeLog  | 5 +++++
 citadel/database.c | 6 ++++++
 citadel/sysdep.c   | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 927c81a86..810a456d4 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,8 @@
+1999-03-08 Nathan Bryant <bryant@cs.usm.maine.edu>
+	* sysdep.c: call DLoader_Init() with an absolute path so that gdb can
+	  find module symbols
+	* database.c: bail out if opening databases fails
+
 Sat Mar  6 01:55:55 EST 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 	* serv_chat.c: use memfmout(), *not* cprintf() to transmit express
 	  messages.  Calling cprintf() on strings >256 bytes crashes the server
diff --git a/citadel/database.c b/citadel/database.c
index ad91ccec1..ed7dce730 100644
--- a/citadel/database.c
+++ b/citadel/database.c
@@ -111,6 +111,7 @@ void open_databases(void) {
 	if (gdbms[CDB_MSGMAIN] == NULL) {
 		lprintf(2, "Cannot open msgmain: %s\n",
 			gdbm_strerror(gdbm_errno));
+		exit(1);
 		}
 
 	gdbms[CDB_USERSUPP] = gdbm_open("data/usersupp.gdbm", 0,
@@ -118,6 +119,7 @@ void open_databases(void) {
 	if (gdbms[CDB_USERSUPP] == NULL) {
 		lprintf(2, "Cannot open usersupp: %s\n",
 			gdbm_strerror(gdbm_errno));
+		exit(1);
 		}
 
 	gdbms[CDB_VISIT] = gdbm_open("data/visit.gdbm", 0,
@@ -125,6 +127,7 @@ void open_databases(void) {
 	if (gdbms[CDB_VISIT] == NULL) {
 		lprintf(2, "Cannot open visit file: %s\n",
 			gdbm_strerror(gdbm_errno));
+		exit(1);
 		}
 
 	gdbms[CDB_QUICKROOM] = gdbm_open("data/quickroom.gdbm", 0,
@@ -132,6 +135,7 @@ void open_databases(void) {
 	if (gdbms[CDB_QUICKROOM] == NULL) {
 		lprintf(2, "Cannot open quickroom: %s\n",
 			gdbm_strerror(gdbm_errno));
+		exit(1);
 		}
 
 	gdbms[CDB_FLOORTAB] = gdbm_open("data/floortab.gdbm", 0,
@@ -139,6 +143,7 @@ void open_databases(void) {
 	if (gdbms[CDB_FLOORTAB] == NULL) {
 		lprintf(2, "Cannot open floortab: %s\n",
 			gdbm_strerror(gdbm_errno));
+		exit(1);
 		}
 
 	gdbms[CDB_MSGLISTS] = gdbm_open("data/msglists.gdbm", 0,
@@ -146,6 +151,7 @@ void open_databases(void) {
 	if (gdbms[CDB_MSGLISTS] == NULL) {
 		lprintf(2, "Cannot open msglists: %s\n",
 			gdbm_strerror(gdbm_errno));
+		exit(1);
 		}
 
 	for (a=0; a<MAXKEYS; ++a) {
diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 18e66b9f3..e17290466 100644
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -875,7 +875,7 @@ int main(int argc, char **argv)
 		}
 
 	lprintf(7, "Initializing loadable modules\n");
-	DLoader_Init("./modules");
+	DLoader_Init(BBSDIR "/modules");
 	lprintf(9, "Modules done initializing.\n");
 
 	/*
-- 
2.39.2