helly Tue Nov 5 09:46:36 2002 EDT Modified files: /php4/ext/dba dba.c dba_cdb.c dba_db2.c dba_db3.c dba_dbm.c dba_gdbm.c dba_ndbm.c php_dba.h Log: Why did open fail?
Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.50 php4/ext/dba/dba.c:1.51 --- php4/ext/dba/dba.c:1.50 Mon Nov 4 12:53:04 2002 +++ php4/ext/dba/dba.c Tue Nov 5 09:46:35 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.50 2002/11/04 17:53:04 helly Exp $ */ +/* $Id: dba.c,v 1.51 2002/11/05 14:46:35 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -79,7 +79,7 @@ typedef struct dba_handler { char *name; - int (*open)(dba_info * TSRMLS_DC); + int (*open)(dba_info *, char **error TSRMLS_DC); void (*close)(dba_info * TSRMLS_DC); char* (*fetch)(dba_info *, char *, int, int, int * TSRMLS_DC); int (*update)(dba_info *, char *, int, char *, int, int TSRMLS_DC); @@ -290,7 +290,7 @@ dba_mode_t modenr; dba_info *info; dba_handler *hptr; - char *key = NULL; + char *key = NULL, *error = NULL; int keylen = 0; int i; @@ -341,7 +341,7 @@ for (hptr = handler; hptr->name && strcasecmp(hptr->name, Z_STRVAL_PP(args[2])); hptr++); if (!hptr->name) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such handler: %s", Z_STRVAL_PP(args[2])); + php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]), +Z_STRVAL_PP(args[1]), E_WARNING, "No such handler: %s", Z_STRVAL_PP(args[2])); FREENOW; RETURN_FALSE; } @@ -360,7 +360,7 @@ modenr = DBA_TRUNC; break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal DBA mode: %s", Z_STRVAL_PP(args[1])); + php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]), +Z_STRVAL_PP(args[1]), E_WARNING, "Illegal DBA mode"); FREENOW; RETURN_FALSE; } @@ -373,9 +373,9 @@ info->argv = args + 3; info->hnd = NULL; - if (hptr->open(info TSRMLS_CC) != SUCCESS) { + if (hptr->open(info, &error TSRMLS_CC) != SUCCESS) { dba_close(info TSRMLS_CC); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Driver initialization failed for handler: %s", Z_STRVAL_PP(args[2])); + php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]), +Z_STRVAL_PP(args[1]), E_WARNING, "Driver initialization failed for handler: %s%s%s", +Z_STRVAL_PP(args[2]), error?": ":"", error?error:""); FREENOW; RETURN_FALSE; } Index: php4/ext/dba/dba_cdb.c diff -u php4/ext/dba/dba_cdb.c:1.19 php4/ext/dba/dba_cdb.c:1.20 --- php4/ext/dba/dba_cdb.c:1.19 Tue Nov 5 06:22:48 2002 +++ php4/ext/dba/dba_cdb.c Tue Nov 5 09:46:35 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_cdb.c,v 1.19 2002/11/05 11:22:48 helly Exp $ */ +/* $Id: dba_cdb.c,v 1.20 2002/11/05 14:46:35 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -74,11 +74,13 @@ make = 0; file = php_stream_open_wrapper(info->path, "rb", STREAM_MUST_SEEK|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL); if (!file) { + *error = "Unable to open file"; return FAILURE; } #else file = VCWD_OPEN(info->path, O_RDONLY); if (file < 0) { + *error = "Unable to open file"; return FAILURE; } #endif @@ -89,24 +91,28 @@ make = 1; file = php_stream_open_wrapper(info->path, "wb", STREAM_MUST_SEEK|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL); if (!file) { + *error = "Unable to open file"; return FAILURE; } break; case DBA_WRITER: + *error = "Update operations are not supported"; return FAILURE; /* not supported */ #endif default: - /* currently not supported: */ + *error = "Currently not supported"; return FAILURE; } cdb = ecalloc(sizeof(dba_cdb), 1); if (!cdb) { + pinfo->dbf = cdb; #if DBA_CDB_BUILTIN php_stream_close(file); #else close(file); #endif + *error = "Out of memory"; return FAILURE; } Index: php4/ext/dba/dba_db2.c diff -u php4/ext/dba/dba_db2.c:1.28 php4/ext/dba/dba_db2.c:1.29 --- php4/ext/dba/dba_db2.c:1.28 Mon Nov 4 08:39:17 2002 +++ php4/ext/dba/dba_db2.c Tue Nov 5 09:46:35 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_db2.c,v 1.28 2002/11/04 13:39:17 helly Exp $ */ +/* $Id: dba_db2.c,v 1.29 2002/11/05 14:46:35 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -63,8 +63,9 @@ info->mode == DBA_WRITER ? 0 : info->mode == DBA_TRUNC ? DB_CREATE | DB_TRUNCATE : -1; - if (gmode == -1) - return FAILURE; + if (gmode == -1) { + return FAILURE;/* not possible */ + } if (info->argc > 0) { convert_to_long_ex(info->argv[0]); @@ -76,6 +77,10 @@ } info->dbf = ecalloc(sizeof(dba_db2_data), 1); + if (!info->dbf) { + *error = "Out of memory"; + return FAILURE; + } ((dba_db2_data *) info->dbf)->dbp = dbp; return SUCCESS; } Index: php4/ext/dba/dba_db3.c diff -u php4/ext/dba/dba_db3.c:1.19 php4/ext/dba/dba_db3.c:1.20 --- php4/ext/dba/dba_db3.c:1.19 Mon Nov 4 08:39:17 2002 +++ php4/ext/dba/dba_db3.c Tue Nov 5 09:46:36 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_db3.c,v 1.19 2002/11/04 13:39:17 helly Exp $ */ +/* $Id: dba_db3.c,v 1.20 2002/11/05 14:46:36 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -66,7 +66,7 @@ info->mode == DBA_TRUNC ? DB_CREATE | DB_TRUNCATE : -1; if (gmode == -1) - return FAILURE; + return FAILURE; /* not possible */ if (info->argc > 0) { convert_to_long_ex(info->argv[0]); @@ -78,6 +78,10 @@ dba_db3_data *data; data = emalloc(sizeof(*data)); + if (!data) { + *error = "Out of memory"; + return FAILURE; + } data->dbp = dbp; data->cursor = NULL; info->dbf = data; Index: php4/ext/dba/dba_dbm.c diff -u php4/ext/dba/dba_dbm.c:1.16 php4/ext/dba/dba_dbm.c:1.17 --- php4/ext/dba/dba_dbm.c:1.16 Mon Nov 4 08:39:17 2002 +++ php4/ext/dba/dba_dbm.c Tue Nov 5 09:46:36 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_dbm.c,v 1.16 2002/11/04 13:39:17 helly Exp $ */ +/* $Id: dba_dbm.c,v 1.17 2002/11/05 14:46:36 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -79,6 +79,10 @@ } info->dbf = ecalloc(sizeof(dba_dbm_data), 1); + if (!info->dbf) { + *error = "Out of memory"; + return FAILURE; + } return SUCCESS; } Index: php4/ext/dba/dba_gdbm.c diff -u php4/ext/dba/dba_gdbm.c:1.12 php4/ext/dba/dba_gdbm.c:1.13 --- php4/ext/dba/dba_gdbm.c:1.12 Mon Nov 4 08:39:17 2002 +++ php4/ext/dba/dba_gdbm.c Tue Nov 5 09:46:36 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_gdbm.c,v 1.12 2002/11/04 13:39:17 helly Exp $ */ +/* $Id: dba_gdbm.c,v 1.13 2002/11/05 14:46:36 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -49,7 +49,7 @@ info->mode == DBA_TRUNC ? GDBM_NEWDB : -1; if(gmode == -1) - return FAILURE; + return FAILURE; /* not possible */ if(info->argc > 0) { convert_to_long_ex(info->argv[0]); @@ -63,6 +63,7 @@ ((dba_gdbm_data *) info->dbf)->dbf = dbf; return SUCCESS; } + *error = "Out of memory"; return FAILURE; } Index: php4/ext/dba/dba_ndbm.c diff -u php4/ext/dba/dba_ndbm.c:1.12 php4/ext/dba/dba_ndbm.c:1.13 --- php4/ext/dba/dba_ndbm.c:1.12 Thu Apr 18 08:30:18 2002 +++ php4/ext/dba/dba_ndbm.c Tue Nov 5 09:46:36 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_ndbm.c,v 1.12 2002/04/18 12:30:18 derick Exp $ */ +/* $Id: dba_ndbm.c,v 1.13 2002/11/05 14:46:36 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -55,7 +55,7 @@ gmode = O_RDWR | O_CREAT | O_TRUNC; break; default: - return FAILURE; + return FAILURE; /* not possible */ } if(info->argc > 0) { @@ -69,6 +69,7 @@ pinfo->dbf = dbf; return SUCCESS; } + *error = "Out of memory"; return FAILURE; } Index: php4/ext/dba/php_dba.h diff -u php4/ext/dba/php_dba.h:1.16 php4/ext/dba/php_dba.h:1.17 --- php4/ext/dba/php_dba.h:1.16 Mon Nov 4 07:27:13 2002 +++ php4/ext/dba/php_dba.h Tue Nov 5 09:46:36 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dba.h,v 1.16 2002/11/04 12:27:13 helly Exp $ */ +/* $Id: php_dba.h,v 1.17 2002/11/05 14:46:36 helly Exp $ */ #ifndef PHP_DBA_H #define PHP_DBA_H @@ -48,7 +48,7 @@ /* common prototypes which must be supplied by modules */ #define DBA_OPEN_FUNC(x) \ - int dba_open_##x(dba_info *info TSRMLS_DC) + int dba_open_##x(dba_info *info, char **error TSRMLS_DC) #define DBA_CLOSE_FUNC(x) \ void dba_close_##x(dba_info *info TSRMLS_DC) #define DBA_FETCH_FUNC(x) \
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php