add Berkeley DB3 support

@- Added Berkeley DB3 support in DBA (Sascha)

6 files changed, 260 insertions, 2 deletions

diff --git a/ext/dba/Makefile.am b/ext/dba/Makefile.am
index 4316423834..2ab929391e 100644
--- a/ext/dba/Makefile.am
+++ b/ext/dba/Makefile.am
@@ -2,5 +2,5 @@
 
 noinst_LTLIBRARIES=libphpext_dba.la
 libphpext_dba_la_SOURCES=dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c \
-		dba_ndbm.c
+		dba_ndbm.c dba_db3.c
 
diff --git a/ext/dba/config.h.stub b/ext/dba/config.h.stub
index f65ae9b7fa..df25632a4b 100644
--- a/ext/dba/config.h.stub
+++ b/ext/dba/config.h.stub
@@ -6,11 +6,13 @@
 #define DB2_DB_DB2_H 0
 #define DB2_DB_H 0
 #define DB2_DB2_H 0
+#define DB3_DB_H 0
 #define HAVE_DBA 0
 #define DBA_GDBM 0
 #define DBA_NDBM 0
 #define DBA_DBOPEN 0
 #define DBA_DB2 0
+#define DBA_DB3 0
 #define DBA_DBM 0
 #define DBA_CDB 0
 
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index c33a6537c9..7ddcd8eb3b 100644
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -134,7 +134,7 @@ AC_ARG_WITH(db2,
       DB2_EXTRA="DB2_DB_H"
     fi
     
-    if test "$DB2_EXTRA" != ""; then
+    if test -n "$DB2_EXTRA"; then
       eval "AC_DEFINE($DB2_EXTRA, 1)"
     fi
 
@@ -152,6 +152,34 @@ AC_ARG_WITH(db2,
 AC_MSG_CHECKING(for Berkeley DB2 support)
 AC_DBA_STD_RESULT
 
+AC_ARG_WITH(db3,
+[  --with-db3[=DIR]        Include Berkeley DB3 support],[
+  if test "$withval" != "no"; then
+    for i in /usr/local /usr $withval; do
+      if test -f "$i/include/db.h" ; then
+        THIS_PREFIX="$i"
+        DB3_EXTRA="DB3_DB_H"
+      fi
+	done
+
+    if test -n "$DB3_EXTRA"; then
+      eval "AC_DEFINE($DB3_EXTRA, 1)"
+    fi
+
+    for LIB in db; do
+      AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
+      AC_CHECK_LIB($LIB, db_create, [AC_DEFINE(DBA_DB3,1) THIS_LIBS="$LIB"])
+      ])
+    done
+    
+    AC_DBA_STD_ASSIGN
+    AC_DBA_STD_CHECK
+    AC_DBA_STD_ATTACH
+  fi
+])
+AC_MSG_CHECKING(for Berkeley DB3 support)
+AC_DBA_STD_RESULT
+
 AC_ARG_WITH(dbm,
 [  --with-dbm[=DIR]        Include DBM support],[
   if test "$withval" != "no"; then
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index d0b5a183fb..dd5eeb9cd2 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -40,6 +40,7 @@
 #include "php3_dbm.h"
 #include "php3_cdb.h"
 #include "php3_db2.h"
+#include "php3_db3.h"
 
 function_entry dba_functions[] = {
 	PHP_FE(dba_open, NULL)
@@ -158,6 +159,9 @@ static dba_handler handler[] = {
 #if DBA_DB2
 	DBA_HND(db2)
 #endif
+#if DBA_DB3
+	DBA_HND(db3)
+#endif
 	{ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
 };
 
diff --git a/ext/dba/dba_db3.c b/ext/dba/dba_db3.c
new file mode 100644
index 0000000000..dece9634a4
--- /dev/null
+++ b/ext/dba/dba_db3.c
@@ -0,0 +1,212 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP HTML Embedded Scripting Language Version 3.0                     |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1999 PHP Development Team (See Credits file)           |
+   +----------------------------------------------------------------------+
+   | This program is free software; you can redistribute it and/or modify |
+   | it under the terms of one of the following licenses:                 |
+   |                                                                      |
+   |  A) the GNU General Public License as published by the Free Software |
+   |     Foundation; either version 2 of the License, or (at your option) |
+   |     any later version.                                               |
+   |                                                                      |
+   |  B) the PHP License as published by the PHP Development Team and     |
+   |     included in the distribution in the file: LICENSE                |
+   |                                                                      |
+   | This program 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 both licenses referred to here.   |
+   | If you did not, or have any questions about PHP licensing, please    |
+   | contact core@php.net.                                                |
+   +----------------------------------------------------------------------+
+   | Authors: Sascha Schumann <sas@schell.de>                             |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */
+
+#include "php.h"
+
+#if DBA_DB3
+#include "php3_db3.h"
+#include <sys/stat.h>
+
+#include <string.h>
+#if DB3_DB3_DB_H
+#include <db3/db.h>
+#elif DB3_DB_DB3_H
+#include <db/db3.h>
+#elif DB3_DB3_H
+#include <db3.h>
+#elif DB3_DB_H
+#include <db.h>
+#endif
+
+#define DB3_DATA dba_db3_data *dba = info->dbf
+#define DB3_GKEY \
+	DBT gkey; \
+	memset(&gkey, 0, sizeof(gkey)); \
+	gkey.data = (char *) key; gkey.size = keylen
+
+typedef struct {
+	DB *dbp;
+	DBC *cursor;
+} dba_db3_data;
+
+DBA_OPEN_FUNC(db3)
+{
+	DB *dbp = NULL;
+	DBTYPE type;
+	int gmode = 0;
+	int filemode = 0644;
+	struct stat check_stat;
+
+	type =  info->mode == DBA_READER ? DB_UNKNOWN :
+		info->mode == DBA_TRUNC ? DB_BTREE :
+		stat(info->path, &check_stat) ? DB_BTREE : DB_UNKNOWN;
+	  
+	gmode = info->mode == DBA_READER ? DB_RDONLY :
+		info->mode == DBA_CREAT  ? DB_CREATE : 
+		info->mode == DBA_WRITER ? 0         : 
+		info->mode == DBA_TRUNC ? DB_CREATE | DB_TRUNCATE : -1;
+
+	if (gmode == -1)
+		return FAILURE;
+
+	if (info->argc > 0) {
+		convert_to_long_ex(info->argv[0]);
+		filemode = (*info->argv[0])->value.lval;
+	}
+
+	if (db_create(&dbp, NULL, 0) == 0 &&
+			dbp->open(dbp, info->path, NULL, type, gmode, filemode) == 0) {
+		dba_db3_data *data;
+
+		data = malloc(sizeof(*data));
+		data->dbp = dbp;
+		data->cursor = NULL;
+		info->dbf = data;
+		
+		return SUCCESS;
+	} else if (dbp != NULL) {
+		dbp->close(dbp, 0);
+	}
+
+	return FAILURE;
+}
+
+DBA_CLOSE_FUNC(db3)
+{
+	DB3_DATA;
+	
+	if (dba->cursor) dba->cursor->c_close(dba->cursor);
+	dba->dbp->close(dba->dbp, 0);
+	free(dba);
+}
+
+DBA_FETCH_FUNC(db3)
+{
+	DBT gval;
+	char *new = NULL;
+	DB3_DATA;
+	DB3_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(db3)
+{
+	DBT gval;
+	DB3_DATA;
+	DB3_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(db3)
+{
+	DBT gval;
+	DB3_DATA;
+	DB3_GKEY;
+	
+	memset(&gval, 0, sizeof(gval));
+	if (!dba->dbp->get(dba->dbp, NULL, &gkey, &gval, 0)) {
+		return SUCCESS;
+	}
+	return FAILURE;
+}
+
+DBA_DELETE_FUNC(db3)
+{
+	DB3_DATA;
+	DB3_GKEY;
+
+	return dba->dbp->del(dba->dbp, NULL, &gkey, 0) ? FAILURE : SUCCESS;
+}
+
+DBA_FIRSTKEY_FUNC(db3)
+{
+	DB3_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_db3(info, newlen);
+}
+
+DBA_NEXTKEY_FUNC(db3)
+{
+	DB3_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(db3)
+{
+	return SUCCESS;
+}
+
+DBA_SYNC_FUNC(db3)
+{
+	DB3_DATA;
+
+	return dba->dbp->sync(dba->dbp, 0) ? FAILURE : SUCCESS;
+}
+
+#endif
diff --git a/ext/dba/php3_db3.h b/ext/dba/php3_db3.h
new file mode 100644
index 0000000000..4c00dfd448
--- /dev/null
+++ b/ext/dba/php3_db3.h
@@ -0,0 +1,12 @@
+#ifndef _PHP3_DB3_H
+#define _PHP3_DB3_H
+
+#if DBA_DB3
+
+#include "php3_dba.h"
+
+DBA_FUNCS(db3);
+
+#endif
+
+#endif