Moved all of the gdbm databases to a separate "data" directory.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 91c45dd4ab0a402c79a7207fa3e90c07ef9c9747..374d3041a91bca981142899ba5d6e5d069977755 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,6 @@
+Sun Aug 30 21:52:43 EDT 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
+       * Moved all of the gdbm databases to a separate "data" directory.
+
 1998-08-26 Nathan Bryant <bryant@cs.usm.maine.edu>
        * Makefile.in: realclean removes Makefile, fixed `touch citadel.h'
          problem

diff --git a/citadel/database.c b/citadel/database.c
index 949a3726b0353b2e2b7f1f6b72b3a00844c98076..3827be57300f29f7429b3a3ef7cdf01183f63403 100644 (file)
--- a/citadel/database.c
+++ b/citadel/database.c
@@ -69,42 +69,48 @@ void defrag_databases(void) {
 void open_databases(void) {
        int a;
 
-       gdbms[CDB_MSGMAIN] = gdbm_open("msgmain.gdbm", 8192,
+       /*
+        * Silently try to create the database subdirectory.  If it's
+        * already there, no problem.
+        */
+       system("exec mkdir data 2>/dev/null");
+
+       gdbms[CDB_MSGMAIN] = gdbm_open("data/msgmain.gdbm", 8192,
                GDBM_WRCREAT, 0600, NULL);
        if (gdbms[CDB_MSGMAIN] == NULL) {
                lprintf(2, "Cannot open msgmain: %s\n",
                        gdbm_strerror(gdbm_errno));
                }
 
-       gdbms[CDB_USERSUPP] = gdbm_open("usersupp.gdbm", 0,
+       gdbms[CDB_USERSUPP] = gdbm_open("data/usersupp.gdbm", 0,
                GDBM_WRCREAT, 0600, NULL);
        if (gdbms[CDB_USERSUPP] == NULL) {
                lprintf(2, "Cannot open usersupp: %s\n",
                        gdbm_strerror(gdbm_errno));
                }
 
-       gdbms[CDB_QUICKROOM] = gdbm_open("quickroom.gdbm", 0,
+       gdbms[CDB_QUICKROOM] = gdbm_open("data/quickroom.gdbm", 0,
                GDBM_WRCREAT, 0600, NULL);
        if (gdbms[CDB_QUICKROOM] == NULL) {
                lprintf(2, "Cannot open quickroom: %s\n",
                        gdbm_strerror(gdbm_errno));
                }
 
-       gdbms[CDB_FLOORTAB] = gdbm_open("floortab.gdbm", 0,
+       gdbms[CDB_FLOORTAB] = gdbm_open("data/floortab.gdbm", 0,
                GDBM_WRCREAT, 0600, NULL);
        if (gdbms[CDB_FLOORTAB] == NULL) {
                lprintf(2, "Cannot open floortab: %s\n",
                        gdbm_strerror(gdbm_errno));
                }
 
-       gdbms[CDB_MSGLISTS] = gdbm_open("msglists.gdbm", 0,
+       gdbms[CDB_MSGLISTS] = gdbm_open("data/msglists.gdbm", 0,
                GDBM_WRCREAT, 0600, NULL);
        if (gdbms[CDB_MSGLISTS] == NULL) {
                lprintf(2, "Cannot open msglists: %s\n",
                        gdbm_strerror(gdbm_errno));
                }
 
-       gdbms[CDB_MAILBOXES] = gdbm_open("mailboxes.gdbm", 0,
+       gdbms[CDB_MAILBOXES] = gdbm_open("data/mailboxes.gdbm", 0,
                GDBM_WRCREAT, 0600, NULL);
        if (gdbms[CDB_MAILBOXES] == NULL) {
                lprintf(2, "Cannot open mailboxes: %s\n",