 |
 |
Find a programming school near you
php4-beta | 200004
Date: 04/30/00
- Next message: Zeev Suraski: "RE: [PHP4BETA] why are system & exec so slow?"
- Previous message: Sterling Hughes: "[PHP4BETA] cvs: /php4/ext/swf Makefile.in config.m4 php_swf.h swf.c swf.h"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
andi Sun Apr 30 12:01:17 2000 EDT
Modified files:
/php4/dl/log log_sql.c
/php4/ext/db db.c
/php4/ext/dba dba_cdb.c dba_dbm.c
/php4/ext/dbase dbase.c dbf_head.c
/php4/ext/oci8 oci8.c
/php4/ext/session mod_files.c session.c
Log:
- Change some open's to V_OPEN()'s
Index: php4/dl/log/log_sql.c
diff -u php4/dl/log/log_sql.c:1.3 php4/dl/log/log_sql.c:1.4
--- php4/dl/log/log_sql.c:1.3 Sat Mar 11 12:48:44 2000
+++ php4/dl/log/log_sql.c Sun Apr 30 12:01:15 2000
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: log_sql.c,v 1.3 2000/03/11 20:48:44 andi Exp $ */
+/* $Id: log_sql.c,v 1.4 2000/04/30 19:01:15 andi Exp $ */
#include "phpdl.h"
@@ -206,7 +206,7 @@
pfn = filename_to_logfn(filename);
sprintf(lockfn,"%s/%s%ld.lck",SQLLOGTMP,pfn,uid);
/* Lock database */
- lockfd = open(lockfn,O_RDWR|O_CREAT,0644);
+ lockfd = V_OPEN((lockfn,O_RDWR|O_CREAT,0644));
if (lockfd) {
#if HAVE_LOCKF
lockf(lockfd,F_LOCK,0);
Index: php4/ext/db/db.c
diff -u php4/ext/db/db.c:1.30 php4/ext/db/db.c:1.31
--- php4/ext/db/db.c:1.30 Thu Apr 20 10:23:59 2000
+++ php4/ext/db/db.c Sun Apr 30 12:01:15 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: db.c,v 1.30 2000/04/20 17:23:59 zeev Exp $ */
+/* $Id: db.c,v 1.31 2000/04/30 19:01:15 andi Exp $ */
#define IS_EXT_MODULE
#if COMPILE_DL
# include "dl/phpdl.h"
@@ -333,7 +333,7 @@
}
#else /* NFS_HACK */
- lockfd = open(lockfn,O_RDWR|O_CREAT,0644);
+ lockfd = V_OPEN((lockfn,O_RDWR|O_CREAT,0644));
if (lockfd) {
flock(lockfd,LOCK_EX);
@@ -428,7 +428,7 @@
unlink(info->lockfn);
#else
if (info->lockfn) {
- lockfd = open(info->lockfn,O_RDWR,0644);
+ lockfd = V_OPEN((info->lockfn,O_RDWR,0644));
flock(lockfd,LOCK_UN);
close(lockfd);
}
Index: php4/ext/dba/dba_cdb.c
diff -u php4/ext/dba/dba_cdb.c:1.2 php4/ext/dba/dba_cdb.c:1.3
--- php4/ext/dba/dba_cdb.c:1.2 Sat Dec 4 11:15:46 1999
+++ php4/ext/dba/dba_cdb.c Sun Apr 30 12:01:16 2000
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba_cdb.c,v 1.2 1999/12/04 19:15:46 sas Exp $ */
+/* $Id: dba_cdb.c,v 1.3 2000/04/30 19:01:16 andi Exp $ */
#include "php.h"
@@ -71,7 +71,7 @@
cdb = malloc(sizeof *cdb);
memset(cdb, 0, sizeof *cdb);
- cdb->fd = open(info->path, gmode);
+ cdb->fd = V_OPEN((info->path, gmode))
if(cdb->fd < 0) {
free(cdb);
return FAILURE;
Index: php4/ext/dba/dba_dbm.c
diff -u php4/ext/dba/dba_dbm.c:1.3 php4/ext/dba/dba_dbm.c:1.4
--- php4/ext/dba/dba_dbm.c:1.3 Sat Dec 4 11:15:46 1999
+++ php4/ext/dba/dba_dbm.c Sun Apr 30 12:01:16 2000
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba_dbm.c,v 1.3 1999/12/04 19:15:46 sas Exp $ */
+/* $Id: dba_dbm.c,v 1.4 2000/04/30 19:01:16 andi Exp $ */
#include "php.h"
@@ -51,7 +51,7 @@
#define TRUNC_IT(extension, mode) \
snprintf(buf, PATH_MAX, "%s" extension, info->path); \
buf[PATH_MAX] = '\0'; \
- if((fd = open(buf, O_CREAT | mode | O_WRONLY, filemode)) == -1) \
+ if((fd = V_OPEN((buf, O_CREAT | mode | O_WRONLY, filemode))) == -1) \
return FAILURE; \
close(fd);
Index: php4/ext/dbase/dbase.c
diff -u php4/ext/dbase/dbase.c:1.18 php4/ext/dbase/dbase.c:1.19
--- php4/ext/dbase/dbase.c:1.18 Mon Mar 6 10:41:05 2000
+++ php4/ext/dbase/dbase.c Sun Apr 30 12:01:16 2000
@@ -586,15 +586,15 @@
RETURN_FALSE;
}
- if (PG(safe_mode) && (!php_checkuid(filename->value.str.val, 2))) {
+ if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_P(filename), 2))) {
RETURN_FALSE;
}
- if (php_check_open_basedir(filename->value.str.val)) {
+ if (php_check_open_basedir(Z_STRVAL_P(filename))) {
RETURN_FALSE;
}
- if ((fd = open(filename->value.str.val, O_BINARY|O_RDWR|O_CREAT, 0644)) < 0) {
+ if ((fd = V_OPEN((Z_STRVAL_P(filename), O_BINARY|O_RDWR|O_CREAT, 0644))) < 0) {
php_error(E_WARNING, "Unable to create database (%d): %s", errno, strerror(errno));
RETURN_FALSE;
}
Index: php4/ext/dbase/dbf_head.c
diff -u php4/ext/dbase/dbf_head.c:1.1 php4/ext/dbase/dbf_head.c:1.2
--- php4/ext/dbase/dbf_head.c:1.1 Mon Apr 19 06:56:50 1999
+++ php4/ext/dbase/dbf_head.c Sun Apr 30 12:01:16 2000
@@ -226,10 +226,10 @@
dbhead_t *dbh;
cp = dp;
- if ((fd = open(cp, o_flags|O_BINARY)) < 0) {
+ if ((fd = V_OPEN((cp, o_flags|O_BINARY))) < 0) {
cp = (char *)malloc(256);
strcpy(cp, dp); strcat(cp, ".dbf");
- if ((fd = open(cp, o_flags)) < 0) {
+ if ((fd = V_OPEN((cp, o_flags))) < 0) {
perror("open");
return NULL;
}
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.76 php4/ext/oci8/oci8.c:1.77
--- php4/ext/oci8/oci8.c:1.76 Fri Apr 28 03:37:16 2000
+++ php4/ext/oci8/oci8.c Sun Apr 30 12:01:16 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.76 2000/04/28 10:37:16 thies Exp $ */
+/* $Id: oci8.c,v 1.77 2000/04/30 19:01:16 andi Exp $ */
/* TODO list:
*
@@ -2690,7 +2690,7 @@
filename = (*arg)->value.str.val;
- if ((fp = open(filename, O_RDONLY)) == -1) {
+ if ((fp = V_OPEN((filename, O_RDONLY))) == -1) {
php_error(E_WARNING, "Can't open file %s", filename);
RETURN_FALSE;
}
@@ -2812,7 +2812,7 @@
goto bail;
}
- if ((fp = open(filename,O_CREAT|O_TRUNC|O_WRONLY)) == -1) {
+ if ((fp = V_OPEN((filename,O_CREAT|O_TRUNC|O_WRONLY))) == -1) {
php_error(E_WARNING, "Can't create file %s", filename);
goto bail;
}
Index: php4/ext/session/mod_files.c
diff -u php4/ext/session/mod_files.c:1.29 php4/ext/session/mod_files.c:1.30
--- php4/ext/session/mod_files.c:1.29 Thu Apr 20 10:24:00 2000
+++ php4/ext/session/mod_files.c Sun Apr 30 12:01:17 2000
@@ -132,16 +132,16 @@
data->lastkey = estrdup(key);
#ifdef O_EXCL
- data->fd = open(buf, O_RDWR);
+ data->fd = V_OPEN((buf, O_RDWR));
if (data->fd == -1) {
if (errno == ENOENT) {
- data->fd = open(buf, O_EXCL | O_RDWR | O_CREAT, 0600);
+ data->fd = V_OPEN((buf, O_EXCL | O_RDWR | O_CREAT, 0600));
}
} else {
flock(data->fd, LOCK_EX);
}
#else
- data->fd = open(buf, O_CREAT | O_RDWR, 0600);
+ data->fd = V_OPEN((buf, O_CREAT | O_RDWR, 0600));
if (data->fd != -1)
flock(data->fd, LOCK_EX);
#endif
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.129 php4/ext/session/session.c:1.130
--- php4/ext/session/session.c:1.129 Fri Apr 28 06:03:12 2000
+++ php4/ext/session/session.c Sun Apr 30 12:01:17 2000
@@ -394,7 +394,7 @@
if (PS(entropy_length) > 0) {
int fd;
- fd = open(PS(entropy_file), O_RDONLY);
+ fd = V_OPEN((PS(entropy_file), O_RDONLY));
if (fd >= 0) {
char *p;
int n;
-- PHP 4.0 Beta Mailing List <http://www.php.net/version4/> To unsubscribe, e-mail: php4beta-unsubscribe <email protected> For additional commands, e-mail: php4beta-help <email protected> To contact the list administrators, e-mail: php4beta-admin <email protected>
- Next message: Zeev Suraski: "RE: [PHP4BETA] why are system & exec so slow?"
- Previous message: Sterling Hughes: "[PHP4BETA] cvs: /php4/ext/swf Makefile.in config.m4 php_swf.h swf.c swf.h"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
