move newly introduced flatfile support from dbm to new flatfile handler

# do not make the same mistake as with ext/db where it was not clear
# which format was used.

2 files changed, 349 insertions, 0 deletions

diff --git a/ext/dba/libflatfile/flatfile.c b/ext/dba/libflatfile/flatfile.c
new file mode 100644
index 0000000000..fe86f467d5
--- /dev/null
+++ b/ext/dba/libflatfile/flatfile.c
@@ -0,0 +1,302 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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.               |
+   +----------------------------------------------------------------------+
+   | Authors: Marcus Boerger <helly@php.net>                              |
+   | based on ext/db/db.c by:                                             |
+   |          Rasmus Lerdorf <rasmus@php.net>                             |
+   |          Jim Winstead <jimw@php.net>                                 |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+#include "php_globals.h"
+#include "safe_mode.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "dbm.h"
+
+/*
+ * ret = -1 means that database was opened for read-only
+ * ret = 0  success
+ * ret = 1  key already exists - nothing done
+ */
+
+/* {{{ dbm_file_store
+ */
+PHPAPI int dbm_file_store(dba_dbm_data *dba, datum key_datum, datum value_datum, int mode TSRMLS_DC) {
+	if (mode == DBM_INSERT) {
+		if (dbm_file_findkey(dba, key_datum TSRMLS_CC)) {
+			return 1;
+		}
+		php_stream_seek(dba->fp, 0L, SEEK_END);
+		php_stream_printf(dba->fp TSRMLS_CC, "%d\n", key_datum.dsize);
+		php_stream_flush(dba->fp);
+		if (php_stream_write(dba->fp, key_datum.dptr, key_datum.dsize) < key_datum.dsize)
+			return -1;
+		php_stream_printf(dba->fp TSRMLS_CC, "%d\n", value_datum.dsize);
+		php_stream_flush(dba->fp);
+		if (php_stream_write(dba->fp, value_datum.dptr, value_datum.dsize) < value_datum.dsize)
+			return -1;
+	} else { /* DBM_REPLACE */
+		dbm_file_delete(dba, key_datum TSRMLS_CC);
+		php_stream_printf(dba->fp TSRMLS_CC, "%d\n", key_datum.dsize);
+		php_stream_flush(dba->fp);
+		if (php_stream_write(dba->fp, key_datum.dptr, key_datum.dsize) < key_datum.dsize)
+			return -1;
+		php_stream_printf(dba->fp TSRMLS_CC, "%d\n", value_datum.dsize);
+		if (php_stream_write(dba->fp, value_datum.dptr, value_datum.dsize) < value_datum.dsize)
+			return -1;
+	}
+
+	return 0;
+}
+/* }}} */
+
+/* {{{ dbm_file_fetch
+ */
+PHPAPI datum dbm_file_fetch(dba_dbm_data *dba, datum key_datum TSRMLS_DC) {
+	datum value_datum = {NULL, 0};
+	int num=0, buf_size=1024;
+	char *buf;	
+
+	if (dbm_file_findkey(dba, key_datum TSRMLS_CC)) {
+		buf = emalloc((buf_size+1) * sizeof(char));
+		if (php_stream_gets(dba->fp, buf, 15)) {
+			num = atoi(buf);
+			if (num > buf_size) {
+				buf_size+=num;
+				buf = erealloc(buf, (buf_size+1)*sizeof(char));
+			}
+			php_stream_read(dba->fp, buf, num);
+			value_datum.dptr = buf;
+			value_datum.dsize = num;
+		} else {
+			value_datum.dptr = NULL;
+			value_datum.dsize = 0;
+			efree(buf);
+		}
+	}
+	return value_datum;
+}
+/* }}} */
+
+/* {{{ dbm_file_delete
+ */
+PHPAPI int dbm_file_delete(dba_dbm_data *dba, datum key_datum TSRMLS_DC) {
+	char *key = key_datum.dptr;
+	int size = key_datum.dsize;
+
+	char *buf;
+	int num, buf_size = 1024;
+	long pos;
+
+	php_stream_rewind(dba->fp);
+
+	buf = emalloc((buf_size + 1)*sizeof(char));
+	while(!php_stream_eof(dba->fp)) {
+		/* read in the length of the key name */
+		if (!php_stream_gets(dba->fp, buf, 15))
+			break;
+		num = atoi(buf);
+		if (num > buf_size) {
+			buf_size += num;
+			buf = erealloc(buf, (buf_size+1)*sizeof(char));
+		}
+		pos = php_stream_tell(dba->fp);
+
+		/* read in the key name */
+		num = php_stream_read(dba->fp, buf, sizeof(char)*num);
+		if (num<0) 
+			break;
+		*(buf+num) = '\0';
+
+		if (size == num && !memcmp(buf, key, size)) {
+			php_stream_seek(dba->fp, pos, SEEK_SET);
+			php_stream_putc(dba->fp, 0);
+			php_stream_flush(dba->fp);
+			php_stream_seek(dba->fp, 0L, SEEK_END);
+			if (buf) 
+				efree(buf);
+			return SUCCESS;
+		}	
+
+		/* read in the length of the value */
+		if (!php_stream_gets(dba->fp, buf, 15))
+			break;
+		num = atoi(buf);
+		if (num > buf_size) {
+			buf_size+=num;
+			buf = erealloc(buf, (buf_size+1)*sizeof(char));
+		}
+		/* read in the value */
+		num = php_stream_read(dba->fp, buf, sizeof(char)*num);
+		if (num<0)
+			break;
+	}
+	if (buf) 
+		efree(buf);
+	return FAILURE;
+}	
+/* }}} */
+
+/* {{{ dbm_file_findkey
+ */
+PHPAPI int dbm_file_findkey(dba_dbm_data *dba, datum key_datum TSRMLS_DC) {
+	char *buf = NULL;
+	int num;
+	int buf_size=1024;
+	int ret=0;
+	void *key = key_datum.dptr;
+	int size = key_datum.dsize;
+
+	php_stream_rewind(dba->fp);
+	buf = emalloc((buf_size+1)*sizeof(char));
+	while (!php_stream_eof(dba->fp)) {
+		if (!php_stream_gets(dba->fp, buf, 15)) 
+			break;
+		num = atoi(buf);
+		if (num > buf_size) {
+			buf_size+=num;
+			buf = erealloc(buf, (buf_size+1)*sizeof(char));
+		}
+		num = php_stream_read(dba->fp, buf, sizeof(char)*num);
+		if (num<0) break;
+		*(buf+num) = '\0';
+		if (size == num) {
+			if (!memcmp(buf, key, size)) {
+				ret = 1;
+				break;
+			}
+		}	
+		if (!php_stream_gets(dba->fp, buf, 15))
+			break;
+		num = atoi(buf);
+		if (num > buf_size) {
+			buf_size+=num;
+			buf = erealloc(buf, (buf_size+1)*sizeof(char));
+		}
+		num = php_stream_read(dba->fp, buf, sizeof(char)*num);
+		if (num<0) 
+			break;
+		*(buf+num) = '\0';
+	}
+	if (buf) 
+		efree(buf);
+	return(ret);
+}
+/* }}} */
+
+/* {{{ dbm_file_firstkey
+ */
+PHPAPI datum dbm_file_firstkey(dba_dbm_data *dba TSRMLS_DC) {
+	datum buf;
+	int num;
+	int buf_size=1024;
+
+	php_stream_rewind(dba->fp);
+	buf.dptr = emalloc((buf_size+1)*sizeof(char));
+	while(!php_stream_eof(dba->fp)) {
+		if (!php_stream_gets(dba->fp, buf.dptr, 15)) break;
+		num = atoi(buf.dptr);
+		if (num > buf_size) {
+			buf_size+=num;
+			buf.dptr = erealloc(buf.dptr, (buf_size+1)*sizeof(char));
+		}
+		num = php_stream_read(dba->fp, buf.dptr, num);
+		if (num<0) 
+			break;
+		buf.dsize = num;
+		if (*(buf.dptr)!=0) {
+			dba->CurrentFlatFilePos = php_stream_tell(dba->fp);
+			return(buf);
+		}
+		if (!php_stream_gets(dba->fp, buf.dptr, 15)) break;
+		num = atoi(buf.dptr);
+		if (num > buf_size) {
+			buf_size+=num;
+			buf.dptr = erealloc(buf.dptr, (buf_size+1)*sizeof(char));
+		}
+		num = php_stream_read(dba->fp, buf.dptr, num);
+		if (num<0) 
+			break;
+	}
+	if (buf.dptr) 
+		efree(buf.dptr);
+	buf.dptr = NULL;
+	return(buf);
+}
+/* }}} */
+
+/* {{{ latfile_nextkey
+ */
+PHPAPI datum dbm_file_nextkey(dba_dbm_data *dba TSRMLS_DC) {
+	datum buf;
+	int num;
+	int buf_size=1024;
+
+	php_stream_seek(dba->fp, dba->CurrentFlatFilePos, SEEK_SET);
+	buf.dptr = emalloc((buf_size+1)*sizeof(char));
+	while(!php_stream_eof(dba->fp)) {
+		if (!php_stream_gets(dba->fp, buf.dptr, 15)) break;
+		num = atoi(buf.dptr);
+		if (num > buf_size) {
+			buf_size+=num;
+			buf.dptr = erealloc(buf.dptr, (buf_size+1)*sizeof(char));
+		}
+		num = php_stream_read(dba->fp, buf.dptr, num);
+		if (num<0) 
+			break;
+		if (!php_stream_gets(dba->fp, buf.dptr, 15)) 
+			break;
+		num = atoi(buf.dptr);
+		if (num > buf_size) {
+			buf_size+=num;
+			buf.dptr = erealloc(buf.dptr, (buf_size+1)*sizeof(char));
+		}
+		num = php_stream_read(dba->fp, buf.dptr, num);
+		if (num<0) 
+			break;
+		buf.dsize = num;
+		if (*(buf.dptr)!=0) {
+			dba->CurrentFlatFilePos = php_stream_tell(dba->fp);
+			return(buf);
+		}
+	}
+	if (buf.dptr) 
+		efree(buf.dptr);
+	buf.dptr = NULL;
+	return(buf);
+}	
+/* }}} */
+
+/*
+ * 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/libflatfile/flatfile.h b/ext/dba/libflatfile/flatfile.h
new file mode 100644
index 0000000000..6582d71767
--- /dev/null
+++ b/ext/dba/libflatfile/flatfile.h
@@ -0,0 +1,47 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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: Marcus Boerger <helly@php.net>                               |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */
+
+#ifndef PHP_LIBDBM_H
+#define PHP_LIBDBM_H
+
+typedef struct {
+	char *dptr;
+	int dsize;
+} datum;
+
+typedef struct {
+	char *lockfn;
+	int lockfd;
+	php_stream *fp;
+	long CurrentFlatFilePos;
+	datum nextkey;
+} dba_dbm_data;
+
+#define DBM_INSERT 0
+#define DBM_REPLACE 1
+
+PHPAPI int dbm_file_store(dba_dbm_data *dba, datum key_datum, datum value_datum, int mode TSRMLS_DC);
+PHPAPI datum dbm_file_fetch(dba_dbm_data *dba, datum key_datum TSRMLS_DC);
+PHPAPI int dbm_file_delete(dba_dbm_data *dba, datum key_datum TSRMLS_DC);
+PHPAPI int dbm_file_findkey(dba_dbm_data *dba, datum key_datum TSRMLS_DC);
+PHPAPI datum dbm_file_firstkey(dba_dbm_data *dba TSRMLS_DC);
+PHPAPI datum dbm_file_nextkey(dba_dbm_data *dba TSRMLS_DC);
+
+#endif