cvs: php4 / ChangeLog /ext/com COM.c /ext/db db.c /ext/dba dba_cdb.c dba_db2.c dba_db3.c dba_dbm.c /ext/dbase dbase.c dbf_head.c /ext/exif exif.c
/ext/fdf fdf.c /ext/filepro filepro.c /ext/ftp php_ftp.c /ext/gd gd.c gd_ctx.c /ext/gettext gettext.c /ext/ming ming.c /ext/oci8 oci8.c
/ext/openssl openssl.c /ext/posix posix.c /ext/session mod_files.c session.c /ext/standard basic_functions.c browscap.c dir.c exec.c file.c
filestat.c iptc.c link.c /ext/swf swf.c /main SAPI.c fopen_wrappers.c main.c php_open_temporary_file.c rfc1867.c safe_mode.c /sapi/caudium
caudium.c /sapi/cgi cgi_main.c /win32 registry.c

andi Mon Apr 30 05:43:46 2001 EDT Modified files: /php4 ChangeLog /php4/ext/com COM.c /php4/ext/db db.c /php4/ext/dba dba_cdb.c dba_db2.c dba_db3.c dba_dbm.c /php4/ext/dbase dbase.c dbf_head.c /php4/ext/exif exif.c /php4/ext/fdf fdf.c /php4/ext/filepro filepro.c /php4/ext/ftp php_ftp.c /php4/ext/gd gd.c gd_ctx.c /php4/ext/gettext gettext.c /php4/ext/ming ming.c /php4/ext/oci8 oci8.c /php4/ext/openssl openssl.c /php4/ext/posix posix.c /php4/ext/session mod_files.c session.c /php4/ext/standard basic_functions.c browscap.c dir.c exec.c file.c filestat.c iptc.c link.c /php4/ext/swf swf.c /php4/main SAPI.c fopen_wrappers.c main.c php_open_temporary_file.c rfc1867.c safe_mode.c /php4/sapi/caudium caudium.c /php4/sapi/cgi cgi_main.c /php4/win32 registry.c Log: - Change macros from V_ to VCWD_ because of AIX name clash

Index: php4/ChangeLog diff -u php4/ChangeLog:1.697 php4/ChangeLog:1.698 --- php4/ChangeLog:1.697 Sun Apr 29 18:09:11 2001 +++ php4/ChangeLog Mon Apr 30 05:43:29 2001 @@ -1384,7 +1384,7 @@ 2001-04-03 Daniel Beulshausen <daniel@php4win.de> - * ext/exif/exif.c: use V_STAT + * ext/exif/exif.c: use VCWD_STAT * ext/exif/exif.c: resolve realpath if in v-dir mode Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.7 php4/ext/com/COM.c:1.8 --- php4/ext/com/COM.c:1.7 Tue Mar 20 14:35:28 2001 +++ php4/ext/com/COM.c Mon Apr 30 05:43:30 2001 @@ -205,7 +205,7 @@ #endif - if (!new_value || (typelib_file=V_FOPEN(new_value, "r"))==NULL) { + if (!new_value || (typelib_file=VCWD_FOPEN(new_value, "r"))==NULL) { return FAILURE; } Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.49 php4/ext/db/db.c:1.50 --- php4/ext/db/db.c:1.49 Sun Feb 25 22:06:53 2001 +++ php4/ext/db/db.c Mon Apr 30 05:43:30 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.49 2001/02/26 06:06:53 andi Exp $ */ +/* $Id: db.c,v 1.50 2001/04/30 12:43:30 andi Exp $ */ #define IS_EXT_MODULE #if 1 @@ -120,7 +120,7 @@ #define DBM_CREATE_MODE "a+b" #define DBM_NEW_MODE "w+b" #define DBM_DEFAULT_MODE "r" -#define DBM_OPEN(filename, mode) V_FOPEN(filename, mode) +#define DBM_OPEN(filename, mode) VCWD_FOPEN(filename, mode) #define DBM_CLOSE(dbf) fclose(dbf) #define DBM_STORE(dbf, key, value, mode) flatfile_store(dbf, key, value, mode) #define DBM_FETCH(dbf, key) flatfile_fetch(dbf, key) @@ -322,7 +322,7 @@ strcat(lockfn, ".lck"); #if NFS_HACK - while((last_try = V_STAT(lockfn,&sb))==0) { + while((last_try = VCWD_STAT(lockfn,&sb))==0) { retries++; php_sleep(1); if (retries>30) break; @@ -336,7 +336,7 @@ } #else /* NFS_HACK */ - lockfd = V_OPEN((lockfn,O_RDWR|O_CREAT,0644)); + lockfd = VCWD_OPEN((lockfn,O_RDWR|O_CREAT,0644)); if (lockfd) { flock(lockfd,LOCK_EX); @@ -396,7 +396,7 @@ #if NFS_HACK if (lockfn) { - V_UNLINK(lockfn); + VCWD_UNLINK(lockfn); } #endif if (lockfn) efree(lockfn); @@ -432,10 +432,10 @@ dbf = info->dbf; #if NFS_HACK - V_UNLINK(info->lockfn); + VCWD_UNLINK(info->lockfn); #else if (info->lockfn) { - lockfd = V_OPEN((info->lockfn,O_RDWR,0644)); + lockfd = VCWD_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.5 php4/ext/dba/dba_cdb.c:1.6 --- php4/ext/dba/dba_cdb.c:1.5 Mon Jul 10 03:09:14 2000 +++ php4/ext/dba/dba_cdb.c Mon Apr 30 05:43:32 2001 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_cdb.c,v 1.5 2000/07/10 10:09:14 sas Exp $ */ +/* $Id: dba_cdb.c,v 1.6 2001/04/30 12:43:32 andi Exp $ */ #include "php.h" @@ -71,7 +71,7 @@ cdb = malloc(sizeof *cdb); memset(cdb, 0, sizeof *cdb); - cdb->fd = V_OPEN((info->path, gmode)); + cdb->fd = VCWD_OPEN((info->path, gmode)); if(cdb->fd < 0) { free(cdb); return FAILURE; Index: php4/ext/dba/dba_db2.c diff -u php4/ext/dba/dba_db2.c:1.9 php4/ext/dba/dba_db2.c:1.10 --- php4/ext/dba/dba_db2.c:1.9 Mon Jul 10 03:09:14 2000 +++ php4/ext/dba/dba_db2.c Mon Apr 30 05:43:32 2001 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_db2.c,v 1.9 2000/07/10 10:09:14 sas Exp $ */ +/* $Id: dba_db2.c,v 1.10 2001/04/30 12:43:32 andi Exp $ */ #include "php.h" @@ -61,7 +61,7 @@ type = info->mode == DBA_READER ? DB_UNKNOWN : info->mode == DBA_TRUNC ? DB_BTREE : - V_STAT(info->path, &check_stat) ? DB_BTREE : DB_UNKNOWN; + VCWD_STAT(info->path, &check_stat) ? DB_BTREE : DB_UNKNOWN; gmode = info->mode == DBA_READER ? DB_RDONLY : info->mode == DBA_CREAT ? DB_CREATE : Index: php4/ext/dba/dba_db3.c diff -u php4/ext/dba/dba_db3.c:1.8 php4/ext/dba/dba_db3.c:1.9 --- php4/ext/dba/dba_db3.c:1.8 Thu Oct 26 11:51:12 2000 +++ php4/ext/dba/dba_db3.c Mon Apr 30 05:43:32 2001 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_db3.c,v 1.8 2000/10/26 18:51:12 dbeu Exp $ */ +/* $Id: dba_db3.c,v 1.9 2001/04/30 12:43:32 andi Exp $ */ #include "php.h" @@ -63,7 +63,7 @@ type = info->mode == DBA_READER ? DB_UNKNOWN : info->mode == DBA_TRUNC ? DB_BTREE : - V_STAT(info->path, &check_stat) ? DB_BTREE : DB_UNKNOWN; + VCWD_STAT(info->path, &check_stat) ? DB_BTREE : DB_UNKNOWN; gmode = info->mode == DBA_READER ? DB_RDONLY : info->mode == DBA_CREAT ? DB_CREATE : Index: php4/ext/dba/dba_dbm.c diff -u php4/ext/dba/dba_dbm.c:1.6 php4/ext/dba/dba_dbm.c:1.7 --- php4/ext/dba/dba_dbm.c:1.6 Sat Dec 16 12:56:44 2000 +++ php4/ext/dba/dba_dbm.c Mon Apr 30 05:43:32 2001 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_dbm.c,v 1.6 2000/12/16 20:56:44 andi Exp $ */ +/* $Id: dba_dbm.c,v 1.7 2001/04/30 12:43:32 andi Exp $ */ #include "php.h" @@ -47,7 +47,7 @@ #define TRUNC_IT(extension, mode) \ snprintf(buf, MAXPATHLEN, "%s" extension, info->path); \ buf[MAXPATHLEN-1] = '\0'; \ - if((fd = V_OPEN((buf, O_CREAT | mode | O_WRONLY, filemode))) == -1) \ + if((fd = VCWD_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.36 php4/ext/dbase/dbase.c:1.37 --- php4/ext/dbase/dbase.c:1.36 Sun Feb 25 22:06:53 2001 +++ php4/ext/dbase/dbase.c Mon Apr 30 05:43:32 2001 @@ -598,7 +598,7 @@ RETURN_FALSE; } - if ((fd = V_OPEN((Z_STRVAL_P(filename), O_BINARY|O_RDWR|O_CREAT, 0644))) < 0) { + if ((fd = VCWD_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.4 php4/ext/dbase/dbf_head.c:1.5 --- php4/ext/dbase/dbf_head.c:1.4 Fri May 5 20:15:41 2000 +++ php4/ext/dbase/dbf_head.c Mon Apr 30 05:43:32 2001 @@ -227,10 +227,10 @@ dbhead_t *dbh; cp = dp; - if ((fd = V_OPEN((cp, o_flags|O_BINARY))) < 0) { + if ((fd = VCWD_OPEN((cp, o_flags|O_BINARY))) < 0) { cp = (char *)malloc(256); strcpy(cp, dp); strcat(cp, ".dbf"); - if ((fd = V_OPEN((cp, o_flags))) < 0) { + if ((fd = VCWD_OPEN((cp, o_flags))) < 0) { perror("open"); return NULL; } Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.14 php4/ext/exif/exif.c:1.15 --- php4/ext/exif/exif.c:1.14 Tue Apr 3 15:36:27 2001 +++ php4/ext/exif/exif.c Mon Apr 30 05:43:32 2001 @@ -973,7 +973,7 @@ int ret; char *tmp; - infile = V_FOPEN(FileName, "rb"); /* Unix ignores 'b', windows needs it. */ + infile = VCWD_FOPEN(FileName, "rb"); /* Unix ignores 'b', windows needs it. */ if (infile == NULL) { php_error(E_ERROR, "Unable to open '%s'", FileName); @@ -1002,7 +1002,7 @@ { /* Store file date/time. */ struct stat st; - if (V_STAT(FileName, &st) >= 0) { + if (VCWD_STAT(FileName, &st) >= 0) { ImageInfo->FileDateTime = st.st_mtime; ImageInfo->FileSize = st.st_size; } else { Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.45 php4/ext/fdf/fdf.c:1.46 --- php4/ext/fdf/fdf.c:1.45 Fri Apr 6 19:48:19 2001 +++ php4/ext/fdf/fdf.c Mon Apr 30 05:43:35 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.45 2001/04/07 02:48:19 sniper Exp $ */ +/* $Id: fdf.c,v 1.46 2001/04/30 12:43:35 andi Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -748,7 +748,7 @@ } FDFClose(theFDF); - V_UNLINK((const char *)filename); + VCWD_UNLINK((const char *)filename); efree(filename); if(name) efree(name); Index: php4/ext/filepro/filepro.c diff -u php4/ext/filepro/filepro.c:1.30 php4/ext/filepro/filepro.c:1.31 --- php4/ext/filepro/filepro.c:1.30 Sun Feb 25 22:06:55 2001 +++ php4/ext/filepro/filepro.c Mon Apr 30 05:43:35 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filepro.c,v 1.30 2001/02/26 06:06:55 andi Exp $ */ +/* $Id: filepro.c,v 1.31 2001/04/30 12:43:35 andi Exp $ */ /* filePro 4.x support developed by Chad Robinson, chadr@brttech.com @@ -214,7 +214,7 @@ RETURN_FALSE; } - if (!(fp = V_FOPEN(workbuf, "r"))) { + if (!(fp = VCWD_FOPEN(workbuf, "r"))) { php_error(E_WARNING, "filePro: cannot open map: [%d] %s", errno, strerror(errno)); RETURN_FALSE; @@ -313,7 +313,7 @@ RETURN_FALSE; } - if (!(fp = V_FOPEN(workbuf, "r"))) { + if (!(fp = VCWD_FOPEN(workbuf, "r"))) { php_error(E_WARNING, "filePro: cannot open key: [%d] %s", errno, strerror(errno)); RETURN_FALSE; @@ -538,7 +538,7 @@ RETURN_FALSE; } - if (!(fp = V_FOPEN(workbuf, "r"))) { + if (!(fp = VCWD_FOPEN(workbuf, "r"))) { php_error(E_WARNING, "filePro: cannot open key: [%d] %s", errno, strerror(errno)); fclose(fp); Index: php4/ext/ftp/php_ftp.c diff -u php4/ext/ftp/php_ftp.c:1.31 php4/ext/ftp/php_ftp.c:1.32 --- php4/ext/ftp/php_ftp.c:1.31 Wed Nov 22 14:05:02 2000 +++ php4/ext/ftp/php_ftp.c Mon Apr 30 05:43:36 2001 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.31 2000/11/22 22:05:02 sas Exp $ */ +/* $Id: php_ftp.c,v 1.32 2001/04/30 12:43:36 andi Exp $ */ #include "php.h" @@ -592,9 +592,9 @@ } #ifdef PHP_WIN32 - if ((outfp = V_FOPEN(Z_STRVAL_P(arg2), "wb")) == NULL) { + if ((outfp = VCWD_FOPEN(Z_STRVAL_P(arg2), "wb")) == NULL) { #else - if ((outfp = V_FOPEN(Z_STRVAL_P(arg2), "w")) == NULL) { + if ((outfp = VCWD_FOPEN(Z_STRVAL_P(arg2), "w")) == NULL) { #endif fclose(tmpfp); php_error(E_WARNING, "error opening %s", Z_STRVAL_P(arg2)); @@ -680,9 +680,9 @@ XTYPE(xtype, arg4); #ifdef PHP_WIN32 - if ((infp = V_FOPEN(Z_STRVAL_P(arg3), "rb")) == NULL) { + if ((infp = VCWD_FOPEN(Z_STRVAL_P(arg3), "rb")) == NULL) { #else - if ((infp = V_FOPEN(Z_STRVAL_P(arg3), "r")) == NULL) { + if ((infp = VCWD_FOPEN(Z_STRVAL_P(arg3), "r")) == NULL) { #endif php_error(E_WARNING, "error opening %s", Z_STRVAL_P(arg3)); RETURN_FALSE; Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.122 php4/ext/gd/gd.c:1.123 --- php4/ext/gd/gd.c:1.122 Fri Apr 13 05:00:12 2001 +++ php4/ext/gd/gd.c Mon Apr 30 05:43:36 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.122 2001/04/13 12:00:12 wez Exp $ */ +/* $Id: gd.c,v 1.123 2001/04/30 12:43:36 andi Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -432,7 +432,7 @@ convert_to_string_ex(file); #ifdef PHP_WIN32 - fp = V_FOPEN(Z_STRVAL_PP(file), "rb"); + fp = VCWD_FOPEN(Z_STRVAL_PP(file), "rb"); #else fp = php_fopen_wrapper(Z_STRVAL_PP(file), "r", IGNORE_PATH|IGNORE_URL_WIN, &issock, &socketd, NULL); #endif @@ -1138,7 +1138,7 @@ fn = Z_STRVAL_PP(file); #ifdef PHP_WIN32 - fp = V_FOPEN(fn, "rb"); + fp = VCWD_FOPEN(fn, "rb"); #else fp = php_fopen_wrapper(fn, "r", IGNORE_PATH|IGNORE_URL_WIN, &issock, &socketd, NULL); #endif @@ -1314,7 +1314,7 @@ RETURN_FALSE; } - fp = V_FOPEN(fn, "wb"); + fp = VCWD_FOPEN(fn, "wb"); if (!fp) { php_error(E_WARNING, "%s: unable to open '%s' for writing", get_active_function_name(), fn); RETURN_FALSE; @@ -3338,14 +3338,14 @@ } /* Open origin file */ - org = V_FOPEN(fn_org, "rb"); + org = VCWD_FOPEN(fn_org, "rb"); if (!org) { php_error (E_WARNING, "%s: unable to open '%s' for reading", get_active_function_name(), fn_org); RETURN_FALSE; } /* Open destination file */ - dest = V_FOPEN(fn_dest, "wb"); + dest = VCWD_FOPEN(fn_dest, "wb"); if (!dest) { php_error (E_WARNING, "%s: unable to open '%s' for writing", get_active_function_name(), fn_dest); RETURN_FALSE; Index: php4/ext/gd/gd_ctx.c diff -u php4/ext/gd/gd_ctx.c:1.4 php4/ext/gd/gd_ctx.c:1.5 --- php4/ext/gd/gd_ctx.c:1.4 Sat Mar 31 22:20:45 2001 +++ php4/ext/gd/gd_ctx.c Mon Apr 30 05:43:36 2001 @@ -52,7 +52,7 @@ RETURN_FALSE; } - fp = V_FOPEN(fn, "wb"); + fp = VCWD_FOPEN(fn, "wb"); if (!fp) { php_error(E_WARNING, "%s: unable to open '%s' for writing", get_active_function_name(), fn); RETURN_FALSE; Index: php4/ext/gettext/gettext.c diff -u php4/ext/gettext/gettext.c:1.25 php4/ext/gettext/gettext.c:1.26 --- php4/ext/gettext/gettext.c:1.25 Sun Feb 25 22:06:56 2001 +++ php4/ext/gettext/gettext.c Mon Apr 30 05:43:37 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gettext.c,v 1.25 2001/02/26 06:06:56 andi Exp $ */ +/* $Id: gettext.c,v 1.26 2001/04/30 12:43:37 andi Exp $ */ #include <stdio.h> #include "php.h" @@ -151,9 +151,9 @@ convert_to_string_ex(dir); if (strcmp((*dir)->value.str.val, "") && strcmp((*dir)->value.str.val, "0")) { - V_REALPATH((*dir)->value.str.val, dir_name); + VCWD_REALPATH((*dir)->value.str.val, dir_name); } else { - V_GETCWD(dir_name, MAXPATHLEN); + VCWD_GETCWD(dir_name, MAXPATHLEN); } retval = bindtextdomain((*domain_name)->value.str.val, dir_name); Index: php4/ext/ming/ming.c diff -u php4/ext/ming/ming.c:1.4 php4/ext/ming/ming.c:1.5 --- php4/ext/ming/ming.c:1.4 Thu Mar 15 16:37:34 2001 +++ php4/ext/ming/ming.c Mon Apr 30 05:43:37 2001 @@ -245,10 +245,10 @@ if(maskname != NULL) { FILE *jpeg, *mask; - if((jpeg = V_FOPEN(filename, "rb")) == NULL) + if((jpeg = VCWD_FOPEN(filename, "rb")) == NULL) php_error(E_ERROR, "Couldn't find file %s", filename); - if((mask = V_FOPEN(maskname, "rb")) == NULL) + if((mask = VCWD_FOPEN(maskname, "rb")) == NULL) php_error(E_ERROR, "Couldn't find file %s", maskname); bitmap = newSWFJpegWithAlpha(jpeg, mask); @@ -260,7 +260,7 @@ { FILE *jpeg; - if((jpeg = V_FOPEN(filename, "rb")) == NULL) + if((jpeg = VCWD_FOPEN(filename, "rb")) == NULL) php_error(E_ERROR, "Couldn't find file %s", filename); bitmap = newSWFJpegBitmap(jpeg); @@ -272,7 +272,7 @@ { FILE *dbl; - if((dbl = V_FOPEN(filename, "rb")) == NULL) + if((dbl = VCWD_FOPEN(filename, "rb")) == NULL) php_error(E_ERROR, "Couldn't find file %s", filename); bitmap = newSWFDBLBitmap(dbl); @@ -1091,7 +1091,7 @@ if(strcmp(Z_STRVAL_PP(zfile)+Z_STRLEN_PP(zfile)-4, ".fdb") == 0) { - file = V_FOPEN(Z_STRVAL_PP(zfile), "rb"); + file = VCWD_FOPEN(Z_STRVAL_PP(zfile), "rb"); if(!file) php_error(E_ERROR, "Couldn't find FDB file %s", Z_STRVAL_PP(zfile)); @@ -1522,7 +1522,7 @@ convert_to_string_ex(x); - file = V_FOPEN(Z_STRVAL_PP(x), "wb"); + file = VCWD_FOPEN(Z_STRVAL_PP(x), "wb"); if(file == NULL) php_error(E_ERROR, "couldn't open file %s for writing", Z_STRVAL_PP(x)); @@ -1624,7 +1624,7 @@ { convert_to_string_ex(zfile); - file = V_FOPEN(Z_STRVAL_PP(zfile), "rb"); + file = VCWD_FOPEN(Z_STRVAL_PP(zfile), "rb"); if(!file) php_error(E_ERROR, "Couldn't find file %s", Z_STRVAL_PP(zfile)); Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.120 php4/ext/oci8/oci8.c:1.121 --- php4/ext/oci8/oci8.c:1.120 Wed Apr 25 10:48:30 2001 +++ php4/ext/oci8/oci8.c Mon Apr 30 05:43:37 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.120 2001/04/25 17:48:30 asautins Exp $ */ +/* $Id: oci8.c,v 1.121 2001/04/30 12:43:37 andi Exp $ */ /* TODO list: * @@ -577,7 +577,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.120 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.121 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); @@ -2925,7 +2925,7 @@ filename = (*arg)->value.str.val; - if ((fp = V_OPEN((filename, O_RDONLY|O_BINARY))) == -1) { + if ((fp = VCWD_OPEN((filename, O_RDONLY|O_BINARY))) == -1) { php_error(E_WARNING, "Can't open file %s", filename); RETURN_FALSE; } @@ -3043,7 +3043,7 @@ goto bail; } - if ((fp = V_OPEN((filename,O_CREAT | O_RDWR | O_BINARY | O_TRUNC, 0600))) == -1) { + if ((fp = VCWD_OPEN((filename,O_CREAT | O_RDWR | O_BINARY | O_TRUNC, 0600))) == -1) { php_error(E_WARNING, "Can't create file %s", filename); goto bail; } Index: php4/ext/openssl/openssl.c diff -u php4/ext/openssl/openssl.c:1.13 php4/ext/openssl/openssl.c:1.14 --- php4/ext/openssl/openssl.c:1.13 Thu Apr 5 01:40:26 2001 +++ php4/ext/openssl/openssl.c Mon Apr 30 05:43:38 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.13 2001/04/05 08:40:26 wez Exp $ */ +/* $Id: openssl.c,v 1.14 2001/04/30 12:43:38 andi Exp $ */ #include "php.h" #include "php_openssl.h" @@ -778,7 +778,7 @@ convert_to_string_ex(item); - if (V_STAT(Z_STRVAL_PP(item), &sb) == -1) { + if (VCWD_STAT(Z_STRVAL_PP(item), &sb) == -1) { zend_error(E_WARNING, "%s() unable to stat %s", get_active_function_name(), Z_STRVAL_PP(item)); continue; } Index: php4/ext/posix/posix.c diff -u php4/ext/posix/posix.c:1.27 php4/ext/posix/posix.c:1.28 --- php4/ext/posix/posix.c:1.27 Thu Nov 2 15:08:05 2000 +++ php4/ext/posix/posix.c Mon Apr 30 05:43:38 2001 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.27 2000/11/02 23:08:05 andi Exp $ */ +/* $Id: posix.c,v 1.28 2001/04/30 12:43:38 andi Exp $ */ #include "php.h" @@ -138,7 +138,7 @@ static PHP_MINFO_FUNCTION(posix) { php_info_print_table_start(); - php_info_print_table_row(2, "Revision", "$Revision: 1.27 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.28 $"); php_info_print_table_end(); } @@ -632,7 +632,7 @@ char buffer[MAXPATHLEN]; char *p; - p = V_GETCWD(buffer, MAXPATHLEN); + p = VCWD_GETCWD(buffer, MAXPATHLEN); if (!p) { php_error(E_WARNING, "posix_getcwd() failed with '%s'", strerror(errno)); Index: php4/ext/session/mod_files.c diff -u php4/ext/session/mod_files.c:1.52 php4/ext/session/mod_files.c:1.53 --- php4/ext/session/mod_files.c:1.52 Tue Mar 13 08:53:34 2001 +++ php4/ext/session/mod_files.c Mon Apr 30 05:43:38 2001 @@ -139,16 +139,16 @@ data->lastkey = estrdup(key); #ifdef O_EXCL - data->fd = V_OPEN((buf, O_RDWR | O_BINARY)); + data->fd = VCWD_OPEN((buf, O_RDWR | O_BINARY)); if (data->fd == -1) { if (errno == ENOENT) { - data->fd = V_OPEN((buf, O_EXCL | O_RDWR | O_CREAT | O_BINARY, 0600)); + data->fd = VCWD_OPEN((buf, O_EXCL | O_RDWR | O_CREAT | O_BINARY, 0600)); } } else { flock(data->fd, LOCK_EX); } #else - data->fd = V_OPEN((buf, O_CREAT | O_RDWR | O_BINARY, 0600)); + data->fd = VCWD_OPEN((buf, O_CREAT | O_RDWR | O_BINARY, 0600)); if (data->fd != -1) flock(data->fd, LOCK_EX); #endif @@ -196,9 +196,9 @@ /* NUL terminate it and */ buf[dirname_len + entry_len + 1] = '\0'; /* check whether its last access was more than maxlifet ago */ - if (V_STAT(buf, &sbuf) == 0 && + if (VCWD_STAT(buf, &sbuf) == 0 && (now - sbuf.st_atime) > maxlifetime) { - V_UNLINK(buf); + VCWD_UNLINK(buf); nrdels++; } } @@ -301,7 +301,7 @@ ps_files_close(data); - if (V_UNLINK(buf) == -1) { + if (VCWD_UNLINK(buf) == -1) { return FAILURE; } Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.198 php4/ext/session/session.c:1.199 --- php4/ext/session/session.c:1.198 Wed Apr 25 19:54:27 2001 +++ php4/ext/session/session.c Mon Apr 30 05:43:38 2001 @@ -536,7 +536,7 @@ if (PS(entropy_length) > 0) { int fd; - fd = V_OPEN((PS(entropy_file), O_RDONLY)); + fd = VCWD_OPEN((PS(entropy_file), O_RDONLY)); if (fd >= 0) { char *p; int n; @@ -652,7 +652,7 @@ path = SG(request_info).path_translated; if (path) { - if (V_STAT(path, &sb) == -1) { + if (VCWD_STAT(path, &sb) == -1) { return; } Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.326 php4/ext/standard/basic_functions.c:1.327 --- php4/ext/standard/basic_functions.c:1.326 Sun Apr 29 21:06:09 2001 +++ php4/ext/standard/basic_functions.c Mon Apr 30 05:43:39 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.326 2001/04/30 04:06:09 david Exp $ */ +/* $Id: basic_functions.c,v 1.327 2001/04/30 12:43:39 andi Exp $ */ #include "php.h" #include "php_main.h" @@ -2502,11 +2502,11 @@ RETURN_FALSE; } - V_UNLINK(Z_STRVAL_PP(new_path)); + VCWD_UNLINK(Z_STRVAL_PP(new_path)); if (rename(Z_STRVAL_PP(path), Z_STRVAL_PP(new_path))==0) { successful=1; } else if (php_copy_file(Z_STRVAL_PP(path), Z_STRVAL_PP(new_path))==SUCCESS) { - V_UNLINK(Z_STRVAL_PP(path)); + VCWD_UNLINK(Z_STRVAL_PP(path)); successful=1; } @@ -2604,7 +2604,7 @@ } convert_to_string_ex(filename); - fh.handle.fp = V_FOPEN(Z_STRVAL_PP(filename), "r"); + fh.handle.fp = VCWD_FOPEN(Z_STRVAL_PP(filename), "r"); if (!fh.handle.fp) { php_error(E_WARNING,"Cannot open '%s' for reading", Z_STRVAL_PP(filename)); return; Index: php4/ext/standard/browscap.c diff -u php4/ext/standard/browscap.c:1.44 php4/ext/standard/browscap.c:1.45 --- php4/ext/standard/browscap.c:1.44 Wed Mar 14 05:38:03 2001 +++ php4/ext/standard/browscap.c Mon Apr 30 05:43:39 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: browscap.c,v 1.44 2001/03/14 13:38:03 sas Exp $ */ +/* $Id: browscap.c,v 1.45 2001/04/30 12:43:39 andi Exp $ */ #include "php.h" #include "php_regex.h" @@ -139,7 +139,7 @@ return FAILURE; } - fh.handle.fp = V_FOPEN(browscap, "r"); + fh.handle.fp = VCWD_FOPEN(browscap, "r"); if (!fh.handle.fp) { php_error(E_CORE_WARNING,"Cannot open '%s' for reading", browscap); return FAILURE; Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.64 php4/ext/standard/dir.c:1.65 --- php4/ext/standard/dir.c:1.64 Sun Apr 29 11:06:56 2001 +++ php4/ext/standard/dir.c Mon Apr 30 05:43:39 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.64 2001/04/29 18:06:56 andi Exp $ */ +/* $Id: dir.c,v 1.65 2001/04/30 12:43:39 andi Exp $ */ /* {{{ includes/startup/misc */ @@ -166,7 +166,7 @@ dirp = emalloc(sizeof(php_dir)); - dirp->dir = V_OPENDIR((*arg)->value.str.val); + dirp->dir = VCWD_OPENDIR((*arg)->value.str.val); #ifdef PHP_WIN32 if (!dirp->dir || dirp->dir->finished) { @@ -281,7 +281,7 @@ } convert_to_string_ex(arg); - ret = V_CHDIR((*arg)->value.str.val); + ret = VCWD_CHDIR((*arg)->value.str.val); if (ret != 0) { php_error(E_WARNING, "ChDir: %s (errno %d)", strerror(errno), errno); @@ -305,9 +305,9 @@ } #if HAVE_GETCWD - ret = V_GETCWD(path, MAXPATHLEN); + ret = VCWD_GETCWD(path, MAXPATHLEN); #elif HAVE_GETWD - ret = V_GETWD(path); + ret = VCWD_GETWD(path); /* * #warning is not ANSI C * #else Index: php4/ext/standard/exec.c diff -u php4/ext/standard/exec.c:1.53 php4/ext/standard/exec.c:1.54 --- php4/ext/standard/exec.c:1.53 Sat Apr 28 06:16:18 2001 +++ php4/ext/standard/exec.c Mon Apr 30 05:43:39 2001 @@ -15,7 +15,7 @@ | Author: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ -/* $Id: exec.c,v 1.53 2001/04/28 13:16:18 elixer Exp $ */ +/* $Id: exec.c,v 1.54 2001/04/30 12:43:39 andi Exp $ */ #include <stdio.h> #include "php.h" @@ -99,9 +99,9 @@ sig_handler = signal (SIGCHLD, SIG_DFL); #endif #ifdef PHP_WIN32 - fp = V_POPEN(d, "rb"); + fp = VCWD_POPEN(d, "rb"); #else - fp = V_POPEN(d, "r"); + fp = VCWD_POPEN(d, "r"); #endif if (!fp) { php_error(E_WARNING, "Unable to fork [%s]", d); @@ -117,9 +117,9 @@ sig_handler = signal (SIGCHLD, SIG_DFL); #endif #ifdef PHP_WIN32 - fp = V_POPEN(cmd, "rb"); + fp = VCWD_POPEN(cmd, "rb"); #else - fp = V_POPEN(cmd, "r"); + fp = VCWD_POPEN(cmd, "r"); #endif if (!fp) { php_error(E_WARNING, "Unable to fork [%s]", cmd); @@ -451,9 +451,9 @@ convert_to_string_ex(cmd); #ifdef PHP_WIN32 - if ((in=V_POPEN(Z_STRVAL_PP(cmd),"rt"))==NULL) { + if ((in=VCWD_POPEN(Z_STRVAL_PP(cmd),"rt"))==NULL) { #else - if ((in=V_POPEN(Z_STRVAL_PP(cmd),"r"))==NULL) { + if ((in=VCWD_POPEN(Z_STRVAL_PP(cmd),"r"))==NULL) { #endif php_error(E_WARNING,"Unable to execute '%s'",Z_STRVAL_PP(cmd)); } Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.154 php4/ext/standard/file.c:1.155 --- php4/ext/standard/file.c:1.154 Tue Apr 17 10:08:03 2001 +++ php4/ext/standard/file.c Mon Apr 30 05:43:39 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.154 2001/04/17 17:08:03 wez Exp $ */ +/* $Id: file.c,v 1.155 2001/04/30 12:43:39 andi Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -719,7 +719,7 @@ } tmp = php_escape_shell_cmd(buf); - fp = V_POPEN(tmp,p); + fp = VCWD_POPEN(tmp,p); efree(tmp); if (!fp) { @@ -727,7 +727,7 @@ RETURN_FALSE; } } else { - fp = V_POPEN((*arg1)->value.str.val, p); + fp = VCWD_POPEN((*arg1)->value.str.val, p); if (!fp) { php_error(E_WARNING,"popen(\"%s\",\"%s\") - %s",(*arg1)->value.str.val,p,strerror(errno)); efree(p); @@ -1483,7 +1483,7 @@ if (PG(safe_mode) &&(!php_checkuid((*arg1)->value.str.val, NULL, CHECKUID_ALLOW_ONLY_DIR))) { RETURN_FALSE; } - ret = V_MKDIR((*arg1)->value.str.val, mode); + ret = VCWD_MKDIR((*arg1)->value.str.val, mode); if (ret < 0) { php_error(E_WARNING,"MkDir failed (%s)", strerror(errno)); RETURN_FALSE; @@ -1508,7 +1508,7 @@ if (PG(safe_mode) &&(!php_checkuid((*arg1)->value.str.val, NULL, CHECKUID_ALLOW_FILE_NOT_EXISTS))) { RETURN_FALSE; } - ret = V_RMDIR((*arg1)->value.str.val); + ret = VCWD_RMDIR((*arg1)->value.str.val); if (ret < 0) { php_error(E_WARNING,"RmDir failed (%s)", strerror(errno)); RETURN_FALSE; @@ -1707,7 +1707,7 @@ if (PG(safe_mode) &&(!php_checkuid(old_name, NULL, CHECKUID_CHECK_FILE_AND_DIR))) { RETURN_FALSE; } - ret = V_RENAME(old_name, new_name); + ret = VCWD_RENAME(old_name, new_name); if (ret == -1) { php_error(E_WARNING,"Rename failed (%s)", strerror(errno)); @@ -1736,7 +1736,7 @@ RETURN_FALSE; } - ret = V_UNLINK((*filename)->value.str.val); + ret = VCWD_UNLINK((*filename)->value.str.val); if (ret == -1) { php_error(E_WARNING, "Unlink failed (%s)", strerror(errno)); RETURN_FALSE; @@ -1867,17 +1867,17 @@ int ret = FAILURE; #ifdef PHP_WIN32 - if ((fd_s=V_OPEN((src,O_RDONLY|_O_BINARY)))==-1) { + if ((fd_s=VCWD_OPEN((src,O_RDONLY|_O_BINARY)))==-1) { #else - if ((fd_s=V_OPEN((src,O_RDONLY)))==-1) { + if ((fd_s=VCWD_OPEN((src,O_RDONLY)))==-1) { #endif php_error(E_WARNING,"Unable to open '%s' for reading: %s", src, strerror(errno)); return FAILURE; } #ifdef PHP_WIN32 - if ((fd_t=V_OPEN((dest,_O_WRONLY|_O_CREAT|_O_TRUNC|_O_BINARY,_S_IREAD|_S_IWRITE)))==-1) { + if ((fd_t=VCWD_OPEN((dest,_O_WRONLY|_O_CREAT|_O_TRUNC|_O_BINARY,_S_IREAD|_S_IWRITE)))==-1) { #else - if ((fd_t=V_CREAT(dest,0777))==-1) { + if ((fd_t=VCWD_CREAT(dest,0777))==-1) { #endif php_error(E_WARNING,"Unable to create '%s': %s", dest, strerror(errno)); close(fd_s); @@ -2152,7 +2152,7 @@ convert_to_string_ex(path); - if (V_REALPATH((*path)->value.str.val, resolved_path_buff)) { + if (VCWD_REALPATH((*path)->value.str.val, resolved_path_buff)) { RETURN_STRING(resolved_path_buff, 1); } else { RETURN_FALSE; Index: php4/ext/standard/filestat.c diff -u php4/ext/standard/filestat.c:1.61 php4/ext/standard/filestat.c:1.62 --- php4/ext/standard/filestat.c:1.61 Tue Apr 24 23:30:24 2001 +++ php4/ext/standard/filestat.c Mon Apr 30 05:43:39 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filestat.c,v 1.61 2001/04/25 06:30:24 andi Exp $ */ +/* $Id: filestat.c,v 1.62 2001/04/30 12:43:39 andi Exp $ */ #include "php.h" #include "safe_mode.h" @@ -260,7 +260,7 @@ if (php_check_open_basedir((*filename)->value.str.val)) RETURN_FALSE; - ret = V_CHOWN((*filename)->value.str.val, -1, gid); + ret = VCWD_CHOWN((*filename)->value.str.val, -1, gid); if (ret == -1) { php_error(E_WARNING, "chgrp failed: %s", strerror(errno)); RETURN_FALSE; @@ -308,7 +308,7 @@ if (php_check_open_basedir((*filename)->value.str.val)) RETURN_FALSE; - ret = V_CHOWN((*filename)->value.str.val, uid, -1); + ret = VCWD_CHOWN((*filename)->value.str.val, uid, -1); if (ret == -1) { php_error(E_WARNING, "chown failed: %s", strerror(errno)); RETURN_FALSE; @@ -350,7 +350,7 @@ if(PG(safe_mode)) imode &= 0777; - ret = V_CHMOD((*filename)->value.str.val, imode); + ret = VCWD_CHMOD((*filename)->value.str.val, imode); if (ret == -1) { php_error(E_WARNING, "chmod failed: %s", strerror(errno)); RETURN_FALSE; @@ -409,9 +409,9 @@ } /* create the file if it doesn't exist already */ - ret = V_STAT((*filename)->value.str.val, &sb); + ret = VCWD_STAT((*filename)->value.str.val, &sb); if (ret == -1) { - file = V_FOPEN((*filename)->value.str.val, "w"); + file = VCWD_FOPEN((*filename)->value.str.val, "w"); if (file == NULL) { php_error(E_WARNING, "unable to create file %s because %s", (*filename)->value.str.val, strerror(errno)); if (newtime) efree(newtime); @@ -420,7 +420,7 @@ fclose(file); } - ret = V_UTIME((*filename)->value.str.val, newtime); + ret = VCWD_UTIME((*filename)->value.str.val, newtime); if (newtime) efree(newtime); if (ret == -1) { php_error(E_WARNING, "utime failed: %s", strerror(errno)); @@ -469,7 +469,7 @@ #if HAVE_SYMLINK BG(lsb).st_mode = 0; /* mark lstat buf invalid */ #endif - if (V_STAT(BG(CurrentStatFile), &BG(sb)) == -1) { + if (VCWD_STAT(BG(CurrentStatFile), &BG(sb)) == -1) { if (!IS_LINK_OPERATION() && (type != 15 || errno != ENOENT)) { /* fileexists() test must print no error */ php_error(E_NOTICE,"stat failed for %s (errno=%d - %s)", BG(CurrentStatFile), errno, strerror(errno)); } @@ -484,7 +484,7 @@ #if HAVE_SYMLINK if (IS_LINK_OPERATION() && !BG(lsb).st_mode) { /* do lstat if the buffer is empty */ - if (V_LSTAT(filename, &BG(lsb)) == -1) { + if (VCWD_LSTAT(filename, &BG(lsb)) == -1) { php_error(E_NOTICE, "lstat failed for %s (errno=%d - %s)", filename, errno, strerror(errno)); RETURN_FALSE; } Index: php4/ext/standard/iptc.c diff -u php4/ext/standard/iptc.c:1.26 php4/ext/standard/iptc.c:1.27 --- php4/ext/standard/iptc.c:1.26 Sun Feb 25 22:07:23 2001 +++ php4/ext/standard/iptc.c Mon Apr 30 05:43:39 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iptc.c,v 1.26 2001/02/26 06:07:23 andi Exp $ */ +/* $Id: iptc.c,v 1.27 2001/04/30 12:43:39 andi Exp $ */ /* * Functions to parse & compse IPTC data. @@ -198,7 +198,7 @@ if (php_check_open_basedir((*jpeg_file)->value.str.val)) RETURN_FALSE; - if ((fp = V_FOPEN((*jpeg_file)->value.str.val,"rb")) == 0) { + if ((fp = VCWD_FOPEN((*jpeg_file)->value.str.val,"rb")) == 0) { php_error(E_WARNING, "Unable to open %s", (*jpeg_file)->value.str.val); RETURN_FALSE; } Index: php4/ext/standard/link.c diff -u php4/ext/standard/link.c:1.28 php4/ext/standard/link.c:1.29 --- php4/ext/standard/link.c:1.28 Sun Feb 25 22:07:23 2001 +++ php4/ext/standard/link.c Mon Apr 30 05:43:39 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: link.c,v 1.28 2001/02/26 06:07:23 andi Exp $ */ +/* $Id: link.c,v 1.29 2001/04/30 12:43:39 andi Exp $ */ #include "php.h" #include "php_filestat.h" @@ -87,7 +87,7 @@ } convert_to_string_ex(filename); - ret = V_LSTAT((*filename)->value.str.val, &sb); + ret = VCWD_LSTAT((*filename)->value.str.val, &sb); if (ret == -1) { php_error(E_WARNING, "LinkInfo failed (%s)", strerror(errno)); RETURN_LONG(-1L); Index: php4/ext/swf/swf.c diff -u php4/ext/swf/swf.c:1.31 php4/ext/swf/swf.c:1.32 --- php4/ext/swf/swf.c:1.31 Sun Feb 25 22:07:24 2001 +++ php4/ext/swf/swf.c Mon Apr 30 05:43:39 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: swf.c,v 1.31 2001/02/26 06:07:24 andi Exp $ */ +/* $Id: swf.c,v 1.32 2001/04/30 12:43:39 andi Exp $ */ #include "php.h" @@ -190,7 +190,7 @@ free_na = 0; RETURN_FALSE; } - V_UNLINK((const char *)na); + VCWD_UNLINK((const char *)na); fclose(fp); free_na = 1; SWFG(use_file) = 0; @@ -236,7 +236,7 @@ char buf[4096]; int b; - if ((f = V_FOPEN(SWFG(tmpfile_name), "r")) == NULL) { + if ((f = VCWD_FOPEN(SWFG(tmpfile_name), "r")) == NULL) { php_error(E_WARNING, "Cannot create temporary file for stdout support with SWF"); RETURN_NULL(); } @@ -246,7 +246,7 @@ fclose(f); - V_UNLINK((const char *)SWFG(tmpfile_name)); + VCWD_UNLINK((const char *)SWFG(tmpfile_name)); } } /* }}} */ Index: php4/main/SAPI.c diff -u php4/main/SAPI.c:1.103 php4/main/SAPI.c:1.104 --- php4/main/SAPI.c:1.103 Fri Apr 27 09:41:53 2001 +++ php4/main/SAPI.c Mon Apr 30 05:43:40 2001 @@ -574,7 +574,7 @@ if (sapi_module.get_stat) { return sapi_module.get_stat(SLS_C); } else { - if (!SG(request_info).path_translated || (V_STAT(SG(request_info).path_translated, &SG(global_stat))==-1)) { + if (!SG(request_info).path_translated || (VCWD_STAT(SG(request_info).path_translated, &SG(global_stat))==-1)) { return NULL; } return &SG(global_stat); Index: php4/main/fopen_wrappers.c diff -u php4/main/fopen_wrappers.c:1.112 php4/main/fopen_wrappers.c:1.113 --- php4/main/fopen_wrappers.c:1.112 Mon Apr 16 16:20:47 2001 +++ php4/main/fopen_wrappers.c Mon Apr 30 05:43:40 2001 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen_wrappers.c,v 1.112 2001/04/16 23:20:47 ssb Exp $ */ +/* $Id: fopen_wrappers.c,v 1.113 2001/04/30 12:43:40 andi Exp $ */ #include "php.h" #include "php_globals.h" @@ -232,7 +232,7 @@ if (php_check_open_basedir((char *)path)) { return NULL; } - fp = V_FOPEN(path, mode); + fp = VCWD_FOPEN(path, mode); if (fp && opened_path) { *opened_path = expand_filepath(path,NULL); } @@ -336,7 +336,7 @@ SG(request_info).path_translated = NULL; return NULL; } - fp = V_FOPEN(filename, "rb"); + fp = VCWD_FOPEN(filename, "rb"); /* refuse to open anything that is not a regular file */ if (fp && (0 > fstat(fileno(fp), &st) || !S_ISREG(st.st_mode))) { @@ -349,7 +349,7 @@ return NULL; } if (!(SG(options) & SAPI_OPTION_NO_CHDIR)) { - V_CHDIR_FILE(filename); + VCWD_CHDIR_FILE(filename); } SG(request_info).path_translated = filename; @@ -406,7 +406,7 @@ } snprintf(trypath, MAXPATHLEN, "%s/%s", ptr, filename); if (PG(safe_mode)) { - if (V_STAT(trypath, &sb) == 0 && (!php_checkuid(trypath, mode, CHECKUID_CHECK_MODE_PARAM))) { + if (VCWD_STAT(trypath, &sb) == 0 && (!php_checkuid(trypath, mode, CHECKUID_CHECK_MODE_PARAM))) { efree(pathbuf); return NULL; } @@ -520,7 +520,7 @@ char cwd[MAXPATHLEN]; char *result; - result = V_GETCWD(cwd, MAXPATHLEN); + result = VCWD_GETCWD(cwd, MAXPATHLEN); if (!result) { cwd[0] = '\0'; } Index: php4/main/main.c diff -u php4/main/main.c:1.361 php4/main/main.c:1.362 --- php4/main/main.c:1.361 Sun Apr 29 05:58:50 2001 +++ php4/main/main.c Mon Apr 30 05:43:40 2001 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.361 2001/04/29 12:58:50 andi Exp $ */ +/* $Id: main.c,v 1.362 2001/04/30 12:43:40 andi Exp $ */ #include <stdio.h> @@ -267,7 +267,7 @@ return; } #endif - log_file = V_FOPEN(PG(error_log), "a"); + log_file = VCWD_FOPEN(PG(error_log), "a"); if (log_file != NULL) { time(&error_time); strftime(error_time_str, 128, "%d-%b-%Y %H:%M:%S", php_localtime_r(&error_time, &tmbuf)); @@ -1168,7 +1168,7 @@ if (setjmp(EG(bailout))!=0) { if (old_cwd[0] != '\0') - V_CHDIR(old_cwd); + VCWD_CHDIR(old_cwd); free_alloca(old_cwd); return EG(exit_status); } @@ -1181,8 +1181,8 @@ if (primary_file->type == ZEND_HANDLE_FILENAME && primary_file->filename) { - V_GETCWD(old_cwd, OLD_CWD_SIZE-1); - V_CHDIR_FILE(primary_file->filename); + VCWD_GETCWD(old_cwd, OLD_CWD_SIZE-1); + VCWD_CHDIR_FILE(primary_file->filename); } if (PG(auto_prepend_file) && PG(auto_prepend_file)[0]) { @@ -1206,7 +1206,7 @@ zend_execute_scripts(ZEND_REQUIRE CLS_CC ELS_CC, 3, prepend_file_p, primary_file, append_file_p); if (old_cwd[0] != '\0') - V_CHDIR(old_cwd); + VCWD_CHDIR(old_cwd); free_alloca(old_cwd); return EG(exit_status); Index: php4/main/php_open_temporary_file.c diff -u php4/main/php_open_temporary_file.c:1.6 php4/main/php_open_temporary_file.c:1.7 --- php4/main/php_open_temporary_file.c:1.6 Sun Feb 25 22:07:31 2001 +++ php4/main/php_open_temporary_file.c Mon Apr 30 05:43:40 2001 @@ -114,7 +114,7 @@ #ifdef PHP_WIN32 if (GetTempFileName(path, pfx, 0, opened_path)) { - fp = V_FOPEN(opened_path, "wb"); + fp = VCWD_FOPEN(opened_path, "wb"); } else { fp = NULL; } @@ -127,7 +127,7 @@ } #else if (mktemp(opened_path)) { - fp = V_FOPEN(opened_path, "wb"); + fp = VCWD_FOPEN(opened_path, "wb"); } else { fp = NULL; } Index: php4/main/rfc1867.c diff -u php4/main/rfc1867.c:1.60 php4/main/rfc1867.c:1.61 --- php4/main/rfc1867.c:1.60 Sun Feb 25 22:07:31 2001 +++ php4/main/rfc1867.c Mon Apr 30 05:43:40 2001 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf <rasmus@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: rfc1867.c,v 1.60 2001/02/26 06:07:31 andi Exp $ */ +/* $Id: rfc1867.c,v 1.61 2001/04/30 12:43:40 andi Exp $ */ #include <stdio.h> #include "php.h" @@ -85,7 +85,7 @@ static int unlink_filename(char **filename) { - V_UNLINK(*filename); + VCWD_UNLINK(*filename); return 0; } Index: php4/main/safe_mode.c diff -u php4/main/safe_mode.c:1.27 php4/main/safe_mode.c:1.28 --- php4/main/safe_mode.c:1.27 Sun Feb 25 22:07:31 2001 +++ php4/main/safe_mode.c Mon Apr 30 05:43:40 2001 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: safe_mode.c,v 1.27 2001/02/26 06:07:31 andi Exp $ */ +/* $Id: safe_mode.c,v 1.28 2001/04/30 12:43:40 andi Exp $ */ #include "php.h" @@ -70,7 +70,7 @@ } if (mode != CHECKUID_ALLOW_ONLY_DIR) { - ret = V_STAT(filename, &sb); + ret = VCWD_STAT(filename, &sb); if (ret < 0) { if (mode == CHECKUID_DISALLOW_FILE_NOT_EXISTS) { php_error(E_WARNING, "Unable to access %s", filename); @@ -98,7 +98,7 @@ if (s) { *s='\0'; - ret = V_STAT(filename, &sb); + ret = VCWD_STAT(filename, &sb); *s='/'; if (ret < 0) { php_error(E_WARNING, "Unable to access %s", filename); @@ -107,11 +107,11 @@ duid = sb.st_uid; } else { char cwd[MAXPATHLEN]; - if (!V_GETCWD(cwd, MAXPATHLEN)) { + if (!VCWD_GETCWD(cwd, MAXPATHLEN)) { php_error(E_WARNING, "Unable to access current working directory"); return 0; } - ret = V_STAT(cwd, &sb); + ret = VCWD_STAT(cwd, &sb); if (ret < 0) { php_error(E_WARNING, "Unable to access %s", cwd); return 0; Index: php4/sapi/caudium/caudium.c diff -u php4/sapi/caudium/caudium.c:1.11 php4/sapi/caudium/caudium.c:1.12 --- php4/sapi/caudium/caudium.c:1.11 Mon Apr 23 18:08:35 2001 +++ php4/sapi/caudium/caudium.c Mon Apr 30 05:43:40 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: caudium.c,v 1.11 2001/04/24 01:08:35 neotron Exp $ */ +/* $Id: caudium.c,v 1.12 2001/04/30 12:43:40 andi Exp $ */ #include "php.h" #ifdef HAVE_CAUDIUM @@ -442,7 +442,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.11 2001/04/24 01:08:35 neotron Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.12 2001/04/30 12:43:40 andi Exp $"); /* php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -640,7 +640,7 @@ * isn't. Not a problem though, since it's on by default when using ZTS * which we require. */ - V_CHDIR_FILE(THIS->filename->str); + VCWD_CHDIR_FILE(THIS->filename->str); #endif file_handle.type = ZEND_HANDLE_FILENAME; Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.101 php4/sapi/cgi/cgi_main.c:1.102 --- php4/sapi/cgi/cgi_main.c:1.101 Mon Apr 16 16:20:47 2001 +++ php4/sapi/cgi/cgi_main.c Mon Apr 30 05:43:41 2001 @@ -708,7 +708,7 @@ } if (cgi && !file_handle.handle.fp) { - file_handle.handle.fp = V_FOPEN(argv0, "rb"); + file_handle.handle.fp = VCWD_FOPEN(argv0, "rb"); if(!file_handle.handle.fp) { PUTS("No input file specified.\n"); php_request_shutdown((void *) 0); Index: php4/win32/registry.c diff -u php4/win32/registry.c:1.9 php4/win32/registry.c:1.10 --- php4/win32/registry.c:1.9 Tue Mar 20 07:44:55 2001 +++ php4/win32/registry.c Mon Apr 30 05:43:41 2001 @@ -25,7 +25,7 @@ char drive_letter; /* get current working directory and prepend it to the path */ - if (!V_GETCWD(tmp_buf, MAXPATHLEN)) { + if (!VCWD_GETCWD(tmp_buf, MAXPATHLEN)) { efree(orig_path); return; }