Mercurial > hg > xemacs-beta
view src/database.c @ 4952:19a72041c5ed
Mule-izing, various fixes related to char * arguments
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_result_status):
* postgresql/postgresql.c (Fpq_res_status):
Mule-ize large parts of it.
2010-01-26 Ben Wing <ben@xemacs.org>
* ldap/eldap.c (print_ldap):
* ldap/eldap.c (allocate_ldap):
Use write_ascstring().
src/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (build_ascstring):
* alloc.c (build_msg_cistring):
* alloc.c (staticpro_1):
* alloc.c (staticpro_name):
* alloc.c (staticpro_nodump_1):
* alloc.c (staticpro_nodump_name):
* alloc.c (unstaticpro_nodump_1):
* alloc.c (mcpro_1):
* alloc.c (mcpro_name):
* alloc.c (object_memory_usage_stats):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_once_early):
* buffer.c (print_buffer):
* buffer.c (vars_of_buffer):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.c (init_initial_directory):
* bytecode.c (invalid_byte_code):
* bytecode.c (print_compiled_function):
* bytecode.c (mark_compiled_function):
* chartab.c (print_table_entry):
* chartab.c (print_char_table):
* config.h.in:
* console-gtk.c:
* console-gtk.c (gtk_device_to_console_connection):
* console-gtk.c (gtk_semi_canonicalize_console_connection):
* console-gtk.c (gtk_canonicalize_console_connection):
* console-gtk.c (gtk_semi_canonicalize_device_connection):
* console-gtk.c (gtk_canonicalize_device_connection):
* console-stream.c (stream_init_frame_1):
* console-stream.c (vars_of_console_stream):
* console-stream.c (init_console_stream):
* console-x.c (x_semi_canonicalize_console_connection):
* console-x.c (x_semi_canonicalize_device_connection):
* console-x.c (x_canonicalize_device_connection):
* console-x.h:
* data.c (eq_with_ebola_notice):
* data.c (Fsubr_interactive):
* data.c (Fnumber_to_string):
* data.c (digit_to_number):
* device-gtk.c (gtk_init_device):
* device-msw.c (print_devmode):
* device-x.c (x_event_name):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-msw.c (vars_of_dialog_mswindows):
* doc.c (weird_doc):
* doc.c (Fsnarf_documentation):
* doc.c (vars_of_doc):
* dumper.c (pdump):
* dynarr.c:
* dynarr.c (Dynarr_realloc):
* editfns.c (Fuser_real_login_name):
* editfns.c (get_home_directory):
* elhash.c (print_hash_table_data):
* elhash.c (print_hash_table):
* emacs.c (main_1):
* emacs.c (vars_of_emacs):
* emodules.c:
* emodules.c (_emodules_list):
* emodules.c (Fload_module):
* emodules.c (Funload_module):
* emodules.c (Flist_modules):
* emodules.c (find_make_module):
* emodules.c (attempt_module_delete):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_subr):
* emodules.c (emodules_doc_sym):
* emodules.c (syms_of_module):
* emodules.c (vars_of_module):
* emodules.h:
* eval.c (print_subr):
* eval.c (signal_call_debugger):
* eval.c (build_error_data):
* eval.c (signal_error):
* eval.c (maybe_signal_error):
* eval.c (signal_continuable_error):
* eval.c (maybe_signal_continuable_error):
* eval.c (signal_error_2):
* eval.c (maybe_signal_error_2):
* eval.c (signal_continuable_error_2):
* eval.c (maybe_signal_continuable_error_2):
* eval.c (signal_ferror):
* eval.c (maybe_signal_ferror):
* eval.c (signal_continuable_ferror):
* eval.c (maybe_signal_continuable_ferror):
* eval.c (signal_ferror_with_frob):
* eval.c (maybe_signal_ferror_with_frob):
* eval.c (signal_continuable_ferror_with_frob):
* eval.c (maybe_signal_continuable_ferror_with_frob):
* eval.c (syntax_error):
* eval.c (syntax_error_2):
* eval.c (maybe_syntax_error):
* eval.c (sferror):
* eval.c (sferror_2):
* eval.c (maybe_sferror):
* eval.c (invalid_argument):
* eval.c (invalid_argument_2):
* eval.c (maybe_invalid_argument):
* eval.c (invalid_constant):
* eval.c (invalid_constant_2):
* eval.c (maybe_invalid_constant):
* eval.c (invalid_operation):
* eval.c (invalid_operation_2):
* eval.c (maybe_invalid_operation):
* eval.c (invalid_change):
* eval.c (invalid_change_2):
* eval.c (maybe_invalid_change):
* eval.c (invalid_state):
* eval.c (invalid_state_2):
* eval.c (maybe_invalid_state):
* eval.c (wtaerror):
* eval.c (stack_overflow):
* eval.c (out_of_memory):
* eval.c (print_multiple_value):
* eval.c (issue_call_trapping_problems_warning):
* eval.c (backtrace_specials):
* eval.c (backtrace_unevalled_args):
* eval.c (Fbacktrace):
* eval.c (warn_when_safe):
* event-Xt.c (modwarn):
* event-Xt.c (modbarf):
* event-Xt.c (check_modifier):
* event-Xt.c (store_modifier):
* event-Xt.c (emacs_Xt_format_magic_event):
* event-Xt.c (describe_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (store_modifier):
* event-gtk.c (gtk_reset_modifier_mapping):
* event-msw.c (dde_eval_string):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (FROB):
* event-msw.c (emacs_mswindows_format_magic_event):
* event-stream.c (external_debugging_print_event):
* event-stream.c (execute_help_form):
* event-stream.c (vars_of_event_stream):
* events.c (print_event_1):
* events.c (print_event):
* events.c (event_equal):
* extents.c (print_extent_1):
* extents.c (print_extent):
* extents.c (vars_of_extents):
* faces.c (print_face):
* faces.c (complex_vars_of_faces):
* file-coding.c:
* file-coding.c (print_coding_system):
* file-coding.c (print_coding_system_in_print_method):
* file-coding.c (default_query_method):
* file-coding.c (find_coding_system):
* file-coding.c (make_coding_system_1):
* file-coding.c (chain_print):
* file-coding.c (undecided_print):
* file-coding.c (gzip_print):
* file-coding.c (vars_of_file_coding):
* file-coding.c (complex_vars_of_file_coding):
* fileio.c:
* fileio.c (report_file_type_error):
* fileio.c (report_error_with_errno):
* fileio.c (report_file_error):
* fileio.c (barf_or_query_if_file_exists):
* fileio.c (vars_of_fileio):
* floatfns.c (matherr):
* fns.c (print_bit_vector):
* fns.c (Fmapconcat):
* fns.c (add_suffix_to_symbol):
* fns.c (add_prefix_to_symbol):
* frame-gtk.c:
* frame-gtk.c (Fgtk_window_id):
* frame-x.c (def):
* frame-x.c (x_cde_transfer_callback):
* frame.c:
* frame.c (Fmake_frame):
* gc.c (show_gc_cursor_and_message):
* gc.c (vars_of_gc):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (gtk_print_image_instance):
* glyphs-msw.c (mswindows_print_image_instance):
* glyphs-x.c (x_print_image_instance):
* glyphs-x.c (update_widget_face):
* glyphs.c (make_string_from_file):
* glyphs.c (print_image_instance):
* glyphs.c (signal_image_error):
* glyphs.c (signal_image_error_2):
* glyphs.c (signal_double_image_error):
* glyphs.c (signal_double_image_error_2):
* glyphs.c (xbm_mask_file_munging):
* glyphs.c (pixmap_to_lisp_data):
* glyphs.h:
* gui.c (gui_item_display_flush_left):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* intl-win32.c:
* intl-win32.c (langcode_to_lang):
* intl-win32.c (sublangcode_to_lang):
* intl-win32.c (Fmswindows_get_locale_info):
* intl-win32.c (lcid_to_locale_mule_or_no):
* intl-win32.c (mswindows_multibyte_to_unicode_print):
* intl-win32.c (complex_vars_of_intl_win32):
* keymap.c:
* keymap.c (print_keymap):
* keymap.c (ensure_meta_prefix_char_keymapp):
* keymap.c (Fkey_description):
* keymap.c (Ftext_char_description):
* lisp.h:
* lisp.h (struct):
* lisp.h (DECLARE_INLINE_HEADER):
* lread.c (Fload_internal):
* lread.c (locate_file):
* lread.c (read_escape):
* lread.c (read_raw_string):
* lread.c (read1):
* lread.c (read_list):
* lread.c (read_compiled_function):
* lread.c (init_lread):
* lrecord.h:
* marker.c (print_marker):
* marker.c (marker_equal):
* menubar-msw.c (displayable_menu_item):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar.c (vars_of_menubar):
* minibuf.c (reinit_complex_vars_of_minibuf):
* minibuf.c (complex_vars_of_minibuf):
* mule-charset.c (Fmake_charset):
* mule-charset.c (complex_vars_of_mule_charset):
* mule-coding.c (iso2022_print):
* mule-coding.c (fixed_width_query):
* number.c (bignum_print):
* number.c (ratio_print):
* number.c (bigfloat_print):
* number.c (bigfloat_finalize):
* objects-msw.c:
* objects-msw.c (mswindows_color_to_string):
* objects-msw.c (mswindows_color_list):
* objects-tty.c:
* objects-tty.c (tty_font_list):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c (xft_find_charset_font):
* objects-xlike-inc.c (endif):
* print.c:
* print.c (write_istring):
* print.c (write_ascstring):
* print.c (Fterpri):
* print.c (Fprint):
* print.c (print_error_message):
* print.c (print_vector_internal):
* print.c (print_cons):
* print.c (print_string):
* print.c (printing_unreadable_object):
* print.c (print_internal):
* print.c (print_float):
* print.c (print_symbol):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_canonicalize_host_name):
* process.c (print_process):
* process.c (report_process_error):
* process.c (report_network_error):
* process.c (make_process_internal):
* process.c (Fstart_process_internal):
* process.c (status_message):
* process.c (putenv_internal):
* process.c (vars_of_process):
* process.h:
* profile.c (vars_of_profile):
* rangetab.c (print_range_table):
* realpath.c (vars_of_realpath):
* redisplay.c (vars_of_redisplay):
* search.c (wordify):
* search.c (Freplace_match):
* sheap.c (sheap_adjust_h):
* sound.c (report_sound_error):
* sound.c (Fplay_sound_file):
* specifier.c (print_specifier):
* symbols.c (Fsubr_name):
* symbols.c (do_symval_forwarding):
* symbols.c (set_default_buffer_slot_variable):
* symbols.c (set_default_console_slot_variable):
* symbols.c (store_symval_forwarding):
* symbols.c (default_value):
* symbols.c (defsymbol_massage_name_1):
* symbols.c (defsymbol_massage_name_nodump):
* symbols.c (defsymbol_massage_name):
* symbols.c (defsymbol_massage_multiword_predicate_nodump):
* symbols.c (defsymbol_massage_multiword_predicate):
* symbols.c (defsymbol_nodump):
* symbols.c (defsymbol):
* symbols.c (defkeyword):
* symbols.c (defkeyword_massage_name):
* symbols.c (check_module_subr):
* symbols.c (deferror_1):
* symbols.c (deferror):
* symbols.c (deferror_massage_name):
* symbols.c (deferror_massage_name_and_message):
* symbols.c (defvar_magic):
* symeval.h:
* symeval.h (DEFVAR_SYMVAL_FWD):
* sysdep.c:
* sysdep.c (init_system_name):
* sysdll.c:
* sysdll.c (MAYBE_PREPEND_UNDERSCORE):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* sysdll.c (dll_close):
* sysdll.c (image_for_address):
* sysdll.c (my_find_image):
* sysdll.c (search_linked_libs):
* sysdll.h:
* sysfile.h:
* sysfile.h (DEFAULT_DIRECTORY_FALLBACK):
* syswindows.h:
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (Ftest_hash_tables):
* text.c (vars_of_text):
* text.h:
* tooltalk.c (tt_opnum_string):
* tooltalk.c (tt_message_arg_ival_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* tooltalk.c (vars_of_tooltalk):
* ui-gtk.c (Fdll_load):
* ui-gtk.c (type_to_marshaller_type):
* ui-gtk.c (Fgtk_import_function_internal):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* unicode.c (unicode_to_ichar):
* unicode.c (unicode_print):
* unicode.c (unicode_query):
* unicode.c (vars_of_unicode):
* unicode.c (complex_vars_of_unicode):
* win32.c:
* win32.c (mswindows_report_process_error):
* window.c (print_window):
* xemacs.def.in.in:
BASIC IDEA: Further fixing up uses of char * and CIbyte *
to reflect their actual semantics; Mule-izing some code;
redoing of the not-yet-working code to handle message translation.
Clean up code to handle message-translation (not yet working).
Create separate versions of build_msg_string() for working with
Ibyte *, CIbyte *, and Ascbyte * arguments. Assert that Ascbyte *
arguments are pure-ASCII. Make build_msg_string() be the same
as build_msg_ascstring(). Create same three versions of GETTEXT()
and DEFER_GETTEXT(). Also create build_defer_string() and
variants for the equivalent of DEFER_GETTEXT() when building a
string. Remove old CGETTEXT(). Clean up code where GETTEXT(),
DEFER_GETTEXT(), build_msg_string(), etc. was being called and
introduce some new calls to build_msg_string(), etc. Remove
GETTEXT() from calls to weird_doc() -- we assume that the
message snarfer knows about weird_doc(). Remove uses of
DEFER_GETTEXT() from error messages in sysdep.c and instead use
special comments /* @@@begin-snarf@@@ */ and /* @@@end-snarf@@@ */
that the message snarfer presumably knows about.
Create build_ascstring() and use it in many instances in place
of build_string(). The purpose of having Ascbyte * variants is
to make the code more self-documenting in terms of what sort of
semantics is expected for char * strings. In fact in the process
of looking for uses of build_string(), much improperly Mule-ized
was discovered.
Mule-ize a lot of code as described in previous paragraph,
e.g. in sysdep.c.
Make the error functions take Ascbyte * strings and fix up a
couple of places where non-pure-ASCII strings were being passed in
(file-coding.c, mule-coding.c, unicode.c). (It's debatable whether
we really need to make the error functions work this way. It
helps catch places where code is written in a way that message
translation won't work, but we may well never implement message
translation.)
Make staticpro() and friends take Ascbyte * strings instead of
raw char * strings. Create a const_Ascbyte_ptr dynarr type
to describe what's held by staticpro_names[] and friends,
create pdump descriptions for const_Ascbyte_ptr dynarrs, and
use them in place of specially-crafted staticpro descriptions.
Mule-ize certain other functions (e.g. x_event_name) by correcting
raw use of char * to Ascbyte *, Rawbyte * or another such type,
and raw use of char[] buffers to another type (usually Ascbyte[]).
Change many uses of write_c_string() to write_msg_string(),
write_ascstring(), etc.
Mule-ize emodules.c, emodules.h, sysdll.h.
Fix some un-Mule-ized code in intl-win32.c.
A comment in event-Xt.c and the limitations of the message
snarfer (make-msgfile or whatever) is presumably incorrect --
it should be smart enough to handle function calls spread over
more than one line. Clean up code in event-Xt.c that was
written awkwardly for this reason.
In config.h.in, instead of NEED_ERROR_CHECK_TYPES_INLINES,
create a more general XEMACS_DEFS_NEEDS_INLINE_DECLS to
indicate when inlined functions need to be declared in
xemacs.defs.in.in, and make use of it in xemacs.defs.in.in.
We need to do this because postgresql.c now calls qxestrdup(),
which is an inline function.
Make nconc2() and other such functions MODULE_API and put
them in xemacs.defs.in.in since postgresql.c now uses them.
Clean up indentation in lread.c and a few other places.
In text.h, document ASSERT_ASCTEXT_ASCII() and
ASSERT_ASCTEXT_ASCII_LEN(), group together the stand-in
encodings and add some more for DLL symbols, function and
variable names, etc.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Tue, 26 Jan 2010 23:22:30 -0600 |
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; }