This commit was manufactured by cvs2svn to create branch 'PHP_4_3'.

diff --git a/ext/dba/dba_db4.c b/ext/dba/dba_db4.c
new file mode 100644 (file)
index 0000000..de3eb34
--- /dev/null
+++ b/ext/dba/dba_db4.c
@@ -0,0 +1,239 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 4                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2002 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author: Sascha Schumann <sascha@schumann.cx>                         |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+
+#if DBA_DB4
+#include "php_db4.h"
+#include <sys/stat.h>
+
+#include <string.h>
+#ifdef DB4_INCLUDE_FILE
+#include DB4_INCLUDE_FILE
+#else
+#include <db.h>
+#endif
+
+static void php_dba_db4_errcall_fcn(const char *errpfx, char *msg)
+{
+       TSRMLS_FETCH();
+       
+       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s%s", errpfx?errpfx:"", msg);
+}
+
+#define DB4_DATA dba_db4_data *dba = info->dbf
+#define DB4_GKEY \
+       DBT gkey; \
+       memset(&gkey, 0, sizeof(gkey)); \
+       gkey.data = (char *) key; gkey.size = keylen
+
+typedef struct {
+       DB *dbp;
+       DBC *cursor;
+} dba_db4_data;
+
+DBA_OPEN_FUNC(db4)
+{
+       DB *dbp = NULL;
+       DBTYPE type;
+       int gmode = 0, err;
+       int filemode = 0644;
+       struct stat check_stat;
+       int s = VCWD_STAT(info->path, &check_stat);
+
+       type =  info->mode == DBA_READER ? DB_UNKNOWN :
+               info->mode == DBA_TRUNC ? DB_BTREE :
+               s? DB_BTREE : DB_UNKNOWN;
+         
+       gmode = info->mode == DBA_READER ? DB_RDONLY :
+               (info->mode == DBA_CREAT && s) ? DB_CREATE : 
+               (info->mode == DBA_CREAT && !s) ? 0 :
+               info->mode == DBA_WRITER ? 0         : 
+               info->mode == DBA_TRUNC ? DB_CREATE | DB_TRUNCATE : -1;
+
+       if (gmode == -1) {
+               return FAILURE; /* not possible */
+       }
+
+       if (info->argc > 0) {
+               convert_to_long_ex(info->argv[0]);
+               filemode = Z_LVAL_PP(info->argv[0]);
+       }
+
+#ifdef DB_FCNTL_LOCKING
+       gmode |= DB_FCNTL_LOCKING;
+#endif
+
+       if ((err=db_create(&dbp, NULL, 0)) == 0) {
+           dbp->set_errcall(dbp, php_dba_db4_errcall_fcn);
+           if (
+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+                       (err=dbp->open(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) {
+#else
+                       (err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
+#endif
+                       dba_db4_data *data;
+
+                       data = pemalloc(sizeof(*data), info->flags&DBA_PERSISTENT);
+                       data->dbp = dbp;
+                       data->cursor = NULL;
+                       info->dbf = data;
+               
+                       return SUCCESS;
+               } else {
+                       dbp->close(dbp, 0);
+                       *error = db_strerror(err);
+               }
+       } else {
+               *error = db_strerror(err);
+       }
+
+       return FAILURE;
+}
+
+DBA_CLOSE_FUNC(db4)
+{
+       DB4_DATA;
+       
+       if (dba->cursor) dba->cursor->c_close(dba->cursor);
+       dba->dbp->close(dba->dbp, 0);
+       pefree(dba, info->flags&DBA_PERSISTENT);
+}
+
+DBA_FETCH_FUNC(db4)
+{
+       DBT gval;
+       char *new = NULL;
+       DB4_DATA;
+       DB4_GKEY;
+       
+       memset(&gval, 0, sizeof(gval));
+       if (!dba->dbp->get(dba->dbp, NULL, &gkey, &gval, 0)) {
+               if (newlen) *newlen = gval.size;
+               new = estrndup(gval.data, gval.size);
+       }
+       return new;
+}
+
+DBA_UPDATE_FUNC(db4)
+{
+       DBT gval;
+       DB4_DATA;
+       DB4_GKEY;
+       
+       memset(&gval, 0, sizeof(gval));
+       gval.data = (char *) val;
+       gval.size = vallen;
+
+       if (!dba->dbp->put(dba->dbp, NULL, &gkey, &gval, 
+                               mode == 1 ? DB_NOOVERWRITE : 0)) {
+               return SUCCESS;
+       }
+       return FAILURE;
+}
+
+DBA_EXISTS_FUNC(db4)
+{
+       DBT gval;
+       DB4_DATA;
+       DB4_GKEY;
+       
+       memset(&gval, 0, sizeof(gval));
+       if (!dba->dbp->get(dba->dbp, NULL, &gkey, &gval, 0)) {
+               return SUCCESS;
+       }
+       return FAILURE;
+}
+
+DBA_DELETE_FUNC(db4)
+{
+       DB4_DATA;
+       DB4_GKEY;
+
+       return dba->dbp->del(dba->dbp, NULL, &gkey, 0) ? FAILURE : SUCCESS;
+}
+
+DBA_FIRSTKEY_FUNC(db4)
+{
+       DB4_DATA;
+
+       if (dba->cursor) {
+               dba->cursor->c_close(dba->cursor);
+       }
+
+       dba->cursor = NULL;
+       if (dba->dbp->cursor(dba->dbp, NULL, &dba->cursor, 0) != 0) {
+               return NULL;
+       }
+
+       /* we should introduce something like PARAM_PASSTHRU... */
+       return dba_nextkey_db4(info, newlen TSRMLS_CC);
+}
+
+DBA_NEXTKEY_FUNC(db4)
+{
+       DB4_DATA;
+       DBT gkey, gval;
+       char *nkey = NULL;
+       
+       memset(&gkey, 0, sizeof(gkey));
+       memset(&gval, 0, sizeof(gval));
+
+       if (dba->cursor->c_get(dba->cursor, &gkey, &gval, DB_NEXT) == 0) {
+               if (gkey.data) {
+                       nkey = estrndup(gkey.data, gkey.size);
+                       if (newlen) *newlen = gkey.size;
+               }
+       }
+
+       return nkey;
+}
+
+DBA_OPTIMIZE_FUNC(db4)
+{
+       return SUCCESS;
+}
+
+DBA_SYNC_FUNC(db4)
+{
+       DB4_DATA;
+
+       return dba->dbp->sync(dba->dbp, 0) ? FAILURE : SUCCESS;
+}
+
+DBA_INFO_FUNC(db4)
+{
+       return estrdup(DB_VERSION_STRING);
+}
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */

diff --git a/ext/dba/tests/dba_db4.phpt b/ext/dba/tests/dba_db4.phpt
new file mode 100644 (file)
index 0000000..901ef70
--- /dev/null
+++ b/ext/dba/tests/dba_db4.phpt
@@ -0,0 +1,29 @@
+--TEST--
+DBA DB4 handler test
+--SKIPIF--
+<?php 
+       require_once('skipif.inc');
+       if (!in_array('db4', dba_handlers())) die('skip DB4 handler not available');
+?>
+--FILE--
+<?php
+       require_once('test.inc');
+       $handler = ini_get('dba.default_handler');//'db4';
+       require_once('dba_handler.inc');
+?>
+--EXPECT--
+database handler: db4
+3NYNYY
+Content String 2
+Content 2 replaced
+Read during write: not allowed
+Content 2 replaced 2nd time
+The 6th value
+array(3) {
+  ["key number 6"]=>
+  string(13) "The 6th value"
+  ["key2"]=>
+  string(27) "Content 2 replaced 2nd time"
+  ["key5"]=>
+  string(23) "The last content string"
+}