diff options
| author | Gavin Sherry <swm@php.net> | 2002-01-12 07:23:35 +0000 |
|---|---|---|
| committer | Gavin Sherry <swm@php.net> | 2002-01-12 07:23:35 +0000 |
| commit | e8baeb304a2390a03756d2e503ab275bc2c70854 (patch) | |
| tree | 83041cf87dea6bcdc9f53a52256d3ef020ad931f /ext/dba | |
| parent | 8f30e5f61972cd85ecba9b242cde64e0ca837c61 (diff) | |
| download | php-git-e8baeb304a2390a03756d2e503ab275bc2c70854.tar.gz | |
See the update to dba_db3.c
Diffstat (limited to 'ext/dba')
| -rw-r--r-- | ext/dba/dba_db2.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ext/dba/dba_db2.c b/ext/dba/dba_db2.c index 75cc7c18b9..37973ed3f9 100644 --- a/ext/dba/dba_db2.c +++ b/ext/dba/dba_db2.c @@ -47,13 +47,15 @@ DBA_OPEN_FUNC(db2) int gmode = 0; int filemode = 0644; struct stat check_stat; - + int ret; + int s = VCWD_STAT(info->path, &check_stat); type = info->mode == DBA_READER ? DB_UNKNOWN : info->mode == DBA_TRUNC ? DB_BTREE : - VCWD_STAT(info->path, &check_stat) ? DB_BTREE : DB_UNKNOWN; + s ? DB_BTREE : DB_UNKNOWN; gmode = info->mode == DBA_READER ? DB_RDONLY : - info->mode == DBA_CREAT ? DB_CREATE : + (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; @@ -65,11 +67,13 @@ DBA_OPEN_FUNC(db2) filemode = Z_LVAL_PP(info->argv[0]); } - if(!db_open(info->path, type, gmode, filemode, NULL, NULL, &dbp)) { + if(!(ret = db_open(info->path, type, gmode, filemode, NULL, NULL, &dbp))) { info->dbf = malloc(sizeof(dba_db2_data)); memset(info->dbf, 0, sizeof(dba_db2_data)); ((dba_db2_data *) info->dbf)->dbp = dbp; return SUCCESS; + } else { + printf("Failed: type = %i\ngmode = %i\n%s\n",type,gmode,strerror(ret)); } return FAILURE; } |