CVS update: php3/functions

Date: Tuesday June 22, 1999 @ 16:25 Author: jimjag Update of /repository/php3/functions In directory php:/tmp/cvs-serv8112/functions Modified Files: dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c php3_dba.h Log Message: Add the 'c' mode to dba_open, making it consistant with dbm_open. This is what 'w' USED to do, that is create a file if it didn't exist. Now 'w' will simply open a database for rd/wr but will not create it. Index: php3/functions/dba.c diff -u php3/functions/dba.c:1.17 php3/functions/dba.c:1.18 --- php3/functions/dba.c:1.17 Mon May 17 23:15:47 1999 +++ php3/functions/dba.c Tue Jun 22 16:25:26 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.17 1999/05/18 03:15:47 sas Exp $ */ +/* $Id: dba.c,v 1.18 1999/06/22 20:25:26 jimjag Exp $ */ #include "php.h" @@ -128,7 +128,7 @@ /* check whether the user has write access */ #define DBA_WRITE_CHECK \ - if(info->mode != DBA_WRITER && info->mode != DBA_TRUNC) { \ + if(info->mode != DBA_WRITER && info->mode != DBA_TRUNC && info->mode != DBA_CREAT) { \ php3_error(E_WARNING, "you cannot perform a modification to a database without proper access"); \ RETURN_FALSE; \ } @@ -197,7 +197,7 @@ { dba_handler *hptr; - PUTS("V1 ($Id: dba.c,v 1.17 1999/05/18 03:15:47 sas Exp $)"); + PUTS("V1 ($Id: dba.c,v 1.18 1999/06/22 20:25:26 jimjag Exp $)"); for(hptr = handler; hptr->name; hptr++) { PUTS(" "); PUTS(hptr->name); @@ -285,6 +285,9 @@ } switch(args[1]->value.str.val[0]) { + case 'c': + modenr = DBA_CREAT; + break; case 'w': modenr = DBA_WRITER; break; Index: php3/functions/dba_cdb.c diff -u php3/functions/dba_cdb.c:1.10 php3/functions/dba_cdb.c:1.11 --- php3/functions/dba_cdb.c:1.10 Mon May 10 07:52:05 1999 +++ php3/functions/dba_cdb.c Tue Jun 22 16:25:26 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_cdb.c,v 1.10 1999/05/10 11:52:05 sas Exp $ */ +/* $Id: dba_cdb.c,v 1.11 1999/06/22 20:25:26 jimjag Exp $ */ #include "php.h" @@ -62,7 +62,7 @@ /* currently not supported: */ #if 0 case DBA_WRITER: - gmode = O_RDWR | O_CREAT; break; + gmode = O_RDWR; break; #endif default: return FAILURE; Index: php3/functions/dba_db2.c diff -u php3/functions/dba_db2.c:1.9 php3/functions/dba_db2.c:1.10 --- php3/functions/dba_db2.c:1.9 Thu Jun 3 10:15:28 1999 +++ php3/functions/dba_db2.c Tue Jun 22 16:25:26 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_db2.c,v 1.9 1999/06/03 14:15:28 sas Exp $ */ +/* $Id: dba_db2.c,v 1.10 1999/06/22 20:25:26 jimjag Exp $ */ #include "php.h" @@ -70,7 +70,8 @@ stat(info->path, &check_stat) ? DB_BTREE : DB_UNKNOWN; gmode = info->mode == DBA_READER ? DB_RDONLY : - info->mode == DBA_WRITER ? DB_CREATE : + info->mode == DBA_CREAT ? DB_CREATE : + info->mode == DBA_WRITER ? 0 : info->mode == DBA_TRUNC ? DB_CREATE | DB_TRUNCATE : -1; if(gmode == -1) Index: php3/functions/dba_dbm.c diff -u php3/functions/dba_dbm.c:1.14 php3/functions/dba_dbm.c:1.15 --- php3/functions/dba_dbm.c:1.14 Mon May 17 23:15:47 1999 +++ php3/functions/dba_dbm.c Tue Jun 22 16:25:26 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_dbm.c,v 1.14 1999/05/18 03:15:47 sas Exp $ */ +/* $Id: dba_dbm.c,v 1.15 1999/06/22 20:25:26 jimjag Exp $ */ #include "php.h" @@ -78,7 +78,7 @@ TRUNC_IT(".dir", O_TRUNC); } - if(info->mode == DBA_WRITER) { + if(info->mode == DBA_CREAT) { char buf[PATH_MAX + 1]; TRUNC_IT(".pag", 0); Index: php3/functions/dba_gdbm.c diff -u php3/functions/dba_gdbm.c:1.11 php3/functions/dba_gdbm.c:1.12 --- php3/functions/dba_gdbm.c:1.11 Mon May 17 23:15:47 1999 +++ php3/functions/dba_gdbm.c Tue Jun 22 16:25:26 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_gdbm.c,v 1.11 1999/05/18 03:15:47 sas Exp $ */ +/* $Id: dba_gdbm.c,v 1.12 1999/06/22 20:25:26 jimjag Exp $ */ #include "php.h" @@ -51,7 +51,8 @@ int filemode = 0644; gmode = info->mode == DBA_READER ? GDBM_READER : - info->mode == DBA_WRITER ? GDBM_WRCREAT : + info->mode == DBA_WRITER ? GDBM_WRITER : + info->mode == DBA_CREAT ? GDBM_WRCREAT : info->mode == DBA_TRUNC ? GDBM_NEWDB : -1; if(gmode == -1) Index: php3/functions/dba_ndbm.c diff -u php3/functions/dba_ndbm.c:1.12 php3/functions/dba_ndbm.c:1.13 --- php3/functions/dba_ndbm.c:1.12 Mon May 17 23:15:47 1999 +++ php3/functions/dba_ndbm.c Tue Jun 22 16:25:26 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_ndbm.c,v 1.12 1999/05/18 03:15:47 sas Exp $ */ +/* $Id: dba_ndbm.c,v 1.13 1999/06/22 20:25:26 jimjag Exp $ */ #include "php.h" @@ -54,6 +54,9 @@ gmode = O_RDONLY; break; case DBA_WRITER: + gmode = O_RDWR; + break; + case DBA_CREAT: gmode = O_RDWR | O_CREAT; break; case DBA_TRUNC: Index: php3/functions/php3_dba.h diff -u php3/functions/php3_dba.h:1.10 php3/functions/php3_dba.h:1.11 --- php3/functions/php3_dba.h:1.10 Mon May 10 07:15:02 1999 +++ php3/functions/php3_dba.h Tue Jun 22 16:25:26 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php3_dba.h,v 1.10 1999/05/10 11:15:02 sas Exp $ */ +/* $Id: php3_dba.h,v 1.11 1999/06/22 20:25:26 jimjag Exp $ */ #ifndef _DBA_H #define _DBA_H @@ -39,7 +39,8 @@ typedef enum { DBA_READER = 1, DBA_WRITER, - DBA_TRUNC + DBA_TRUNC, + DBA_CREAT } dba_mode_t; typedef struct dba_info {