* compatibility with Berkeley DB < 3.3

[citadel.git] / citadel / database_sleepycat.c

diff --git a/citadel/database_sleepycat.c b/citadel/database_sleepycat.c
index d98215036ac4c5710b9448a7819c14c2cf185ca0..9f9670217df9713a9194c8de087c7424d0093c61 100644 (file)
--- a/citadel/database_sleepycat.c
+++ b/citadel/database_sleepycat.c
@@ -33,12 +33,12 @@
 #include <sys/stat.h>
 #include <dirent.h>
 
-#ifdef HAVE_DB4_DB_H
+#ifdef HAVE_DB_H
+#include <db.h>
+#elif defined(HAVE_DB4_DB_H)
 #include <db4/db.h>
 #elif defined(HAVE_DB3_DB_H)
 #include <db3/db.h>
-#elif defined(HAVE_DB_H)
-#include <db.h>
 #else
 #error Neither <db.h> nor <db3/db.h> was found by configure. Install db3-devel.
 #endif
@@ -49,6 +49,7 @@
 #include "dynloader.h"
 #include "citserver.h"
 #include "database.h"
+#include "msgbase.h"
 #include "sysdep_decls.h"
 
 static DB *dbp[MAXCDB];                /* One DB handle for each Citadel database */
@@ -187,6 +188,7 @@ static void cdb_cull_logs(void) {
        u_int32_t flags;
        int ret;
        char **file, **list;
+       char errmsg[SIZ];
 
        lprintf(5, "Database log file cull started.\n");
 
@@ -208,7 +210,19 @@ static void cdb_cull_logs(void) {
        if (list != NULL) {
                for (file = list; *file != NULL; ++file) {
                        lprintf(9, "Deleting log: %s\n", *file);
-                       unlink(*file);
+                       ret = unlink(*file);
+                       if (ret != 0) {
+                               snprintf(errmsg, sizeof(errmsg),
+                                       " ** ERROR **\n \n \n "
+                                       "Citadel was unable to delete the "
+                                       "database log file '%s' because of the "
+                                       "following error:\n \n %s\n \n"
+                                       " This log file is no longer in use "
+                                       "and may be safely deleted.\n",
+                                       *file,
+                                       strerror(errno));
+                               aide_message(errmsg);
+                       }
                }
                free(list);
        }
@@ -319,7 +333,7 @@ void open_databases(void)
                /* Arbitrary names for our tables -- we reference them by
                 * number, so we don't have string names for them.
                 */
-               sprintf(dbfilename, "cdb.%02x", i);
+               snprintf(dbfilename, sizeof dbfilename, "cdb.%02x", i);
 
                ret = dbp[i]->open(dbp[i],
                                dbfilename,
@@ -712,25 +726,69 @@ void cdb_trunc(int cdb)
 {
   DB_TXN *tid;
   int ret;
+#if DB_VERSION_MAJOR > 3 || DB_VERSION_MINOR > 2
   u_int32_t count;
+#endif
   
   if (MYTID != NULL)
     {
-      ret = dbp[cdb]->truncate(dbp[cdb],       /* db */
-                              MYTID,           /* transaction ID */
-                              &count,          /* #rows that were deleted */
-                              0);              /* flags */
-      if (ret)
-       {
-         lprintf(1, "cdb_truncate(%d): %s\n", cdb,
-                 db_strerror(ret));
-         abort();
-       }
+      lprintf(1, "cdb_trunc must not be called in a transaction.\n");
+      abort();
     }
   else
     {
       bailIfCursor(MYCURSORS, "attempt to write during r/o cursor");
       
+#if DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR < 3
+      for (;;)
+       {
+         DBT key, data;
+
+         /* Initialize the key/data pair so the flags aren't set. */
+         memset(&key, 0, sizeof(key));
+         memset(&data, 0, sizeof(data));
+
+         txbegin(&tid);
+         
+         ret = dbp[cdb]->cursor(dbp[cdb], tid, &MYCURSORS[cdb], 0);
+         if (ret)
+           {
+             lprintf(1, "cdb_trunc: db_cursor: %s\n", db_strerror(ret));
+             abort();
+           }
+
+         ret = MYCURSORS[cdb]->c_get(MYCURSORS[cdb],
+                                     &key, &data, DB_NEXT);
+         if (ret)
+           {
+             cclose(MYCURSORS[cdb]);
+             txabort(tid);
+             if (ret == DB_LOCK_DEADLOCK)
+               continue;
+
+             if (ret == DB_NOTFOUND)
+               break;
+
+             lprintf(1, "cdb_trunc: c_get: %s\n", db_strerror(ret));
+             abort();
+           }
+
+         ret = MYCURSORS[cdb]->c_del(MYCURSORS[cdb], 0);
+         if (ret)
+           {
+             cclose(MYCURSORS[cdb]);
+             txabort(tid);
+             if (ret == DB_LOCK_DEADLOCK)
+               continue;
+
+             lprintf(1, "cdb_trunc: c_del: %s\n", db_strerror(ret));
+             abort();
+           }
+
+         cclose(MYCURSORS[cdb]);
+         txcommit(tid);
+       }
+#else
     retry:
       txbegin(&tid);
       
@@ -755,5 +813,6 @@ void cdb_trunc(int cdb)
        {
          txcommit(tid);
        }
+#endif
     }
 }