summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ext/dbm/dbm.c6
-rw-r--r--ext/dbm/extconf.rb5
3 files changed, 19 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d0c2dc..f3f86ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Feb 22 06:02:42 2012 Tanaka Akira <akr@fsij.org>
+
+ * ext/dbm/dbm.c (fdbm_initialize): disable Berkeley DB error messages.
+
+ * ext/dbm/extconf.rb: check DBC type for above.
+
+ [ruby-dev:45269]
+
Tue Feb 21 20:23:47 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (rb_any_hash): treat Qundef like as other special constants.
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index d6d1f49..30f0d9d 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -196,6 +196,12 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
#if defined(HAVE_DBM_DIRFNO)
rb_fd_fix_cloexec(dbm_dirfno(dbm));
#endif
+
+#if defined(_DB_H_) && defined(HAVE_TYPE_DBC)
+ /* Disable Berkeley DB error messages such as:
+ * DB->put: attempt to modify a read-only database */
+ ((DBC*)dbm)->dbp->set_errfile(((DBC*)dbm)->dbp, NULL);
+#endif
}
if (!dbm) {
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index 751fb40..f2bf148 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -222,6 +222,11 @@ def headers.db_check2(db, hdr)
return false
end
+ # DBC type is required to disable error messages by Berkeley DB 2 or later.
+ if have_db_header
+ have_type("DBC", hdr, hsearch)
+ end
+
if hsearch
$defs << hsearch
@defs = hsearch