This commit was manufactured by cvs2svn to create tag 'BEFORE_FD_REVERT'.

ext/dba/dba_inifile.c

@@ -1,186 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 4                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2003 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$ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-
-#if DBA_INIFILE
-#include "php_inifile.h"
-
-#include "libinifile/inifile.h"
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#define INIFILE_DATA \
-	inifile *dba = info->dbf
-
-#define INIFILE_GKEY \
-	key_type ini_key = inifile_key_split((char*)key) /* keylen not needed here */
-
-#define INIFILE_DONE \
-	inifile_key_free(&ini_key)
-
-DBA_OPEN_FUNC(inifile)
-{
-	info->dbf = inifile_alloc(info->fp, info->mode == DBA_READER, info->flags&DBA_PERSISTENT TSRMLS_CC);
-
-	return info->dbf ? SUCCESS : FAILURE;
-}
-
-DBA_CLOSE_FUNC(inifile)
-{
-	INIFILE_DATA;
-
-	inifile_free(dba, info->flags&DBA_PERSISTENT);
-}
-
-DBA_FETCH_FUNC(inifile)
-{
-	val_type ini_val;
-
-	INIFILE_DATA;
-	INIFILE_GKEY;
-
-	ini_val = inifile_fetch(dba, &ini_key, skip TSRMLS_CC);
-	*newlen = ini_val.value ? strlen(ini_val.value) : 0;
-	INIFILE_DONE;
-	return ini_val.value;
-}
-
-DBA_UPDATE_FUNC(inifile)
-{
-	val_type ini_val;
-	int res;
-
-	INIFILE_DATA;
-	INIFILE_GKEY;
-	
-	ini_val.value = val;
-	
-	if (mode == 1) {
-		res = inifile_append(dba, &ini_key, &ini_val TSRMLS_CC);
-	} else {
-		res = inifile_replace(dba, &ini_key, &ini_val TSRMLS_CC);
-	}
-	INIFILE_DONE;
-	switch(res) {
-	case -1:
-		php_error_docref1(NULL TSRMLS_CC, key, E_WARNING, "Operation not possible");
-		return FAILURE;
-	default:
-	case 0:
-		return SUCCESS;
-	case 1:
-		php_error_docref1(NULL TSRMLS_CC, key, E_WARNING, "Key already exists");
-		return SUCCESS;
-	}
-}
-
-DBA_EXISTS_FUNC(inifile)
-{
-	val_type ini_val;
-
-	INIFILE_DATA;
-	INIFILE_GKEY;
-	
-	ini_val = inifile_fetch(dba, &ini_key, 0 TSRMLS_CC);
-	INIFILE_DONE;
-	if (ini_val.value) {
-		inifile_val_free(&ini_val);
-		return SUCCESS;
-	}
-	return FAILURE;
-}
-
-DBA_DELETE_FUNC(inifile)
-{
-	INIFILE_DATA;
-	INIFILE_GKEY;
-	int res =  inifile_delete(dba, &ini_key TSRMLS_CC);
-
-	INIFILE_DONE;
-	return (res == -1 ? FAILURE : SUCCESS);
-}
-
-DBA_FIRSTKEY_FUNC(inifile)
-{
-	INIFILE_DATA;
-
-	if (inifile_firstkey(dba TSRMLS_CC)) {
-		char *result = inifile_key_string(&dba->curr.key);
-		*newlen = strlen(result);
-		return result;
-	} else {
-		return NULL;
-	}
-}
-
-DBA_NEXTKEY_FUNC(inifile)
-{
-	INIFILE_DATA;
-	
-	if (!dba->curr.key.group && !dba->curr.key.name) {
-		return NULL;
-	}
-
-	if (inifile_nextkey(dba TSRMLS_CC)) {
-		char *result = inifile_key_string(&dba->curr.key);
-		*newlen = strlen(result);
-		return result;
-	} else {
-		return NULL;
-	}
-}
-
-DBA_OPTIMIZE_FUNC(inifile)
-{
-	/* dummy */
-	return SUCCESS;
-}
-
-DBA_SYNC_FUNC(inifile)
-{
-	/* dummy */
-	return SUCCESS;
-}
-
-DBA_INFO_FUNC(inifile)
-{
-	return estrdup(inifile_version());
-}
-
-#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

ext/dba/libinifile/inifile.c

@@ -1,598 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 4                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2003 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$ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-#include "php_globals.h"
-#include "safe_mode.h"
-#include "php_network.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include "inifile.h"
-
-/* ret = -1 means that database was opened for read-only
- * ret = 0  success
- * ret = 1  key already exists - nothing done
- */
-
-/* {{{ inifile_version */
-char *inifile_version() 
-{
-	return "1.0, $Revision$";
-}
-/* }}} */ 
-
-/* {{{ inifile_free_key */
-void inifile_key_free(key_type *key)
-{
-	if (key->group) {
-		efree(key->group);
-	}
-	if (key->name) {
-		efree(key->name);
-	}
-	memset(key, 0, sizeof(key_type));
-}
-/* }}} */
-
-/* {{{ inifile_free_val */
-void inifile_val_free(val_type *val)
-{
-	if (val->value) {
-		efree(val->value);
-	}
-	memset(val, 0, sizeof(val_type));
-}
-/* }}} */
-
-/* {{{ inifile_free_val */
-void inifile_line_free(line_type *ln)
-{
-	inifile_key_free(&ln->key);
-	inifile_val_free(&ln->val);
-	ln->pos = 0;
-}
-/* }}} */
-
-/* {{{ inifile_alloc */
-inifile * inifile_alloc(php_stream *fp, int readonly, int persistent TSRMLS_DC)
-{
-	inifile *dba;
-	int fd = 0;
-
-	if (!readonly) {
-		if (!php_stream_truncate_supported(fp)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can't truncate this stream");
-			return NULL;
-		}
-		if (SUCCESS != php_stream_cast(fp, PHP_STREAM_AS_FD, (void*)&fd, 1)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not cast stream");
-			return NULL;
-		}
-	}
-	dba = pemalloc(sizeof(inifile), persistent);
-	memset(dba, 0, sizeof(inifile));
-	dba->fp = fp;
-	dba->fd = fd;
-	dba->readonly = readonly;
-	return dba;
-}
-/* }}} */
-
-/* {{{ inifile_free */
-void inifile_free(inifile *dba, int persistent)
-{
-	if (dba) {
-		inifile_line_free(&dba->curr);
-		inifile_line_free(&dba->next);
-		pefree(dba, persistent);
-	}
-}
-/* }}} */
-
-/* {{{ inifile_key_split */
-key_type inifile_key_split(const char *group_name)
-{
-	key_type key;
-	char *name;
-	
-	if (group_name[0] == '[' && (name = strchr(group_name, ']')) != NULL) {
-		key.group = estrndup(group_name+1, name - (group_name + 1));
-		key.name = estrdup(name+1);
-	} else {
-		key.group = estrdup("");
-		key.name = estrdup(group_name);
-	}
-	return key;
-}
-/* }}} */
-
-/* {{{ inifile_key_string */
-char * inifile_key_string(const key_type *key)
-{
-	if (key->group && *key->group) {
-		char *result;
-		spprintf(&result, 0, "[%s]%s", key->group, key->name ? key->name : "");
-		return result;
-	} else if (key->name) {
-		return estrdup(key->name);
-	} else {
-		return NULL;
-	}
-}
-/* }}} */
-
-/* {{{ etrim */
-static char *etrim(const char *str)
-{
-	char *val;
-	size_t l;
-	
-	if (!str) {
-		return NULL;
-	}
-	val = (char*)str;
-	while (strchr(" \t\r\n", *val)) {
-		val++;
-	}
-	l = strlen(val);
-	while (l && (strchr(" \t\r\n", val[l-1]))) {
-		l--;
-	}
-	return estrndup(val, l);
-}
-/* }}} */
-
-/* {{{ inifile_findkey
- */
-static int inifile_read(inifile *dba, line_type *ln TSRMLS_DC) {
-	char *fline;
-	char *pos;
-
-	inifile_val_free(&ln->val);
-	while ((fline = php_stream_gets(dba->fp, NULL, 0)) != NULL) {
-		if (fline) {
-			if (fline[0] == '[') {
-				/* A value name cannot start with '['
-				 * So either we find a ']' or we found an error
-				 */
-				pos = strchr(fline+1, ']');
-				if (pos) {
-					*pos = '\0';
-					inifile_key_free(&ln->key);
-					ln->key.group = etrim(fline+1);
-					ln->key.name = estrdup("");
-					ln->pos = php_stream_tell(dba->fp);
-					efree(fline);
-					return 1;
-				} else {
-					efree(fline);
-					continue;
-				}
-			} else {
-				pos = strchr(fline, '=');
-				if (pos) {
-					*pos = '\0';
-					/* keep group or make empty if not existent */
-					if (!ln->key.group) {
-						ln->key.group = estrdup("");
-					}
-					if (ln->key.name) {
-						efree(ln->key.name);
-					}
-					ln->key.name = etrim(fline);
-					ln->val.value = etrim(pos+1);
-					ln->pos = php_stream_tell(dba->fp);
-					efree(fline);
-					return 1;
-				} else {
-					/* simply ignore lines without '='
-					 * those should be comments
-					 */
-					 efree(fline);
-					 continue;
-				}
-			}
-		}
-	}
-	inifile_line_free(ln);
-	return 0;
-}
-/* }}} */
-
-/* {{{ inifile_key_cmp */
-/* 0 = EQUAL
- * 1 = GROUP-EQUAL,NAME-DIFFERENT
- * 2 = DIFFERENT
- */
-static int inifile_key_cmp(const key_type *k1, const key_type *k2 TSRMLS_DC)
-{
-	assert(k1->group && k1->name && k2->group && k2->name);
-	
-	if (!strcasecmp(k1->group, k2->group)) {
-		if (!strcasecmp(k1->name, k2->name)) {
-			return 0;
-		} else {
-			return 1;
-		}
-	} else {
-		return 2;
-	}
-}
-/* }}} */
-
-/* {{{ inifile_fetch
- */
-val_type inifile_fetch(inifile *dba, const key_type *key, int skip TSRMLS_DC) {
-	line_type ln = {{NULL,NULL},{NULL}};
-	val_type val;
-	int res, grp_eq = 0;
-
-	if (skip == -1 && dba->next.key.group && dba->next.key.name && !inifile_key_cmp(&dba->next.key, key TSRMLS_CC)) {
-		/* we got position already from last fetch */
-		php_stream_seek(dba->fp, dba->next.pos, SEEK_SET);
-	} else {
-		/* specific instance or not same key -> restart search */
-		/* the slow way: restart and seacrch */
-		php_stream_rewind(dba->fp);
-		inifile_line_free(&dba->next);
-	}
-	if (skip == -1) {
-		skip = 0;
-	}
-	while(inifile_read(dba, &ln TSRMLS_CC)) {
-		if (!(res=inifile_key_cmp(&ln.key, key TSRMLS_CC))) {
-			if (!skip) {
-				val.value = estrdup(ln.val.value ? ln.val.value : "");
-				/* allow faster access by updating key read into next */
-				inifile_line_free(&dba->next);
-				dba->next = ln;
-				dba->next.pos = php_stream_tell(dba->fp);
-				return val;
-			}
-			skip--;
-		} else if (res == 1) {
-			grp_eq = 1;
-		} else if (grp_eq) {
-			/* we are leaving group now: that means we cannot find the key */
-			break;
-		}
-	}
-	inifile_line_free(&ln);
-	dba->next.pos = php_stream_tell(dba->fp);
-	return ln.val;
-}
-/* }}} */
-
-/* {{{ inifile_firstkey
- */
-int inifile_firstkey(inifile *dba TSRMLS_DC) {
-	inifile_line_free(&dba->curr);
-	dba->curr.pos = 0;
-	return inifile_nextkey(dba TSRMLS_CC);
-}
-/* }}} */
-
-/* {{{ inifile_nextkey
- */
-int inifile_nextkey(inifile *dba TSRMLS_DC) {
-	line_type ln = {{NULL,NULL},{NULL}};
-
-	/*inifile_line_free(&dba->next); ??? */
-	php_stream_seek(dba->fp, dba->curr.pos, SEEK_SET);
-	ln.key.group = estrdup(dba->curr.key.group ? dba->curr.key.group : "");
-	inifile_read(dba, &ln TSRMLS_CC);
-	inifile_line_free(&dba->curr);
-	dba->curr = ln;
-	return ln.key.group || ln.key.name;
-}	
-/* }}} */
-
-/* {{{ inifile_truncate
- */
-static int inifile_truncate(inifile *dba, size_t size TSRMLS_DC)
-{
-	int res;
-
-	if ((res=php_stream_truncate_set_size(dba->fp, size)) != 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error in ftruncate: %d", res);
-		return FAILURE;
-	}
-	php_stream_seek(dba->fp, size, SEEK_SET);
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ inifile_find_group
- * if found pos_grp_start points to "[group_name]"
- */
-static int inifile_find_group(inifile *dba, const key_type *key, size_t *pos_grp_start TSRMLS_DC) 
-{
-	int ret = FAILURE;
-
-	php_stream_flush(dba->fp);
-	php_stream_seek(dba->fp, 0, SEEK_SET);
-	inifile_line_free(&dba->curr);
-	inifile_line_free(&dba->next);
-
-	if (key->group && strlen(key->group)) {
-		int res;
-		line_type ln = {{NULL,NULL},{NULL}};
-
-		res = 1;
-		while(inifile_read(dba, &ln TSRMLS_CC)) {
-			if ((res=inifile_key_cmp(&ln.key, key TSRMLS_CC)) < 2) {
-				ret = SUCCESS;
-				break;
-			}
-			*pos_grp_start = php_stream_tell(dba->fp);
-		}
-		inifile_line_free(&ln);
-	} else {
-		*pos_grp_start = 0;
-		ret = SUCCESS;
-	}
-	if (ret == FAILURE) {
-		*pos_grp_start = php_stream_tell(dba->fp);
-	}
-	return ret;
-}
-/* }}} */
-
-/* {{{ inifile_next_group
- * only valid after a call to inifile_find_group
- * if any next group is found pos_grp_start points to "[group_name]" or whitespace before that
- */
-static int inifile_next_group(inifile *dba, const key_type *key, size_t *pos_grp_start TSRMLS_DC) 
-{
-	int ret = FAILURE;
-	line_type ln = {{NULL,NULL},{NULL}};
-
-	*pos_grp_start = php_stream_tell(dba->fp);
-	ln.key.group = estrdup(key->group);
-	while(inifile_read(dba, &ln TSRMLS_CC)) {
-		if (inifile_key_cmp(&ln.key, key TSRMLS_CC) == 2) {
-			ret = SUCCESS;
-			break;
-		}
-		*pos_grp_start = php_stream_tell(dba->fp);
-	}
-	inifile_line_free(&ln);
-	return ret;
-}
-/* }}} */
-
-/* {{{ inifile_copy_to
- */
-static int inifile_copy_to(inifile *dba, size_t pos_start, size_t pos_end, inifile **ini_copy TSRMLS_DC)
-{
-	php_stream *fp;
-	
-	if (pos_start == pos_end) {
-		*ini_copy = NULL;
-		return SUCCESS;
-	}
-	if ((fp = php_stream_temp_create(0, 64 * 1024)) == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not create temporary stream");
-		*ini_copy = NULL;
-		return FAILURE;
-	}
-
-	if ((*ini_copy = inifile_alloc(fp, 1, 0 TSRMLS_CC)) == NULL) {
-		/* writes error */
-		return FAILURE;
-	}
-	php_stream_seek(dba->fp, pos_start, SEEK_SET);
-	if (!php_stream_copy_to_stream(dba->fp, fp, pos_end - pos_start)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy group [%d - %d] to temporary stream", pos_start, pos_end);
-		return FAILURE;
-	} 
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ inifile_filter
- * copy from to dba while ignoring key name (group must equal)
- */
-static int inifile_filter(inifile *dba, inifile *from, const key_type *key TSRMLS_DC) 
-{
-	size_t pos_start = 0, pos_next = 0, pos_curr;
-	int ret = SUCCESS;
-	line_type ln = {{NULL,NULL},{NULL}};
-
-	php_stream_seek(from->fp, 0, SEEK_SET);
-	php_stream_seek(dba->fp, 0, SEEK_END);
-	while(inifile_read(from, &ln TSRMLS_CC)) {
-		switch(inifile_key_cmp(&ln.key, key TSRMLS_CC)) {
-		case 0:
-			pos_curr = php_stream_tell(from->fp);
-			if (pos_start != pos_next) {
-				php_stream_seek(from->fp, pos_start, SEEK_SET);
-				if (!php_stream_copy_to_stream(from->fp, dba->fp, pos_next - pos_start)) {
-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy [%d - %d] from temporary stream", pos_next, pos_start);
-					ret = FAILURE;
-				}
-				php_stream_seek(from->fp, pos_curr, SEEK_SET);
-			}
-			pos_next = pos_start = pos_curr;
-			break;
-		case 1:
-			pos_next = php_stream_tell(from->fp);
-			break;
-		case 2:
-			/* the function is meant to process only entries from same group */
-			assert(0);
-			break;
-		}
-	}
-	if (pos_start != pos_next) {
-		php_stream_seek(from->fp, pos_start, SEEK_SET);
-		if (!php_stream_copy_to_stream(from->fp, dba->fp, pos_next - pos_start)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy [%d - %d] from temporary stream", pos_next, pos_start);
-			ret = FAILURE;
-		}
-	}
-	inifile_line_free(&ln);
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ inifile_delete_replace_append
- */
-static int inifile_delete_replace_append(inifile *dba, const key_type *key, const val_type *value, int append TSRMLS_DC) 
-{
-	size_t pos_grp_start, pos_grp_next;
-	inifile *ini_tmp = NULL;
-	php_stream *fp_tmp = NULL;
-	int ret;
-
-	/* 1) Search group start
-	 * 2) Search next group
-	 * 3) If not append: Copy group to ini_tmp
-	 * 4) Open temp_stream and copy remainder
-	 * 5) Truncate stream
-	 * 6) If not append AND key.name given: Filtered copy back from ini_tmp 
-	 *    to stream. Otherwise the user wanted to delete the group.
-	 * 7) Append value if given
-	 * 8) Append temporary stream
-	 */
-
-	assert(!append || (key->name && value)); /* missuse */
-
-	/* 1 - 3 */
-	inifile_find_group(dba, key, &pos_grp_start TSRMLS_CC);
-	inifile_next_group(dba, key, &pos_grp_next TSRMLS_CC);
-	if (append) {
-		ret = SUCCESS;
-	} else {
-		ret = inifile_copy_to(dba, pos_grp_start, pos_grp_next, &ini_tmp TSRMLS_CC);
-	}
-
-	/* 4 */
-	if (ret == SUCCESS) {
-		fp_tmp = php_stream_temp_create(0, 64 * 1024);
-		if (!fp_tmp) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not create temporary stream");
-			ret = FAILURE;
-		} else {
-			php_stream_seek(dba->fp, 0, SEEK_END);
-			if (pos_grp_next != php_stream_tell(dba->fp)) {
-				php_stream_seek(dba->fp, pos_grp_next, SEEK_SET);
-				if (!php_stream_copy_to_stream(dba->fp, fp_tmp, PHP_STREAM_COPY_ALL)) {
-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy remainder to temporary stream");
-					ret = FAILURE;
-				}
-			}
-		}
-	}
-	
-	/* 5 */
-	if (ret == SUCCESS) {
-		ret = inifile_truncate(dba, append ? pos_grp_next : pos_grp_start TSRMLS_CC); /* writes error on fail */
-	}
-
-	if (ret == SUCCESS) {
-		if (key->name && strlen(key->name)) {
-			/* 6 */
-			if (!append && ini_tmp) {
-				ret = inifile_filter(dba, ini_tmp, key TSRMLS_CC);
-			}
-
-			/* 7 */
-			/* important: do not query ret==SUCCESS again: inifile_filter might fail but
-			 * however next operation must be done.
-			 */
-			if (value) {
-				if (pos_grp_start == pos_grp_next && key->group && strlen(key->group)) {
-					php_stream_printf(dba->fp TSRMLS_CC, "[%s]\n", key->group);
-				}
-				php_stream_printf(dba->fp TSRMLS_CC, "%s=%s\n", key->name, value->value ? value->value : "");
-			}
-		}
-		
-		/* 8 */ 
-		/* important: do not query ret==SUCCESS again: inifile_filter might fail but
-		 * however next operation must be done.
-		 */
-		if (fp_tmp && php_stream_tell(fp_tmp)) {
-			php_stream_seek(fp_tmp, 0, SEEK_SET);
-			php_stream_seek(dba->fp, 0, SEEK_END);
-			if (!php_stream_copy_to_stream(fp_tmp, dba->fp, PHP_STREAM_COPY_ALL)) {
-				php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not copy from temporary stream - ini file truncated");
-				ret = FAILURE;
-			}
-		}
-	}
-
-	if (ini_tmp) {
-		php_stream_close(ini_tmp->fp);
-		inifile_free(ini_tmp, 0);
-	}
-	if (fp_tmp) {
-		php_stream_close(fp_tmp);
-	}
-	php_stream_flush(dba->fp);
-	php_stream_seek(dba->fp, 0, SEEK_SET);
-
-	return ret;
-}
-/* }}} */
-
-/* {{{ inifile_delete
- */
-int inifile_delete(inifile *dba, const key_type *key TSRMLS_DC) 
-{
-	return inifile_delete_replace_append(dba, key, NULL, 0 TSRMLS_CC);
-}	
-/* }}} */
-
-/* {{{ inifile_relace
- */
-int inifile_replace(inifile *dba, const key_type *key, const val_type *value TSRMLS_DC) 
-{
-	return inifile_delete_replace_append(dba, key, value, 0 TSRMLS_CC);
-}
-/* }}} */
-
-/* {{{ inifile_append
- */
-int inifile_append(inifile *dba, const key_type *key, const val_type *value TSRMLS_DC) 
-{
-	return inifile_delete_replace_append(dba, key, value, 1 TSRMLS_CC);
-}
-/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

ext/dba/libinifile/inifile.h

@@ -1,67 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 4                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2003 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_LIB_INIFILE_H
-#define PHP_LIB_INIFILE_H
-
-typedef struct {
-	char *group;
-	char *name;
-} key_type;
-
-typedef struct {
-	char *value;
-} val_type;
-
-typedef struct {
-	key_type key;
-	val_type val;
-	size_t pos;
-} line_type;
-
-typedef struct {
-	char *lockfn;
-	int lockfd;
-	php_stream *fp;
-	int fd;
-	int readonly;
-	line_type curr;
-	line_type next;
-} inifile;
-
-val_type inifile_fetch(inifile *dba, const key_type *key, int skip TSRMLS_DC);
-int inifile_firstkey(inifile *dba TSRMLS_DC);
-int inifile_nextkey(inifile *dba TSRMLS_DC);
-int inifile_delete(inifile *dba, const key_type *key TSRMLS_DC);
-int inifile_replace(inifile *dba, const key_type *key, const val_type *val TSRMLS_DC);
-int inifile_append(inifile *dba, const key_type *key, const val_type *val TSRMLS_DC);
-char *inifile_version();
-
-key_type inifile_key_split(const char *group_name);
-char * inifile_key_string(const key_type *key);
-
-void inifile_key_free(key_type *key);
-void inifile_val_free(val_type *val);
-void inifile_line_free(line_type *ln);
-
-inifile * inifile_alloc(php_stream *fp, int readonly, int persistent TSRMLS_DC);
-void inifile_free(inifile *dba, int persistent);
-
-#endif

ext/dba/php_inifile.h

@@ -1,12 +0,0 @@
-#ifndef PHP_INIFILE_H
-#define PHP_INIFILE_H
-
-#if DBA_INIFILE
-
-#include "php_dba.h"
-
-DBA_FUNCS(inifile);
-
-#endif
-
-#endif

ext/dba/tests/dba_inifile.phpt

@@ -1,29 +0,0 @@
---TEST--
-DBA INIFILE handler test
---SKIPIF--
-<?php 
-	$handler = 'inifile';
-	require_once('skipif.inc');
-?>
---FILE--
-<?php
-	$handler = 'inifile';
-	require_once('test.inc');
-	require_once('dba_handler.inc');
-?>
---EXPECT--
-database handler: inifile
-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"
-}

ext/sqlite/CREDITS

@@ -1,2 +0,0 @@
-sqlite
-Wez Furlong, Tal Peer, Marcus Börger

ext/sqlite/README

@@ -1,14 +0,0 @@
-This is an extension for the SQLite Embeddable SQL Database Engine.
-http://www.sqlite.org/
-
-SQLite is a C library that implements an embeddable SQL database engine.
-Programs that link with the SQLite library can have SQL database access
-without running a separate RDBMS process.
-
-SQLite is not a client library used to connect to a big database server.
-SQLite is the server. The SQLite library reads and writes directly to and from
-the database files on disk
-
-
-
-vim:tw=78:et

ext/sqlite/TODO

@@ -1,22 +0,0 @@
-- Transparent binary encoding of return values from PHP callback functions.
-
-- Add user-space callback for the authorizer function (this is potentially
-  very slow, so it needs to be implemented carefully).
-
-- Add user-space callback to handle busy databases.
-
-- Test-suite
-
-  o Test how robust we are when a user-space function is registered as
-    a callback for a persistent connection in script A, then script B is
-	called that doesn't register the callback but does make use of the
-	function in an SQL query.
-	--> Our test suite doesn't allow us to test persistent connections
-	    at this time :/
-
-- If building a ZTS build, -DTHREADSAFE while compiling libsqlite
-
-- If building a non-debug build, -DNDEBUG will disable the expensive
-  asserts in the inner loop. (and double performance)
-
-vim:tw=78

ext/sqlite/libsqlite/README

@@ -1,37 +0,0 @@
-This directory contains source code to 
-
-    SQLite: An Embeddable SQL Database Engine
-
-To compile the project, first create a directory in which to place
-the build products.  It is recommended, but not required, that the
-build directory be separate from the source directory.  Cd into the
-build directory and then from the build directory run the configure
-script found at the root of the source tree.  Then run "make".
-
-For example:
-
-    tar xzf sqlite.tar.gz    ;#  Unpack the source tree into "sqlite"
-    mkdir bld                ;#  Build will occur in a sibling directory
-    cd bld                   ;#  Change to the build directory
-    ../sqlite/configure      ;#  Run the configure script
-    make                     ;#  Run the makefile.
-
-The configure script uses autoconf 2.50 and libtool.  If the configure
-script does not work out for you, there is a generic makefile named
-"Makefile.linux-gcc" in the top directory of the source tree that you
-can copy and edit to suite your needs.  Comments on the generic makefile
-show what changes are needed.
-
-The linux binaries on the website are created using the generic makefile,
-not the configure script.  The configure script is unmaintained.  (You
-can volunteer to take over maintenance of the configure script, if you want!)
-The windows binaries on the website are created using MinGW32 configured
-as a cross-compiler running under Linux.  For details, see the ./publish.sh
-script at the top-level of the source tree.
-
-Contacts:
-
-   http://www.sqlite.org/
-   http://www.hwaci.com/sw/sqlite/
-   http://groups.yahoo.com/group/sqlite/
-   drh@hwaci.com

ext/sqlite/libsqlite/src/sqlite_config.w32.h

@@ -1,8 +0,0 @@
-#include "config.w32.h"
-#if ZTS
-# define THREADSAFE 1
-#endif
-#if !ZEND_DEBUG && !defined(NDEBUG)
-# define NDEBUG
-#endif
-#define SQLITE_PTR_SZ 4

ext/sqlite/sqlite.php

@@ -1,33 +0,0 @@
-<?php
-if (!extension_loaded("sqlite")) {
-	dl("sqlite.so");
-}
-
-debug_zval_dump(sqlite_libversion());
-debug_zval_dump(sqlite_libencoding());
-
-$s = sqlite_open("weztest.sqlite", 0666, $err);
-
-debug_zval_dump($err);
-debug_zval_dump($s);
-
-$r = sqlite_query("create table foo (a INTEGER PRIMARY KEY, b INTEGER )", $s);
-debug_zval_dump(sqlite_last_error($s));
-debug_zval_dump(sqlite_error_string(sqlite_last_error($s)));
-
-$r = sqlite_query("select *, php('md5', sql) as o from sqlite_master", $s);
-debug_zval_dump($r);
-debug_zval_dump(sqlite_num_rows($r));
-debug_zval_dump(sqlite_num_fields($r));
-
-for ($j = 0; $j < sqlite_num_fields($r); $j++) {
-	echo "Field $j is " . sqlite_field_name($r, $j) . "\n";
-}
-
-while ($row = sqlite_fetch_array($r, SQLITE_ASSOC)) {
-	print_r($row);
-}
-
-sqlite_close($s);
-
-?>

ext/sqlite/tests/blankdb.inc

@@ -1,11 +0,0 @@
-<?php #vim:ft=php
-$dbname = tempnam(dirname(__FILE__), "phpsql");
-function cleanup() {
-	if ($GLOBALS['db']) {
-		sqlite_close($GLOBALS['db']);
-	}
-	unlink($GLOBALS['dbname']);
-}
-register_shutdown_function("cleanup");
-$db = sqlite_open($dbname);
-?>

ext/sqlite/tests/sqlite_001.phpt

@@ -1,17 +0,0 @@
---TEST--
-sqlite: sqlite_open/close
---INI--
-sqlite.assoc_case=0
---SKIPIF--
-<?php if (!extension_loaded("sqlite")) print "skip"; ?>
---FILE--
-<?php 
-require_once('blankdb.inc');
-echo "$db\n";
-sqlite_close($db);
-$db = NULL;
-echo "Done\n";
-?>
---EXPECTF--
-Resource id #%d
-Done

ext/sqlite/tests/sqlite_002.phpt

@@ -1,31 +0,0 @@
---TEST--
-sqlite: Simple insert/select
---INI--
-sqlite.assoc_case=0
---SKIPIF--
-<?php # vim:ft=php
-if (!extension_loaded("sqlite")) print "skip"; ?>
---FILE--
-<?php 
-include "blankdb.inc";
-
-sqlite_query("CREATE TABLE foo(c1 date, c2 time, c3 varchar(64))", $db);
-sqlite_query("INSERT INTO foo VALUES ('2002-01-02', '12:49:00', NULL)", $db);
-$r = sqlite_query("SELECT * from foo", $db);
-var_dump(sqlite_fetch_array($r));
-?>
---EXPECT--
-array(6) {
-  [0]=>
-  string(10) "2002-01-02"
-  ["c1"]=>
-  string(10) "2002-01-02"
-  [1]=>
-  string(8) "12:49:00"
-  ["c2"]=>
-  string(8) "12:49:00"
-  [2]=>
-  NULL
-  ["c3"]=>
-  NULL
-}

ext/sqlite/tests/sqlite_003.phpt

@@ -1,51 +0,0 @@
---TEST--
-sqlite: Simple insert/select, different result represenatation
---INI--
-sqlite.assoc_case=0
---SKIPIF--
-<?php
-if (!extension_loaded("sqlite")) print "skip"; ?>
---FILE--
-<?php 
-include "blankdb.inc";
-
-sqlite_query("CREATE TABLE foo(c1 date, c2 time, c3 varchar(64))", $db);
-sqlite_query("INSERT INTO foo VALUES ('2002-01-02', '12:49:00', NULL)", $db);
-$r = sqlite_query("SELECT * from foo", $db);
-var_dump(sqlite_fetch_array($r, SQLITE_BOTH));
-$r = sqlite_query("SELECT * from foo", $db);
-var_dump(sqlite_fetch_array($r, SQLITE_NUM));
-$r = sqlite_query("SELECT * from foo", $db);
-var_dump(sqlite_fetch_array($r, SQLITE_ASSOC));
-?>
---EXPECT--
-array(6) {
-  [0]=>
-  string(10) "2002-01-02"
-  ["c1"]=>
-  string(10) "2002-01-02"
-  [1]=>
-  string(8) "12:49:00"
-  ["c2"]=>
-  string(8) "12:49:00"
-  [2]=>
-  NULL
-  ["c3"]=>
-  NULL
-}
-array(3) {
-  [0]=>
-  string(10) "2002-01-02"
-  [1]=>
-  string(8) "12:49:00"
-  [2]=>
-  NULL
-}
-array(3) {
-  ["c1"]=>
-  string(10) "2002-01-02"
-  ["c2"]=>
-  string(8) "12:49:00"
-  ["c3"]=>
-  NULL
-}

ext/sqlite/tests/sqlite_004.phpt

@@ -1,46 +0,0 @@
---TEST--
-sqlite: binary encoding
---INI--
-sqlite.assoc_case=0
---SKIPIF--
-<?php # vim:ft=php
-if (!extension_loaded("sqlite")) print "skip"; ?>
---FILE--
-<?php 
-include "blankdb.inc";
-
-$strings = array(
-	"hello",
-	"hello\x01o",
-	"\x01hello there",
-	"hello\x00there",
-	""
-);
-
-sqlite_query("CREATE TABLE strings(a)", $db);
-
-foreach ($strings as $str) {
-	sqlite_query("INSERT INTO strings VALUES('" . sqlite_escape_string($str) . "')", $db);
-}
-
-$i = 0;
-$r = sqlite_query("SELECT * from strings", $db);
-while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
-	if ($row[0] !== $strings[$i]) {
-		echo "FAIL!\n";
-		var_dump($row[0]);
-		var_dump($strings[$i]);
-	} else {
-		echo "OK!\n";
-	}
-	$i++;
-}
-echo "DONE!\n";
-?>
---EXPECT--
-OK!
-OK!
-OK!
-OK!
-OK!
-DONE!

ext/sqlite/tests/sqlite_005.phpt

@@ -1,47 +0,0 @@
---TEST--
-sqlite: aggregate functions
---INI--
-sqlite.assoc_case=0
---SKIPIF--
-<?php # vim:ft=php
-if (!extension_loaded("sqlite")) print "skip"; ?>
---FILE--
-<?php 
-include "blankdb.inc";
-
-$data = array(
-	"one",
-	"two",
-	"three"
-	);
-
-sqlite_query("CREATE TABLE strings(a)", $db);
-
-foreach ($data as $str) {
-	sqlite_query("INSERT INTO strings VALUES('" . sqlite_escape_string($str) . "')", $db);
-}
-
-function cat_step(&$context, $string)
-{
-	$context .= $string;
-}
-
-function cat_fin(&$context)
-{
-	return $context;
-}
-
-sqlite_create_aggregate($db, "cat", "cat_step", "cat_fin");
-
-$r = sqlite_query("SELECT cat(a) from strings", $db);
-while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
-	var_dump($row);
-}
-echo "DONE!\n";
-?>
---EXPECT--
-array(1) {
-  [0]=>
-  string(11) "onetwothree"
-}
-DONE!

ext/sqlite/tests/sqlite_006.phpt

@@ -1,52 +0,0 @@
---TEST--
-sqlite: regular functions
---INI--
-sqlite.assoc_case=0
---SKIPIF--
-<?php # vim:ft=php
-if (!extension_loaded("sqlite")) print "skip"; ?>
---FILE--
-<?php 
-include "blankdb.inc";
-
-$data = array(
-	array("one", "uno"),
-	array("two", "dos"),
-	array("three", "tres"),
-	);
-
-sqlite_query("CREATE TABLE strings(a,b)", $db);
-
-function implode_args()
-{
-	$args = func_get_args();
-	$sep = array_shift($args);
-	return implode($sep, $args);
-}
-
-foreach ($data as $row) {
-	sqlite_query("INSERT INTO strings VALUES('" . sqlite_escape_string($row[0]) . "','" . sqlite_escape_string($row[1]) . "')", $db);
-}
-
-sqlite_create_function($db, "implode", "implode_args");
-
-$r = sqlite_query("SELECT implode('-', a, b) from strings", $db);
-while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
-	var_dump($row);
-}
-echo "DONE!\n";
-?>
---EXPECT--
-array(1) {
-  [0]=>
-  string(7) "one-uno"
-}
-array(1) {
-  [0]=>
-  string(7) "two-dos"
-}
-array(1) {
-  [0]=>
-  string(10) "three-tres"
-}
-DONE!

ext/sqlite/tests/sqlite_007.phpt

@@ -1,51 +0,0 @@
---TEST--
-sqlite: Simple insert/select (unbuffered)
---INI--
-sqlite.assoc_case=0
---SKIPIF--
-<?php
-if (!extension_loaded("sqlite")) print "skip"; ?>
---FILE--
-<?php 
-include "blankdb.inc";
-
-sqlite_query("CREATE TABLE foo(c1 date, c2 time, c3 varchar(64))", $db);
-sqlite_query("INSERT INTO foo VALUES ('2002-01-02', '12:49:00', NULL)", $db);
-$r = sqlite_unbuffered_query("SELECT * from foo", $db);
-var_dump(sqlite_fetch_array($r, SQLITE_BOTH));
-$r = sqlite_unbuffered_query("SELECT * from foo", $db);
-var_dump(sqlite_fetch_array($r, SQLITE_NUM));
-$r = sqlite_unbuffered_query("SELECT * from foo", $db);
-var_dump(sqlite_fetch_array($r, SQLITE_ASSOC));
-?>
---EXPECT--
-array(6) {
-  [0]=>
-  string(10) "2002-01-02"
-  ["c1"]=>
-  string(10) "2002-01-02"
-  [1]=>
-  string(8) "12:49:00"
-  ["c2"]=>
-  string(8) "12:49:00"
-  [2]=>
-  NULL
-  ["c3"]=>
-  NULL
-}
-array(3) {
-  [0]=>
-  string(10) "2002-01-02"
-  [1]=>
-  string(8) "12:49:00"
-  [2]=>
-  NULL
-}
-array(3) {
-  ["c1"]=>
-  string(10) "2002-01-02"
-  ["c2"]=>
-  string(8) "12:49:00"
-  ["c3"]=>
-  NULL
-}

ext/sqlite/tests/sqlite_008.phpt

@@ -1,43 +0,0 @@
---TEST--
-sqlite: fetch all (buffered)
---INI--
-sqlite.assoc_case=0
---SKIPIF--
-<?php # vim:ft=php
-if (!extension_loaded("sqlite")) print "skip"; ?>
---FILE--
-<?php 
-include "blankdb.inc";
-
-$data = array(
-	"one",
-	"two",
-	"three"
-	);
-
-sqlite_query("CREATE TABLE strings(a VARCHAR)", $db);
-
-foreach ($data as $str) {
-	sqlite_query("INSERT INTO strings VALUES('$str')", $db);
-}
-
-$r = sqlite_query("SELECT a from strings", $db);
-while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
-	var_dump($row);
-}
-echo "DONE!\n";
-?>
---EXPECT--
-array(1) {
-  [0]=>
-  string(3) "one"
-}
-array(1) {
-  [0]=>
-  string(3) "two"
-}
-array(1) {
-  [0]=>
-  string(5) "three"
-}
-DONE!

ext/sqlite/tests/sqlite_009.phpt

@@ -1,43 +0,0 @@
---TEST--
-sqlite: fetch all (unbuffered)
---INI--
-sqlite.assoc_case=0
---SKIPIF--
-<?php # vim:ft=php
-if (!extension_loaded("sqlite")) print "skip"; ?>
---FILE--
-<?php 
-include "blankdb.inc";
-
-$data = array(
-	"one",
-	"two",
-	"three"
-	);
-
-sqlite_query("CREATE TABLE strings(a VARCHAR)", $db);
-
-foreach ($data as $str) {
-	sqlite_query("INSERT INTO strings VALUES('$str')", $db);
-}
-
-$r = sqlite_unbuffered_query("SELECT a from strings", $db);
-while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
-	var_dump($row);
-}
-echo "DONE!\n";
-?>
---EXPECT--
-array(1) {
-  [0]=>
-  string(3) "one"
-}
-array(1) {
-  [0]=>
-  string(3) "two"
-}
-array(1) {
-  [0]=>
-  string(5) "three"
-}
-DONE!

ext/sqlite/tests/sqlite_010.phpt

@@ -1,78 +0,0 @@
---TEST--
-sqlite: fetch all (iterator)
---INI--
-sqlite.assoc_case=0
---SKIPIF--
-<?php # vim:ft=php
-if (!extension_loaded("sqlite")) print "skip"; ?>
---FILE--
-<?php 
-include "blankdb.inc";
-
-$data = array(
-	"one",
-	"two",
-	"three"
-	);
-
-sqlite_query("CREATE TABLE strings(a VARCHAR)", $db);
-
-foreach ($data as $str) {
-	sqlite_query("INSERT INTO strings VALUES('$str')", $db);
-}
-
-$r = sqlite_unbuffered_query("SELECT a from strings", $db);
-while (sqlite_has_more($r)) {
-	var_dump(sqlite_current($r, SQLITE_NUM));
-	sqlite_next($r);
-}
-$r = sqlite_query("SELECT a from strings", $db);
-while (sqlite_has_more($r)) {
-	var_dump(sqlite_current($r, SQLITE_NUM));
-	sqlite_next($r);
-}
-sqlite_rewind($r);
-while (sqlite_has_more($r)) {
-	var_dump(sqlite_current($r, SQLITE_NUM));
-	sqlite_next($r);
-}
-echo "DONE!\n";
-?>
---EXPECT--
-array(1) {
-  [0]=>
-  string(3) "one"
-}
-array(1) {
-  [0]=>
-  string(3) "two"
-}
-array(1) {
-  [0]=>
-  string(5) "three"
-}
-array(1) {
-  [0]=>
-  string(3) "one"
-}
-array(1) {
-  [0]=>
-  string(3) "two"
-}
-array(1) {
-  [0]=>
-  string(5) "three"
-}
-array(1) {
-  [0]=>
-  string(3) "one"
-}
-array(1) {
-  [0]=>
-  string(3) "two"
-}
-array(1) {
-  [0]=>
-  string(5) "three"
-}
-DONE!

ext/sqlite/tests/sqlite_011.phpt

@@ -1,27 +0,0 @@
---TEST--
-sqlite: returned associative column names
---INI--
-sqlite.assoc_case=0
---SKIPIF--
-<?php
-if (!extension_loaded("sqlite")) print "skip"; ?>
---FILE--
-<?php 
-include "blankdb.inc";
-
-sqlite_query("CREATE TABLE foo (c1 char, c2 char, c3 char)", $db);
-sqlite_query("CREATE TABLE bar (c1 char, c2 char, c3 char)", $db);
-sqlite_query("INSERT INTO foo VALUES ('1', '2', '3')", $db);
-sqlite_query("INSERT INTO bar VALUES ('4', '5', '6')", $db);
-$r = sqlite_query("SELECT * from foo, bar", $db, SQLITE_ASSOC);
-var_dump(sqlite_fetch_array($r));
-?>
---EXPECT--
-array(3) {
-  ["c1"]=>
-  string(1) "4"
-  ["c2"]=>
-  string(1) "5"
-  ["c3"]=>
-  string(1) "6"
-}

ext/sqlite/tests/sqlite_012.phpt

@@ -1,35 +0,0 @@
---TEST--
-sqlite: read field names
---INI--
-sqlite.assoc_case=0
---SKIPIF--
-<?php # vim:ft=php
-if (!extension_loaded("sqlite")) print "skip"; ?>
---FILE--
-<?php 
-include "blankdb.inc";
-
-sqlite_query("CREATE TABLE strings(foo VARCHAR, bar VARCHAR, baz VARCHAR)", $db);
-
-echo "Buffered\n";
-$r = sqlite_query("SELECT * from strings", $db);
-for($i=0; $i<sqlite_num_fields($r); $i++) {
-	var_dump(sqlite_field_name($r, $i));
-}
-echo "Unbuffered\n";
-$r = sqlite_unbuffered_query("SELECT * from strings", $db);
-for($i=0; $i<sqlite_num_fields($r); $i++) {
-	var_dump(sqlite_field_name($r, $i));
-}
-echo "DONE!\n";
-?>
---EXPECT--
-Buffered
-string(3) "foo"
-string(3) "bar"
-string(3) "baz"
-Unbuffered
-string(3) "foo"
-string(3) "bar"
-string(3) "baz"
-DONE!