Mercurial > hg > xemacs-beta
view src/database.c @ 4885:6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
lisp/ChangeLog addition:
2010-01-24 Aidan Kehoe <kehoea@parhasard.net>
Correct the semantics of #'member*, #'eql, #'assoc* in the
presence of bignums; change the integerp byte code to fixnump
semantics.
* bytecomp.el (fixnump, integerp, byte-compile-integerp):
Change the integerp byte code to fixnump; add a byte-compile
method to integerp using fixnump and numberp and avoiding a
funcall most of the time, since in the non-core contexts where
integerp is used, it's mostly distinguishing between fixnums and
things that are not numbers at all.
* byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops)
(byte-compile-side-effect-and-error-free-ops):
Replace the integerp bytecode with fixnump; add fixnump to the
side-effect-free-fns. Add the other extended number type
predicates to the list in passing.
* obsolete.el (floatp-safe): Mark this as obsolete.
* cl.el (eql): Go into more detail in the docstring here. Don't
bother checking whether both arguments are numbers; one is enough,
#'equal will fail correctly if they have distinct types.
(subst): Replace a call to #'integerp (deciding whether to use
#'memq or not) with one to #'fixnump.
Delete most-positive-fixnum, most-negative-fixnum from this file;
they're now always in C, so they can't be modified from Lisp.
* cl-seq.el (member*, assoc*, rassoc*):
Correct these functions in the presence of bignums.
* cl-macs.el (cl-make-type-test): The type test for a fixnum is
now fixnump. Ditch floatp-safe, use floatp instead.
(eql): Correct this compiler macro in the presence of bignums.
(assoc*): Correct this compiler macro in the presence of bignums.
* simple.el (undo):
Change #'integerp to #'fixnump here, since we use #'delq with the
same value as ELT a few lines down.
src/ChangeLog addition:
2010-01-24 Aidan Kehoe <kehoea@parhasard.net>
Fix problems with #'eql, extended number types, and the hash table
implementation; change the Bintegerp bytecode to fixnump semantics
even on bignum builds, since #'integerp can have a fast
implementation in terms of #'fixnump for most of its extant uses,
but not vice-versa.
* lisp.h: Always #include number.h; we want the macros provided in
it, even if the various number types are not available.
* number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its
argument is of non-immediate number type. Equivalent to FLOATP if
WITH_NUMBER_TYPES is not defined.
* elhash.c (lisp_object_eql_equal, lisp_object_eql_hash):
Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP,
giving more correct behaviour in the presence of the extended
number types.
* bytecode.c (Bfixnump, execute_optimized_program):
Rename Bintegerp to Bfixnump; change its semantics to reflect the
new name on builds with bignum support.
* data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data):
Always make #'fixnump available, even on non-BIGNUM builds;
always implement #'integerp in this file, even on BIGNUM builds.
Move most-positive-fixnum, most-negative-fixnum here from
number.c, so they are Lisp constants even on builds without number
types, and attempts to change or bind them error.
Use the NUMBERP and INTEGERP macros even on builds without
extended number types.
* data.c (fixnum_char_or_marker_to_int):
Rename this function from integer_char_or_marker_to_int, to better
reflect the arguments it accepts.
* number.c (Fevenp, Foddp, syms_of_number):
Never provide #'integerp in this file. Remove #'oddp,
#'evenp; their implementations are overridden by those in cl.el.
* number.c (vars_of_number):
most-positive-fixnum, most-negative-fixnum are no longer here.
man/ChangeLog addition:
2010-01-23 Aidan Kehoe <kehoea@parhasard.net>
Generally: be careful to say fixnum, not integer, when talking
about fixed-precision integral types. I'm sure I've missed
instances, both here and in the docstrings, but this is a decent
start.
* lispref/text.texi (Columns):
Document where only fixnums, not integers generally, are accepted.
(Registers):
Remove some ancient char-int confoundance here.
* lispref/strings.texi (Creating Strings, Creating Strings):
Be more exact in describing where fixnums but not integers in
general are accepted.
(Creating Strings): Use a more contemporary example to illustrate
how concat deals with lists including integers about #xFF. Delete
some obsolete documentation on same.
(Char Table Types): Document that only fixnums are accepted as
values in syntax tables.
* lispref/searching.texi (String Search, Search and Replace):
Be exact in describing where fixnums but not integers in general
are accepted.
* lispref/range-tables.texi (Range Tables): Be exact in describing
them; only fixnums are accepted to describe ranges.
* lispref/os.texi (Killing XEmacs, User Identification)
(Time of Day, Time Conversion):
Be more exact about using fixnum where only fixed-precision
integers are accepted.
* lispref/objects.texi (Integer Type): Be more exact (and
up-to-date) about the possible values for
integers. Cross-reference to documentation of the bignum extension.
(Equality Predicates):
(Range Table Type):
(Array Type): Use fixnum, not integer, to describe a
fixed-precision integer.
(Syntax Table Type): Correct some English syntax here.
* lispref/numbers.texi (Numbers): Change the phrasing here to use
fixnum to mean the fixed-precision integers normal in emacs.
Document that our terminology deviates from that of Common Lisp,
and that we're working on it.
(Compatibility Issues): Reiterate the Common Lisp versus Emacs
Lisp compatibility issues.
(Comparison of Numbers, Arithmetic Operations):
* lispref/commands.texi (Command Loop Info, Working With Events):
* lispref/buffers.texi (Modification Time):
Be more exact in describing where fixnums but not integers in
general are accepted.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 24 Jan 2010 15:21:27 +0000 |
| parents | a98ca4640147 |
| children | 304aebb79cd3 |
line wrap: on
line source
/* Database access routines Copyright (C) 1996, William M. Perry Copyright (C) 2001, 2002, 2005 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Written by Bill Perry */ /* Substantially rewritten by Martin Buchholz */ /* db 2.x support added by Andreas Jaeger */ /* Mule-ized 6-22-00 Ben Wing */ #include <config.h> #include "lisp.h" #include "sysfile.h" #include "buffer.h" #include "file-coding.h" #ifndef HAVE_DATABASE #error HAVE_DATABASE not defined!! #endif #include "database.h" /* Our include file */ #ifdef HAVE_BERKELEY_DB /* Work around Berkeley DB's use of int types which are defined slightly differently in the not quite yet standard <inttypes.h>. See db.h for details of why we're resorting to this... */ /* glibc 2.1 doesn't have this problem with DB 2.x */ #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) #ifdef HAVE_INTTYPES_H #ifndef __BIT_TYPES_DEFINED__ #define __BIT_TYPES_DEFINED__ #endif #include <inttypes.h> #if !HAVE_U_INT8_T typedef uint8_t u_int8_t; #endif #if !HAVE_U_INT16_T typedef uint16_t u_int16_t; #endif #if !HAVE_U_INT32_T typedef uint32_t u_int32_t; #endif #ifdef WE_DONT_NEED_QUADS #if !HAVE_U_INT64_T typedef uint64_t u_int64_t; #endif #endif /* WE_DONT_NEED_QUADS */ #endif /* HAVE_INTTYPES_H */ #endif /* !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) */ /* Berkeley DB wants __STDC__ to be defined; else if does `#define const' */ #if ! defined (__STDC__) && ! defined(__cplusplus) #define __STDC__ 0 #endif #include DB_H_FILE /* Berkeley db's header file */ #ifndef DB_VERSION_MAJOR # define DB_VERSION_MAJOR 1 #endif /* DB_VERSION_MAJOR */ #ifndef DB_VERSION_MINOR # define DB_VERSION_MINOR 0 #endif /* DB_VERSION_MINOR */ Lisp_Object Qberkeley_db; Lisp_Object Qhash, Qbtree, Qrecno, Qunknown; #if DB_VERSION_MAJOR > 2 Lisp_Object Qqueue; #endif #endif /* HAVE_BERKELEY_DB */ #ifdef HAVE_DBM #ifdef CYGWIN_HEADERS #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif /* As of Cygwin 1.7.0, the prototypes in ndbm.h are broken when compiling using C++, since they are of the form `datum dbm_firstkey()', without any args given. */ /* Parameters to dbm_store for simple insertion or replacement. */ #define DBM_INSERT 0 #define DBM_REPLACE 1 /* The data and key structure. This structure is defined for compatibility. */ typedef struct { char *dptr; int dsize; } datum; /* The file information header. This is good enough for most applications. */ typedef struct {int dummy[10];} DBM; int dbm_clearerr(DBM *); void dbm_close(DBM *); int dbm_delete(DBM *, datum); int dbm_error(DBM *); datum dbm_fetch(DBM *, datum); datum dbm_firstkey(DBM *); datum dbm_nextkey(DBM *); DBM *dbm_open(const char *, int, mode_t); int dbm_store(DBM *, datum, datum, int); #if defined(__cplusplus) || defined(c_plusplus) } #endif #else #include NDBM_H_FILE #endif Lisp_Object Qdbm; #endif /* HAVE_DBM */ Lisp_Object Vdatabase_coding_system; Lisp_Object Qdatabasep; 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 *); } DB_FUNCS; struct Lisp_Database { struct LCRECORD_HEADER header; Lisp_Object fname; int mode; int access_; int dberrno; int live_p; #ifdef HAVE_DBM DBM *dbm_handle; #endif #ifdef HAVE_BERKELEY_DB DB *db_handle; #endif DB_FUNCS *funcs; Lisp_Object coding_system; }; #define XDATABASE(x) XRECORD (x, database, Lisp_Database) #define wrap_database(p) wrap_record (p, database) #define DATABASEP(x) 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) #define CHECK_LIVE_DATABASE(db) do { \ CHECK_DATABASE (db); \ if (!DATABASE_LIVE_P (XDATABASE(db))) \ invalid_operation ("Attempting to access closed database", db); \ } while (0) static Lisp_Database * allocate_database (void) { Lisp_Database *db = ALLOC_LCRECORD_TYPE (Lisp_Database, &lrecord_database); db->fname = Qnil; db->live_p = 0; #ifdef HAVE_BERKELEY_DB db->db_handle = NULL; #endif #ifdef HAVE_DBM db->dbm_handle = NULL; #endif db->access_ = 0; db->mode = 0; db->dberrno = 0; db->coding_system = Qnil; return db; } static const struct memory_description database_description[] = { { XD_LISP_OBJECT, offsetof (struct Lisp_Database, fname) }, { XD_END} }; static Lisp_Object mark_database (Lisp_Object object) { Lisp_Database *db = XDATABASE (object); return db->fname; } static void print_database (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag)) { Lisp_Database *db = XDATABASE (obj); if (print_readably) printing_unreadable_lcrecord (obj, 0); write_fmt_string_lisp (printcharfun, "#<database \"%s\" (%s/%s/", 3, db->fname, db->funcs->get_type (db), db->funcs->get_subtype (db)); write_fmt_string (printcharfun, "%s) ", (!DATABASE_LIVE_P (db) ? "closed" : (db->access_ & O_WRONLY) ? "writeonly" : (db->access_ & O_RDWR) ? "readwrite" : "readonly")); write_fmt_string_lisp (printcharfun, "coding: %s ", 1, XSYMBOL_NAME (XCODING_SYSTEM_NAME (db->coding_system))); write_fmt_string (printcharfun, "0x%x>", db->header.uid); } static void finalize_database (void *header, int for_disksave) { Lisp_Database *db = (Lisp_Database *) header; if (for_disksave) { invalid_operation ("Can't dump an emacs containing database objects", wrap_database (db)); } db->funcs->close (db); } DEFINE_LRECORD_IMPLEMENTATION ("database", database, 0, /*dumpable-flag*/ mark_database, print_database, finalize_database, 0, 0, database_description, Lisp_Database); DEFUN ("close-database", Fclose_database, 1, 1, 0, /* Close database DATABASE. */ (database)) { Lisp_Database *db; CHECK_LIVE_DATABASE (database); db = XDATABASE (database); db->funcs->close (db); db->live_p = 0; return Qnil; } DEFUN ("database-type", Fdatabase_type, 1, 1, 0, /* Return the type of database DATABASE. */ (database)) { CHECK_DATABASE (database); return XDATABASE (database)->funcs->get_type (XDATABASE (database)); } DEFUN ("database-subtype", Fdatabase_subtype, 1, 1, 0, /* Return the subtype of database DATABASE, if any. */ (database)) { CHECK_DATABASE (database); return XDATABASE (database)->funcs->get_subtype (XDATABASE (database)); } DEFUN ("database-live-p", Fdatabase_live_p, 1, 1, 0, /* Return t if OBJECT is an active database. */ (object)) { return DATABASEP (object) && DATABASE_LIVE_P (XDATABASE (object)) ? Qt : Qnil; } DEFUN ("database-file-name", Fdatabase_file_name, 1, 1, 0, /* Return the filename associated with the database DATABASE. */ (database)) { CHECK_DATABASE (database); return XDATABASE (database)->fname; } DEFUN ("databasep", Fdatabasep, 1, 1, 0, /* Return t if OBJECT is a database. */ (object)) { return DATABASEP (object) ? Qt : Qnil; } #ifdef HAVE_DBM static void dbm_map (Lisp_Database *db, Lisp_Object func) { datum keydatum, valdatum; Lisp_Object key, val; for (keydatum = dbm_firstkey (db->dbm_handle); keydatum.dptr != NULL; keydatum = dbm_nextkey (db->dbm_handle)) { valdatum = dbm_fetch (db->dbm_handle, keydatum); key = make_ext_string ((Extbyte *) keydatum.dptr, keydatum.dsize, db->coding_system); val = make_ext_string ((Extbyte *) valdatum.dptr, valdatum.dsize, db->coding_system); call2 (func, key, val); } } static Lisp_Object dbm_get (Lisp_Database *db, Lisp_Object key) { datum keydatum, valdatum; TO_EXTERNAL_FORMAT (LISP_STRING, key, ALLOCA, (keydatum.dptr, keydatum.dsize), db->coding_system); valdatum = dbm_fetch (db->dbm_handle, keydatum); return (valdatum.dptr ? make_ext_string ((Extbyte *) valdatum.dptr, valdatum.dsize, db->coding_system) : Qnil); } static int dbm_put (Lisp_Database *db, Lisp_Object key, Lisp_Object val, Lisp_Object replace) { datum keydatum, valdatum; TO_EXTERNAL_FORMAT (LISP_STRING, val, ALLOCA, (valdatum.dptr, valdatum.dsize), db->coding_system); TO_EXTERNAL_FORMAT (LISP_STRING, key, ALLOCA, (keydatum.dptr, keydatum.dsize), db->coding_system); return !dbm_store (db->dbm_handle, keydatum, valdatum, NILP (replace) ? DBM_INSERT : DBM_REPLACE); } static int dbm_remove (Lisp_Database *db, Lisp_Object key) { datum keydatum; TO_EXTERNAL_FORMAT (LISP_STRING, key, ALLOCA, (keydatum.dptr, keydatum.dsize), db->coding_system); return dbm_delete (db->dbm_handle, keydatum); } static Lisp_Object dbm_type (Lisp_Database *UNUSED (db)) { return Qdbm; } static Lisp_Object dbm_subtype (Lisp_Database *UNUSED (db)) { return Qnil; } static Lisp_Object dbm_lasterr (Lisp_Database *db) { return lisp_strerror (db->dberrno); } static void dbm_closeit (Lisp_Database *db) { if (db->dbm_handle) { dbm_close (db->dbm_handle); db->dbm_handle = NULL; } } static DB_FUNCS ndbm_func_block = { dbm_subtype, dbm_type, dbm_get, dbm_put, dbm_remove, dbm_map, dbm_closeit, dbm_lasterr }; #endif /* HAVE_DBM */ #ifdef HAVE_BERKELEY_DB static Lisp_Object berkdb_type (Lisp_Database *UNUSED (db)) { return Qberkeley_db; } static Lisp_Object berkdb_subtype (Lisp_Database *db) { if (!db->db_handle) return Qnil; switch (db->db_handle->type) { case DB_BTREE: return Qbtree; case DB_HASH: return Qhash; case DB_RECNO: return Qrecno; #if DB_VERSION_MAJOR > 2 case DB_QUEUE: return Qqueue; #endif default: return Qunknown; } } static Lisp_Object berkdb_lasterr (Lisp_Database *db) { return lisp_strerror (db->dberrno); } static Lisp_Object berkdb_get (Lisp_Database *db, Lisp_Object key) { DBT keydatum, valdatum; int status = 0; /* DB Version 2 requires DBT's to be zeroed before use. */ xzero (keydatum); xzero (valdatum); TO_EXTERNAL_FORMAT (LISP_STRING, key, ALLOCA, (keydatum.data, keydatum.size), db->coding_system); #if DB_VERSION_MAJOR == 1 status = db->db_handle->get (db->db_handle, &keydatum, &valdatum, 0); #else status = db->db_handle->get (db->db_handle, NULL, &keydatum, &valdatum, 0); #endif /* DB_VERSION_MAJOR */ if (!status) return make_ext_string ((const Extbyte *) valdatum.data, valdatum.size, db->coding_system); #if DB_VERSION_MAJOR == 1 db->dberrno = (status == 1) ? -1 : errno; #else db->dberrno = (status < 0) ? -1 : errno; #endif /* DB_VERSION_MAJOR */ return Qnil; } static int berkdb_put (Lisp_Database *db, Lisp_Object key, Lisp_Object val, Lisp_Object replace) { DBT keydatum, valdatum; int status = 0; /* DB Version 2 requires DBT's to be zeroed before use. */ xzero (keydatum); xzero (valdatum); TO_EXTERNAL_FORMAT (LISP_STRING, key, ALLOCA, (keydatum.data, keydatum.size), db->coding_system); TO_EXTERNAL_FORMAT (LISP_STRING, val, ALLOCA, (valdatum.data, valdatum.size), db->coding_system); #if DB_VERSION_MAJOR == 1 status = db->db_handle->put (db->db_handle, &keydatum, &valdatum, NILP (replace) ? R_NOOVERWRITE : 0); db->dberrno = (status == 1) ? -1 : errno; #else status = db->db_handle->put (db->db_handle, NULL, &keydatum, &valdatum, NILP (replace) ? DB_NOOVERWRITE : 0); db->dberrno = (status < 0) ? -1 : errno; #endif/* DV_VERSION_MAJOR = 2 */ return status; } static int berkdb_remove (Lisp_Database *db, Lisp_Object key) { DBT keydatum; int status; /* DB Version 2 requires DBT's to be zeroed before use. */ xzero (keydatum); TO_EXTERNAL_FORMAT (LISP_STRING, key, ALLOCA, (keydatum.data, keydatum.size), db->coding_system); #if DB_VERSION_MAJOR == 1 status = db->db_handle->del (db->db_handle, &keydatum, 0); #else status = db->db_handle->del (db->db_handle, NULL, &keydatum, 0); #endif /* DB_VERSION_MAJOR */ if (!status) return 0; #if DB_VERSION_MAJOR == 1 db->dberrno = (status == 1) ? -1 : errno; #else db->dberrno = (status < 0) ? -1 : errno; #endif /* DB_VERSION_MAJOR */ return 1; } static void berkdb_map (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)) { key = make_ext_string ((const Extbyte *) keydatum.data, keydatum.size, db->coding_system); val = make_ext_string ((const Extbyte *) valdatum.data, valdatum.size, db->coding_system); call2 (func, key, val); } #else { DBC *dbcp; #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)) { key = make_ext_string ((const Extbyte *) keydatum.data, keydatum.size, db->coding_system); val = make_ext_string ((const Extbyte *) valdatum.data, valdatum.size, db->coding_system); call2 (func, key, val); } dbcp->c_close (dbcp); } #endif /* DB_VERSION_MAJOR */ } static void berkdb_close (Lisp_Database *db) { if (db->db_handle) { #if DB_VERSION_MAJOR == 1 db->db_handle->sync (db->db_handle, 0); db->db_handle->close (db->db_handle); #else db->db_handle->sync (db->db_handle, 0); db->db_handle->close (db->db_handle, 0); #endif /* DB_VERSION_MAJOR */ db->db_handle = NULL; } } static DB_FUNCS berk_func_block = { berkdb_subtype, berkdb_type, berkdb_get, berkdb_put, berkdb_remove, berkdb_map, berkdb_close, berkdb_lasterr }; #endif /* HAVE_BERKELEY_DB */ DEFUN ("database-last-error", Fdatabase_last_error, 0, 1, 0, /* Return the last error associated with DATABASE. */ (database)) { if (NILP (database)) return lisp_strerror (errno); CHECK_DATABASE (database); return XDATABASE (database)->funcs->last_error (XDATABASE (database)); } DEFUN ("open-database", Fopen_database, 1, 6, 0, /* Return a new database object opened on FILE. Optional arguments TYPE and SUBTYPE specify the database type. Optional argument ACCESS specifies the access rights, which may be any combination of 'r' 'w' and '+', for read, write, and creation flags. Optional argument MODE gives the permissions to use when opening FILE, and defaults to 0755. Optional argument CODESYS specifies the coding system used to encode/decode data passed to/from the database, and defaults to the value of the variable `database-coding-system'. */ (file, type, subtype, access_, mode, codesys)) { /* This function can GC */ int modemask; int accessmask = 0; Lisp_Database *db = NULL; char *filename; struct gcpro gcpro1, gcpro2; CHECK_STRING (file); GCPRO2 (file, access_); file = Fexpand_file_name (file, Qnil); UNGCPRO; TO_EXTERNAL_FORMAT (LISP_STRING, file, C_STRING_ALLOCA, filename, Qfile_name); if (NILP (access_)) { accessmask = O_RDWR | O_CREAT; } else { char *acc; CHECK_STRING (access_); acc = (char *) XSTRING_DATA (access_); if (strchr (acc, '+')) accessmask |= O_CREAT; { char *rp = strchr (acc, 'r'); char *wp = strchr (acc, 'w'); if (rp && wp) accessmask |= O_RDWR; else if (wp) accessmask |= O_WRONLY; else accessmask |= O_RDONLY; } } if (NILP (mode)) { modemask = 0755; /* rwxr-xr-x */ } else { CHECK_INT (mode); modemask = XINT (mode); } if (NILP (codesys)) codesys = Vdatabase_coding_system; codesys = get_coding_system_for_text_file (codesys, 0); #ifdef HAVE_DBM if (NILP (type) || EQ (type, Qdbm)) { DBM *dbase = dbm_open (filename, accessmask, modemask); if (!dbase) return Qnil; db = allocate_database (); db->dbm_handle = dbase; db->funcs = &ndbm_func_block; db->coding_system = codesys; goto db_done; } #endif /* HAVE_DBM */ #ifdef HAVE_BERKELEY_DB if (NILP (type) || EQ (type, Qberkeley_db)) { DBTYPE real_subtype; DB *dbase; #if DB_VERSION_MAJOR != 1 int status; #endif if (EQ (subtype, Qhash) || NILP (subtype)) real_subtype = DB_HASH; else if (EQ (subtype, Qbtree)) real_subtype = DB_BTREE; else if (EQ (subtype, Qrecno)) real_subtype = DB_RECNO; #if DB_VERSION_MAJOR > 2 else if (EQ (subtype, Qqueue)) real_subtype = DB_QUEUE; #endif else invalid_constant ("Unsupported subtype", subtype); #if DB_VERSION_MAJOR == 1 dbase = dbopen (filename, accessmask, modemask, real_subtype, NULL); if (!dbase) return Qnil; #else /* Berkeley DB Version 2 has only the accessmask DB_CREATE and DB_RDONLY, other flags shouldn't be set */ if (NILP (access_)) accessmask = DB_CREATE; else { char *acc; CHECK_STRING (access_); acc = (char *) XSTRING_DATA (access_); accessmask = 0; if (strchr (acc, '+')) accessmask |= DB_CREATE; if (strchr (acc, 'r') && !strchr (acc, 'w')) accessmask |= DB_RDONLY; } #if DB_VERSION_MAJOR == 2 status = db_open (filename, real_subtype, accessmask, modemask, NULL , NULL, &dbase); if (status) return Qnil; #else status = db_create (&dbase, NULL, 0); if (status) return Qnil; #if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 1) status = dbase->open (dbase, filename, NULL, real_subtype, accessmask, modemask); #else /* DB_VERSION >= 4.1 */ /* You can't use DB_AUTO_COMMIT unless you have a txn environment. */ status = dbase->open (dbase, NULL, filename, NULL, real_subtype, accessmask, modemask); #endif /* DB_VERSION < 4.1 */ if (status) { dbase->close (dbase, 0); return Qnil; } #endif /* DB_VERSION_MAJOR > 2 */ /* Normalize into system specific file modes. Only for printing */ accessmask = accessmask & DB_RDONLY ? O_RDONLY : O_RDWR; #endif /* DB_VERSION_MAJOR */ db = allocate_database (); db->db_handle = dbase; db->funcs = &berk_func_block; db->coding_system = codesys; goto db_done; } #endif /* HAVE_BERKELEY_DB */ invalid_constant ("Unsupported database type", type); return Qnil; db_done: db->live_p = 1; db->fname = file; db->mode = modemask; db->access_ = accessmask; return wrap_database (db); } DEFUN ("put-database", Fput_database, 3, 4, 0, /* Store KEY and VALUE in DATABASE. If optional fourth arg REPLACE is non-nil, replace any existing entry in the database. */ (key, value, database, replace)) { CHECK_LIVE_DATABASE (database); CHECK_STRING (key); CHECK_STRING (value); { Lisp_Database *db = XDATABASE (database); int status = db->funcs->put (db, key, value, replace); return status ? Qt : Qnil; } } DEFUN ("remove-database", Fremove_database, 2, 2, 0, /* Remove KEY from DATABASE. */ (key, database)) { CHECK_LIVE_DATABASE (database); CHECK_STRING (key); { Lisp_Database *db = XDATABASE (database); int status = db->funcs->rem (db, key); return status ? Qt : Qnil; } } DEFUN ("get-database", Fget_database, 2, 3, 0, /* Return value for KEY in DATABASE. If there is no corresponding value, return DEFAULT (defaults to nil). */ (key, database, default_)) { CHECK_LIVE_DATABASE (database); CHECK_STRING (key); { Lisp_Database *db = XDATABASE (database); Lisp_Object retval = db->funcs->get (db, key); return NILP (retval) ? default_ : retval; } } DEFUN ("map-database", Fmapdatabase, 2, 2, 0, /* Map FUNCTION over entries in DATABASE, calling it with two args, each key and value in the database. */ (function, database)) { CHECK_LIVE_DATABASE (database); XDATABASE (database)->funcs->map (XDATABASE (database), function); return Qnil; } void syms_of_database (void) { INIT_LRECORD_IMPLEMENTATION (database); DEFSYMBOL (Qdatabasep); #ifdef HAVE_DBM DEFSYMBOL (Qdbm); #endif #ifdef HAVE_BERKELEY_DB DEFSYMBOL (Qberkeley_db); DEFSYMBOL (Qhash); DEFSYMBOL (Qbtree); DEFSYMBOL (Qrecno); #if DB_VERSION_MAJOR > 2 DEFSYMBOL (Qqueue); #endif DEFSYMBOL (Qunknown); #endif DEFSUBR (Fopen_database); DEFSUBR (Fdatabasep); DEFSUBR (Fmapdatabase); DEFSUBR (Fput_database); DEFSUBR (Fget_database); DEFSUBR (Fremove_database); DEFSUBR (Fdatabase_type); DEFSUBR (Fdatabase_subtype); DEFSUBR (Fdatabase_last_error); DEFSUBR (Fdatabase_live_p); DEFSUBR (Fdatabase_file_name); DEFSUBR (Fclose_database); } void vars_of_database (void) { #ifdef HAVE_DBM Fprovide (Qdbm); #endif #ifdef HAVE_BERKELEY_DB Fprovide (Qberkeley_db); #endif DEFVAR_LISP ("database-coding-system", &Vdatabase_coding_system /* Default coding system used to convert data in database files. */ ); Vdatabase_coding_system = Qnative; }
