cvs: /php4/ext/posix posix.c /php4/ext/standard dir.c filestat.c image.c iptc.c /php4/sapi/apache mod_php4.c /php4/sapi/isapi php4isapi.c
/php4/sapi/roxen roxen.c /php4/win32 registry.c

andi Sat Apr 15 07:28:49 2000 EDT Modified files: /php4/ext/posix posix.c /php4/ext/standard dir.c filestat.c image.c iptc.c /php4/sapi/apache mod_php4.c /php4/sapi/isapi php4isapi.c /php4/sapi/roxen roxen.c /php4/win32 registry.c Log: - Change PHP_ to V_ (directory & file functions) Index: php4/ext/posix/posix.c diff -u php4/ext/posix/posix.c:1.10 php4/ext/posix/posix.c:1.11 --- php4/ext/posix/posix.c:1.10 Wed Apr 5 14:43:02 2000 +++ php4/ext/posix/posix.c Sat Apr 15 07:28:47 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.10 2000/04/05 21:43:02 cmv Exp $ */ +/* $Id: posix.c,v 1.11 2000/04/15 14:28:47 andi Exp $ */ #include "php.h" @@ -136,7 +136,7 @@ static PHP_MINFO_FUNCTION(posix) { php_info_print_table_start(); - php_info_print_table_row(2, "Revision", "$Revision: 1.10 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.11 $"); php_info_print_table_end(); } @@ -571,7 +571,7 @@ char buffer[MAXPATHLEN]; char *p; - p = PHP_GETCWD(buffer, MAXPATHLEN); + p = V_GETCWD(buffer, MAXPATHLEN); if (!p) { php_error(E_WARNING, "posix_getcwd() failed with '%s'", strerror(errno)); Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.31 php4/ext/standard/dir.c:1.32 --- php4/ext/standard/dir.c:1.31 Thu Mar 30 14:56:33 2000 +++ php4/ext/standard/dir.c Sat Apr 15 07:28:47 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.31 2000/03/30 22:56:33 andi Exp $ */ +/* $Id: dir.c,v 1.32 2000/04/15 14:28:47 andi Exp $ */ /* {{{ includes/startup/misc */ @@ -210,7 +210,7 @@ } convert_to_string_ex(arg); - ret = PHP_CHDIR((*arg)->value.str.val); + ret = V_CHDIR((*arg)->value.str.val); if (ret < 0) { php_error(E_WARNING, "ChDir: %s (errno %d)", strerror(errno), errno); @@ -234,9 +234,9 @@ } #if HAVE_GETCWD - ret = PHP_GETCWD(path,MAXPATHLEN-1); + ret = V_GETCWD(path,MAXPATHLEN-1); #elif HAVE_GETWD - ret = PHP_GETWD(path); + ret = V_GETWD(path); /* * #warning is not ANSI C * #else Index: php4/ext/standard/filestat.c diff -u php4/ext/standard/filestat.c:1.30 php4/ext/standard/filestat.c:1.31 --- php4/ext/standard/filestat.c:1.30 Thu Mar 30 14:56:33 2000 +++ php4/ext/standard/filestat.c Sat Apr 15 07:28:47 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filestat.c,v 1.30 2000/03/30 22:56:33 andi Exp $ */ +/* $Id: filestat.c,v 1.31 2000/04/15 14:28:47 andi Exp $ */ #include "php.h" #include "safe_mode.h" @@ -387,7 +387,7 @@ /* create the file if it doesn't exist already */ ret = stat((*filename)->value.str.val, &sb); if (ret == -1) { - file = PHP_FOPEN((*filename)->value.str.val, "w"); + file = V_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); Index: php4/ext/standard/image.c diff -u php4/ext/standard/image.c:1.14 php4/ext/standard/image.c:1.15 --- php4/ext/standard/image.c:1.14 Thu Mar 30 14:56:33 2000 +++ php4/ext/standard/image.c Sat Apr 15 07:28:47 2000 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.14 2000/03/30 22:56:33 andi Exp $ */ +/* $Id: image.c,v 1.15 2000/04/15 14:28:47 andi Exp $ */ /* * Based on Daniel Schmitt's imageinfo.c which carried the following * Copyright notice. @@ -338,7 +338,7 @@ /* Check open_basedir */ if (php_check_open_basedir((*arg1)->value.str.val)) return; - if ((fp = PHP_FOPEN((*arg1)->value.str.val,"rb")) == 0) { + if ((fp = V_FOPEN((*arg1)->value.str.val,"rb")) == 0) { php_error(E_WARNING, "Unable to open %s", (*arg1)->value.str.val); return; } Index: php4/ext/standard/iptc.c diff -u php4/ext/standard/iptc.c:1.20 php4/ext/standard/iptc.c:1.21 --- php4/ext/standard/iptc.c:1.20 Thu Mar 30 14:56:33 2000 +++ php4/ext/standard/iptc.c Sat Apr 15 07:28:47 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iptc.c,v 1.20 2000/03/30 22:56:33 andi Exp $ */ +/* $Id: iptc.c,v 1.21 2000/04/15 14:28:47 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 = PHP_FOPEN((*jpeg_file)->value.str.val,"rb")) == 0) { + if ((fp = V_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/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.42 php4/sapi/apache/mod_php4.c:1.43 --- php4/sapi/apache/mod_php4.c:1.42 Wed Apr 12 20:35:02 2000 +++ php4/sapi/apache/mod_php4.c Sat Apr 15 07:28:47 2000 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.42 2000/04/13 03:35:02 rasmus Exp $ */ +/* $Id: mod_php4.c,v 1.43 2000/04/15 14:28:47 andi Exp $ */ #define NO_REGEX_EXTRA_H @@ -483,7 +483,7 @@ SG(server_context) = r; php_save_umask(); - PHP_CHDIR_FILE(filename); + V_CHDIR_FILE(filename); add_common_vars(r); add_cgi_vars(r); Index: php4/sapi/isapi/php4isapi.c diff -u php4/sapi/isapi/php4isapi.c:1.37 php4/sapi/isapi/php4isapi.c:1.38 --- php4/sapi/isapi/php4isapi.c:1.37 Wed Apr 12 02:48:26 2000 +++ php4/sapi/isapi/php4isapi.c Sat Apr 15 07:28:47 2000 @@ -457,7 +457,7 @@ if (path_end) { *path_end = 0; - PHP_CHDIR(SG(request_info).path_translated); + V_CHDIR(SG(request_info).path_translated); *path_end = SEPARATOR; } } Index: php4/sapi/roxen/roxen.c diff -u php4/sapi/roxen/roxen.c:1.28 php4/sapi/roxen/roxen.c:1.29 --- php4/sapi/roxen/roxen.c:1.28 Wed Apr 12 15:59:46 2000 +++ php4/sapi/roxen/roxen.c Sat Apr 15 07:28:47 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: roxen.c,v 1.28 2000/04/12 22:59:46 neotron Exp $ */ +/* $Id: roxen.c,v 1.29 2000/04/15 14:28:47 andi Exp $ */ #include "php.h" #ifdef HAVE_ROXEN @@ -447,7 +447,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.28 2000/04/12 22:59:46 neotron Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.29 2000/04/15 14:28:47 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()); @@ -601,7 +601,7 @@ /* VERY BAD, but should work */ if(len > 0) { dir[len] = '\0'; - PHP_CHDIR(dir); + V_CHDIR(dir); } free(dir); #endif Index: php4/win32/registry.c diff -u php4/win32/registry.c:1.5 php4/win32/registry.c:1.6 --- php4/win32/registry.c:1.5 Tue Apr 4 13:06:45 2000 +++ php4/win32/registry.c Sat Apr 15 07:28:48 2000 @@ -29,7 +29,7 @@ char drive_letter; /* get current working directory and prepend it to the path */ - if (!PHP_GETCWD(tmp_buf, MAXPATHLEN)) { + if (!V_GETCWD(tmp_buf, MAXPATHLEN)) { efree(orig_path); return; }