X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fdatabase.c;h=79dd595c5772208336d0c4a38d6329a581d2cb8b;hb=44ea030ec31ae441e59974eb9f6b2a9404611cd8;hp=e7750b6ed252ec436bcb78b249c1fe102020659d;hpb=a1655b870904de973c366d85ebdc8adde4ef5e1e;p=chise%2Fxemacs-chise.git.1

diff --git a/src/database.c b/src/database.c
index e7750b6..c30e990 100644
--- a/src/database.c
+++ b/src/database.c
@@ -27,7 +27,6 @@ Boston, MA 02111-1307, USA.  */
 #include <config.h>
 #include "lisp.h"
 #include "sysfile.h"
-#include "buffer.h"
 #include <errno.h>
 
 #ifndef HAVE_DATABASE
@@ -53,7 +52,7 @@ typedef uint64_t u_int64_t;
 #endif /* WE_DONT_NEED_QUADS */
 #endif /* HAVE_INTTYPES_H */
 #endif /* !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) */
-#include DB_H_FILE              /* Berkeley db's header file */
+#include DB_H_PATH              /* Berkeley db's header file */
 #ifndef DB_VERSION_MAJOR
 # define DB_VERSION_MAJOR 1
 #endif /* DB_VERSION_MAJOR */
@@ -66,31 +65,29 @@ Lisp_Object Qhash, Qbtree, Qrecno, Qunknown;
 Lisp_Object Qdbm;
 #endif /* HAVE_DBM */
 
-#ifdef MULE
-/* #### The following should be settable on a per-database level.
-   But the whole coding-system infrastructure should be rewritten someday.
-   We really need coding-system aliases. -- martin */
-Lisp_Object Vdatabase_coding_system;
-#endif
-
 Lisp_Object Qdatabasep;
 
+typedef enum { DB_DBM, DB_BERKELEY, DB_IS_UNKNOWN } XEMACS_DB_TYPE;
+
+struct Lisp_Database;
+
 typedef struct
 {
-  Lisp_Object (*get_subtype) (Lisp_Database *);
-  Lisp_Object (*get_type) (Lisp_Database *);
-  Lisp_Object (*get) (Lisp_Database *, Lisp_Object);
-  int (*put) (Lisp_Database *, Lisp_Object, Lisp_Object, Lisp_Object);
-  int (*rem) (Lisp_Database *, Lisp_Object);
-  void (*map) (Lisp_Database *, Lisp_Object);
-  void (*close) (Lisp_Database *);
-  Lisp_Object (*last_error) (Lisp_Database *);
+  Lisp_Object (*get_subtype) (struct Lisp_Database *);
+  Lisp_Object (*get_type) (struct Lisp_Database *);
+  Lisp_Object (*get) (struct Lisp_Database *, Lisp_Object);
+  int (*put) (struct Lisp_Database *, Lisp_Object, Lisp_Object, Lisp_Object);
+  int (*rem) (struct Lisp_Database *, Lisp_Object);
+  void (*map) (struct Lisp_Database *, Lisp_Object);
+  void (*close) (struct Lisp_Database *);
+  Lisp_Object (*last_error) (struct Lisp_Database *);
 } DB_FUNCS;
 
 struct Lisp_Database
 {
   struct lcrecord_header header;
   Lisp_Object fname;
+  XEMACS_DB_TYPE type;
   int mode;
   int access_;
   int dberrno;
@@ -107,9 +104,10 @@ struct Lisp_Database
 #endif
 };
 
-#define XDATABASE(x) XRECORD (x, database, Lisp_Database)
+#define XDATABASE(x) XRECORD (x, database, struct Lisp_Database)
 #define XSETDATABASE(x, p) XSETRECORD (x, p, database)
 #define DATABASEP(x) RECORDP (x, database)
+#define GC_DATABASEP(x) GC_RECORDP (x, database)
 #define CHECK_DATABASE(x) CHECK_RECORD (x, database)
 #define CONCHECK_DATABASE(x) CONCHECK_RECORD (x, database)
 #define DATABASE_LIVE_P(x) (x->live_p)
@@ -121,10 +119,11 @@ struct Lisp_Database
 } while (0)
 
 
-static Lisp_Database *
+static struct Lisp_Database *
 allocate_database (void)
 {
-  Lisp_Database *db = alloc_lcrecord_type (Lisp_Database, &lrecord_database);
+  struct Lisp_Database *db =
+    alloc_lcrecord_type (struct Lisp_Database, lrecord_database);
 
   db->fname = Qnil;
   db->live_p = 0;
@@ -137,6 +136,7 @@ allocate_database (void)
   db->access_ = 0;
   db->mode = 0;
   db->dberrno = 0;
+  db->type = DB_IS_UNKNOWN;
 #ifdef MULE
   db->coding_system = Fget_coding_system (Qbinary);
 #endif
@@ -144,17 +144,19 @@ allocate_database (void)
 }
 
 static Lisp_Object
-mark_database (Lisp_Object obj)
+mark_database (Lisp_Object obj, void (*markobj) (Lisp_Object))
 {
-  Lisp_Database *db = XDATABASE (obj);
-  return db->fname;
+  struct Lisp_Database *db = XDATABASE (obj);
+
+  ((markobj) (db->fname));
+  return Qnil;
 }
 
 static void
 print_database (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 {
   char buf[64];
-  Lisp_Database *db = XDATABASE (obj);
+  struct Lisp_Database *db = XDATABASE (obj);
 
   if (print_readably)
     error ("printing unreadable object #<database 0x%x>", db->header.uid);
@@ -174,12 +176,12 @@ print_database (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 static void
 finalize_database (void *header, int for_disksave)
 {
-  Lisp_Database *db = (Lisp_Database *) header;
+  struct Lisp_Database *db = (struct Lisp_Database *) header;
 
   if (for_disksave)
     {
       Lisp_Object obj;
-      XSETDATABASE (obj, db);
+      XSETOBJ (obj, Lisp_Type_Record, (void *) db);
 
       signal_simple_error
 	("Can't dump an emacs containing database objects", obj);
@@ -189,15 +191,15 @@ finalize_database (void *header, int for_disksave)
 
 DEFINE_LRECORD_IMPLEMENTATION ("database", database,
                                mark_database, print_database,
-			       finalize_database, 0, 0, 0,
-			       Lisp_Database);
+			       finalize_database, 0, 0,
+			       struct Lisp_Database);
 
 DEFUN ("close-database", Fclose_database, 1, 1, 0, /*
 Close database DATABASE.
 */
        (database))
 {
-  Lisp_Database *db;
+  struct Lisp_Database *db;
   CHECK_LIVE_DATABASE (database);
   db = XDATABASE (database);
   db->funcs->close (db);
@@ -253,7 +255,7 @@ Return t if OBJ is a database.
 
 #ifdef HAVE_DBM
 static void
-dbm_map (Lisp_Database *db, Lisp_Object func)
+dbm_map (struct Lisp_Database *db, Lisp_Object func)
 {
   datum keydatum, valdatum;
   Lisp_Object key, val;
@@ -270,7 +272,7 @@ dbm_map (Lisp_Database *db, Lisp_Object func)
 }
 
 static Lisp_Object
-dbm_get (Lisp_Database *db, Lisp_Object key)
+dbm_get (struct Lisp_Database *db, Lisp_Object key)
 {
   datum keydatum, valdatum;
 
@@ -284,7 +286,7 @@ dbm_get (Lisp_Database *db, Lisp_Object key)
 }
 
 static int
-dbm_put (Lisp_Database *db,
+dbm_put (struct Lisp_Database *db,
 	 Lisp_Object key, Lisp_Object val, Lisp_Object replace)
 {
   datum keydatum, valdatum;
@@ -299,7 +301,7 @@ dbm_put (Lisp_Database *db,
 }
 
 static int
-dbm_remove (Lisp_Database *db, Lisp_Object key)
+dbm_remove (struct Lisp_Database *db, Lisp_Object key)
 {
   datum keydatum;
 
@@ -310,25 +312,25 @@ dbm_remove (Lisp_Database *db, Lisp_Object key)
 }
 
 static Lisp_Object
-dbm_type (Lisp_Database *db)
+dbm_type (struct Lisp_Database *db)
 {
   return Qdbm;
 }
 
 static Lisp_Object
-dbm_subtype (Lisp_Database *db)
+dbm_subtype (struct Lisp_Database *db)
 {
   return Qnil;
 }
 
 static Lisp_Object
-dbm_lasterr (Lisp_Database *db)
+dbm_lasterr (struct Lisp_Database *db)
 {
   return lisp_strerror (db->dberrno);
 }
 
 static void
-dbm_closeit (Lisp_Database *db)
+dbm_closeit (struct Lisp_Database *db)
 {
   if (db->dbm_handle)
     {
@@ -352,13 +354,13 @@ static DB_FUNCS ndbm_func_block =
 
 #ifdef HAVE_BERKELEY_DB
 static Lisp_Object
-berkdb_type (Lisp_Database *db)
+berkdb_type (struct Lisp_Database *db)
 {
   return Qberkeley_db;
 }
 
 static Lisp_Object
-berkdb_subtype (Lisp_Database *db)
+berkdb_subtype (struct Lisp_Database *db)
 {
   if (!db->db_handle)
     return Qnil;
@@ -373,20 +375,23 @@ berkdb_subtype (Lisp_Database *db)
 }
 
 static Lisp_Object
-berkdb_lasterr (Lisp_Database *db)
+berkdb_lasterr (struct Lisp_Database *db)
 {
   return lisp_strerror (db->dberrno);
 }
 
 static Lisp_Object
-berkdb_get (Lisp_Database *db, Lisp_Object key)
+berkdb_get (struct Lisp_Database *db, Lisp_Object key)
 {
+  /* #### Needs mule-izing */
   DBT keydatum, valdatum;
   int status = 0;
 
-  /* DB Version 2 requires DBT's to be zeroed before use. */
+#if DB_VERSION_MAJOR == 2
+  /* Always initialize keydatum, valdatum. */
   xzero (keydatum);
   xzero (valdatum);
+#endif /* DV_VERSION_MAJOR = 2 */
 
   keydatum.data = XSTRING_DATA (key);
   keydatum.size = XSTRING_LENGTH (key);
@@ -398,7 +403,6 @@ berkdb_get (Lisp_Database *db, Lisp_Object key)
 #endif /* DB_VERSION_MAJOR */
 
   if (!status)
-    /* #### Not mule-ized! will crash! */
     return make_string ((Bufbyte *) valdatum.data, valdatum.size);
 
 #if DB_VERSION_MAJOR == 1
@@ -411,7 +415,7 @@ berkdb_get (Lisp_Database *db, Lisp_Object key)
 }
 
 static int
-berkdb_put (Lisp_Database *db,
+berkdb_put (struct Lisp_Database *db,
 	    Lisp_Object key,
 	    Lisp_Object val,
 	    Lisp_Object replace)
@@ -419,9 +423,11 @@ berkdb_put (Lisp_Database *db,
   DBT keydatum, valdatum;
   int status = 0;
 
-  /* DB Version 2 requires DBT's to be zeroed before use. */
+#if DB_VERSION_MAJOR == 2
+  /* Always initalize keydatum, valdatum. */
   xzero (keydatum);
   xzero (valdatum);
+#endif /* DV_VERSION_MAJOR = 2 */
 
   keydatum.data = XSTRING_DATA   (key);
   keydatum.size = XSTRING_LENGTH (key);
@@ -441,13 +447,15 @@ berkdb_put (Lisp_Database *db,
 }
 
 static int
-berkdb_remove (Lisp_Database *db, Lisp_Object key)
+berkdb_remove (struct Lisp_Database *db, Lisp_Object key)
 {
   DBT keydatum;
   int status;
 
-  /* DB Version 2 requires DBT's to be zeroed before use. */
+#if DB_VERSION_MAJOR == 2
+  /* Always initialize keydatum. */
   xzero (keydatum);
+#endif /* DV_VERSION_MAJOR = 2 */
 
   keydatum.data = XSTRING_DATA   (key);
   keydatum.size = XSTRING_LENGTH (key);
@@ -471,51 +479,45 @@ berkdb_remove (Lisp_Database *db, Lisp_Object key)
 }
 
 static void
-berkdb_map (Lisp_Database *db, Lisp_Object func)
+berkdb_map (struct Lisp_Database *db, Lisp_Object func)
 {
   DBT keydatum, valdatum;
   Lisp_Object key, val;
   DB *dbp = db->db_handle;
   int status;
 
-  xzero (keydatum);
-  xzero (valdatum);
-
 #if DB_VERSION_MAJOR == 1
   for (status = dbp->seq (dbp, &keydatum, &valdatum, R_FIRST);
        status == 0;
        status = dbp->seq (dbp, &keydatum, &valdatum, R_NEXT))
     {
-      /* #### Needs mule-izing */
+      /* ### Needs mule-izing */
       key = make_string ((Bufbyte *) keydatum.data, keydatum.size);
       val = make_string ((Bufbyte *) valdatum.data, valdatum.size);
       call2 (func, key, val);
     }
 #else
-  {
-    DBC *dbcp;
+  DBC *dbcp;
+  /* Initialize the key/data pair so the flags aren't set. */
+  xzero (keydatum);
+  xzero (valdatum);
 
-#if DB_VERSION_MAJOR > 2 || DB_VERSION_MINOR >=6
-    status = dbp->cursor (dbp, NULL, &dbcp, 0);
-#else
-    status = dbp->cursor (dbp, NULL, &dbcp);
-#endif
-    for (status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_FIRST);
-	 status == 0;
-	 status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_NEXT))
-      {
-	/* #### Needs mule-izing */
-	key = make_string ((Bufbyte *) keydatum.data, keydatum.size);
-	val = make_string ((Bufbyte *) valdatum.data, valdatum.size);
-	call2 (func, key, val);
-      }
-    dbcp->c_close (dbcp);
-  }
+  status = dbp->cursor (dbp, NULL, &dbcp);
+  for (status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_FIRST);
+       status == 0;
+       status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_NEXT))
+    {
+      /* ### Needs mule-izing */
+      key = make_string ((Bufbyte *) keydatum.data, keydatum.size);
+      val = make_string ((Bufbyte *) valdatum.data, valdatum.size);
+      call2 (func, key, val);
+    }
+  dbcp->c_close (dbcp);
 #endif /* DB_VERSION_MAJOR */
 }
 
 static void
-berkdb_close (Lisp_Database *db)
+berkdb_close (struct Lisp_Database *db)
 {
   if (db->db_handle)
     {
@@ -569,7 +571,7 @@ and defaults to 0755.
   /* This function can GC */
   int modemask;
   int accessmask = 0;
-  Lisp_Database *db = NULL;
+  struct Lisp_Database *db = NULL;
   char *filename;
   struct gcpro gcpro1, gcpro2;
 
@@ -577,10 +579,7 @@ and defaults to 0755.
   GCPRO2 (file, access_);
   file = Fexpand_file_name (file, Qnil);
   UNGCPRO;
-
-  TO_EXTERNAL_FORMAT (LISP_STRING, file,
-		      C_STRING_ALLOCA, filename,
-		      Qfile_name);
+  filename = (char *) XSTRING_DATA (file);
 
   if (NILP (access_))
     {
@@ -623,6 +622,7 @@ and defaults to 0755.
 
       db = allocate_database ();
       db->dbm_handle = dbase;
+      db->type = DB_DBM;
       db->funcs = &ndbm_func_block;
       goto db_done;
     }
@@ -676,6 +676,7 @@ and defaults to 0755.
 
       db = allocate_database ();
       db->db_handle = dbase;
+      db->type = DB_BERKELEY;
       db->funcs = &berk_func_block;
       goto db_done;
     }
@@ -708,7 +709,7 @@ replace any existing entry in the database.
   CHECK_STRING (key);
   CHECK_STRING (value);
   {
-    Lisp_Database *db = XDATABASE (database);
+    struct Lisp_Database *db = XDATABASE (database);
     int status = db->funcs->put (db, key, value, replace);
     return status ? Qt : Qnil;
   }
@@ -722,7 +723,7 @@ Remove KEY from DATABASE.
   CHECK_LIVE_DATABASE (database);
   CHECK_STRING (key);
   {
-    Lisp_Database *db = XDATABASE (database);
+    struct Lisp_Database *db = XDATABASE (database);
     int status = db->funcs->rem (db, key);
     return status ? Qt : Qnil;
   }
@@ -737,7 +738,7 @@ If there is no corresponding value, return DEFAULT (defaults to nil).
   CHECK_LIVE_DATABASE (database);
   CHECK_STRING (key);
   {
-    Lisp_Database *db = XDATABASE (database);
+    struct Lisp_Database *db = XDATABASE (database);
     Lisp_Object retval = db->funcs->get (db, key);
     return NILP (retval) ? default_ : retval;
   }
@@ -759,8 +760,6 @@ each key and value in the database.
 void
 syms_of_database (void)
 {
-  INIT_LRECORD_IMPLEMENTATION (database);
-
   defsymbol (&Qdatabasep, "databasep");
 #ifdef HAVE_DBM
   defsymbol (&Qdbm, "dbm");
@@ -796,13 +795,4 @@ vars_of_database (void)
 #ifdef HAVE_BERKELEY_DB
   Fprovide (Qberkeley_db);
 #endif
-
-#if 0 /* #### implement me! */
-#ifdef MULE
-  DEFVAR_LISP ("database-coding-system", &Vdatabase_coding_system /*
-Coding system used to convert data in database files.
-*/ );
-  Vdatabase_coding_system = Qnil;
-#endif
-#endif /* 0 */
 }