cvs: php-src(PHP_5_3) /ext/standard/tests/file 001-win32.phpt 005_variation2-win32.phpt 005_variation2.phpt 006_error.phpt 006_variation2.phpt
007_error.phpt basename-win32.phpt basename.phpt basename_error.phpt bug41655_1.phpt chmod_variation3.phpt chmod_variation4.phpt copy_variation13.phpt
copy_variation18.phpt dirname_basic-win32.phpt dirname_basic.phpt dirname_error.phpt dirname_variation1.phpt disk.phpt disk_free_space_basic.phpt
disk_free_space_error.phpt disk_free_space_variation.phpt disk_total_space_basic.phpt disk_total_space_error.phpt disk_total_space_variation.phpt
feof_basic.phpt fflush_error.phpt fgets_error.phpt fgets_socket_variation1.phpt fgets_socket_variation2.phpt fgets_variation2.phpt file.inc
file_exists_error.phpt file_exists_variation1.phpt file_get_contents_basic.phpt file_get_contents_error.phpt file_get_contents_variation1.phpt
file_get_contents_variation2.phpt file_get_contents_variation3.phpt file_get_contents_variation4.phpt file_get_! contents_variation5.phpt
file_get_contents_variation6.phpt file_get_contents_variation7-win32.phpt file_get_contents_variation7.phpt file_get_contents_variation8-win32.phpt
file_get_contents_variation8.phpt file_get_contents_variation9.phpt file_put_contents_variation1.phpt file_put_contents_variation2.phpt
file_put_contents_variation3.phpt file_put_contents_variation4.phpt file_put_contents_variation5.phpt file_put_contents_variation6.phpt
file_put_contents_variation7-win32.phpt file_put_contents_variation7.phpt file_put_contents_variation8-win32.phpt file_put_contents_variation8.phpt
file_put_contents_variation9.phpt file_variation8-win32.phpt file_variation8.phpt file_variation9.phpt filegroup_variation1.phpt
filegroup_variation2.phpt filegroup_variation3.phpt fileinode_variation1.phpt fileinode_variation2.phpt fileinode_variation3.phpt
fileowner_variation1.phpt fileowner_variation2.phpt fileowner_variation3.phpt fileperms_variation1.phpt fileperms_variation2.phpt filepe!
rms_variation3.phpt filesize_variation1.phpt filesize_variation5.phpt filetype_variation2.phpt flock_error.phpt flock_variation.phpt
flock_variation1.phpt fopen_include_path.inc fopen_variation10-win32.phpt fopen_variation11-win32.phpt fopen_variation12.phpt fopen_variation13.phpt
fopen_variation14-win32.phpt fopen_variation
| From: | Ant Phillips | Date: | Wed, 26 Nov 2008 10:10:21 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/standard/tests/file 001-win32.phpt 005_variation2-win32.phpt 005_variation2.phpt 006_error.phpt 006_variation2.phpt 007_error.phpt basename-win32.phpt basename.phpt basename_error.phpt bug41655_1.phpt chmod_variation3.phpt chmod_variation4.phpt copy_variation13.phpt copy_variation18.phpt dirname_basic-win32.phpt dirname_basic.phpt dirname_error.phpt dirname_variation1.phpt disk.phpt disk_free_space_basic.phpt disk_free_space_error.phpt disk_free_space_variation.phpt disk_total_space_basic.phpt disk_total_space_error.phpt disk_total_space_variation.phpt feof_basic.phpt fflush_error.phpt fgets_error.phpt fgets_socket_variation1.phpt fgets_socket_variation2.phpt fgets_variation2.phpt file.inc file_exists_error.phpt file_exists_variation1.phpt file_get_contents_basic.phpt file_get_contents_error.phpt file_get_contents_variation1.phpt file_get_contents_variation2.phpt file_get_contents_variation3.phpt file_get_contents_variation4.phpt file_get_! contents_variation5.phpt file_get_contents_variation6.phpt file_get_contents_variation7-win32.phpt file_get_contents_variation7.phpt file_get_contents_variation8-win32.phpt file_get_contents_variation8.phpt file_get_contents_variation9.phpt file_put_contents_variation1.phpt file_put_contents_variation2.phpt file_put_contents_variation3.phpt file_put_contents_variation4.phpt file_put_contents_variation5.phpt file_put_contents_variation6.phpt file_put_contents_variation7-win32.phpt file_put_contents_variation7.phpt file_put_contents_variation8-win32.phpt file_put_contents_variation8.phpt file_put_contents_variation9.phpt file_variation8-win32.phpt file_variation8.phpt file_variation9.phpt filegroup_variation1.phpt filegroup_variation2.phpt filegroup_variation3.phpt fileinode_variation1.phpt fileinode_variation2.phpt fileinode_variation3.phpt fileowner_variation1.phpt fileowner_variation2.phpt fileowner_variation3.phpt fileperms_variation1.phpt fileperms_variation2.phpt filepe! rms_variation3.phpt filesize_variation1.phpt filesize_variation5.phpt filetype_variation2.phpt flock_error.phpt flock_variation.phpt flock_variation1.phpt fopen_include_path.inc fopen_variation10-win32.phpt fopen_variation11-win32.phpt fopen_variation12.phpt fopen_variation13.phpt fopen_variation14-win32.phpt fopen_variation |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-54487@lists.php.net to get a copy of this message | ||
ant Wed Nov 26 10:10:21 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/file
file_put_contents_variation7-win32.phpt
fopen_variation19.phpt
unlink_variation8.phpt
basename-win32.phpt
file_get_contents_variation7.phpt
mkdir_variation4.phpt
fpassthru_variation1.phpt
feof_basic.phpt
fopen_variation13.phpt
unlink_variation7.phpt
file_get_contents_variation3.phpt
fopen_variation6.phpt
fopen_variation15-win32.phpt
file_get_contents_variation2.phpt
pclose_variation1.phpt
file_exists_error.phpt
chmod_variation4.phpt
file_put_contents_variation1.phpt
unlink_variation6.phpt
basename_error.phpt
unlink_variation8-win32.phpt
readfile_variation6.phpt
fopen_variation5.phpt
file_get_contents_basic.phpt
glob_error_002-win32.phpt
touch_variation3-win32.phpt
fopen_variation11-win32.phpt
mkdir_variation5-win32.phpt
rmdir_variation2.phpt
fileowner_variation1.phpt
fileperms_variation3.phpt
file_put_contents_variation7.phpt
parse_ini_file_variation1.phpt
mkdir_variation3.phpt
fopen_variation16.phpt
parse_ini_file_variation5.phpt
readfile_variation5.phpt
rename_variation13.phpt
readfile_variation10-win32.phpt
filegroup_variation2.phpt
readfile_variation8-win32.phpt
005_variation2.phpt
pathinfo_basic1.phpt
filegroup_variation1.phpt
unlink_variation9-win32.phpt
rename_variation11-win32.phpt
dirname_basic.phpt
touch_variation1.phpt
file_get_contents_variation8.phpt
fgets_socket_variation2.phpt
file_get_contents_variation6.phpt
fopen_variation12.phpt
mkdir_variation1.phpt
readfile_variation7.phpt
fopen_variation14.phpt
touch_variation4.phpt
rmdir_variation1.phpt
readfile_variation4.phpt
fwrite_variation5.phpt
is_uploaded_file_basic.phpt
rename_variation13-win32.phpt
mkdir_variation5.phpt
fileinode_variation1.phpt
tempnam_variation8-win32.phpt
file_exists_variation1.phpt
touch_basic-win32.phpt
move_uploaded_file_basic.phpt
readlink_variation1.phpt
parse_ini_file_variation6-win32.phpt
file_get_contents_error.phpt
parse_ini_file_variation4.phpt
file_variation9.phpt
fileinode_variation3.phpt
file_get_contents_variation4.phpt
pathinfo_variation2.phpt
fileperms_variation1.phpt
flock_variation1.phpt
file_put_contents_variation8.phpt
basename.phpt
touch_variation5.phpt
005_variation2-win32.phpt
fileowner_variation3.phpt
realpath_variation2.phpt
file_put_contents_variation2.phpt
parse_ini_file_variation2.phpt
rename_variation12.phpt
file_get_contents_variation1.phpt
pathinfo_variation1.phpt
rmdir_variation3-win32.phpt
file_put_contents_variation5.phpt
fopen_variation8.phpt
filetype_variation2.phpt
fopen_include_path.inc
file_variation8-win32.phpt
mkdir_variation2.phpt
touch_variation6-win32.phpt
chmod_variation3.phpt
file_put_contents_variation9.phpt
fopen_variation7.phpt
file_put_contents_variation8-win32.phpt
fgets_socket_variation1.phpt
file_put_contents_variation3.phpt
rmdir_variation1-win32.phpt
file_put_contents_variation6.phpt
file_put_contents_variation4.phpt
mkdir_variation1-win32.phpt
touch_basic.phpt
fileowner_variation2.phpt
file_get_contents_variation8-win32.phpt
fileinode_variation2.phpt
fopen_variation4.phpt
file_get_contents_variation9.phpt
fopen_variation15.phpt
dirname_error.phpt
pathinfo_basic1-win32.phpt
touch_variation3.phpt
umask_variation3.phpt
fread_fwrite_basic.phpt
fopen_variation10-win32.phpt
fseek_variation2.phpt
touch_variation5-win32.phpt
pathinfo_variation3.phpt
fopen_variation17.phpt
unlink_variation10.phpt
fopen_variation9.phpt
fopen_variation14-win32.phpt
fseek_variation1.phpt
rmdir_variation3.phpt
touch_variation2.phpt
touch_error.phpt
filesize_variation5.phpt
glob_error_002.phpt
tempnam_variation5-win32.phpt
fseek_variation3.phpt
parse_ini_file_variation3.phpt
parse_ini_file_variation6.phpt
lstat_stat_variation22.phpt
filegroup_variation3.phpt
pathinfo_basic2-win32.phpt
dirname_basic-win32.phpt
fopen_variation3.phpt
fileperms_variation2.phpt
touch_variation4-win32.phpt
readfile_variation9.phpt
file_get_contents_variation5.phpt
pathinfo_basic2.phpt
file_get_contents_variation7-win32.phpt
tempnam_variation6-win32.phpt
file_variation8.phpt
rename_variation10.phpt
dirname_variation1.phpt
readfile_variation10.phpt
Modified files:
/php-src/ext/standard/tests/file disk_free_space_variation.phpt
tempnam_variation1.phpt
tempnam_variation1-win32.phpt
lstat_stat_variation2.phpt
tempnam_variation3-win32.phpt
file.inc
fseek_ftell_rewind_error2.phpt
tempnam_variation7-win32.phpt
disk.phpt
tempnam_variation2-win32.phpt
flock_error.phpt
tempnam_variation7.phpt
disk_total_space_basic.phpt
fread_error.phpt
is_readable_variation1.phpt
copy_variation13.phpt
symlink_link_linkinfo_is_link_error2.phpt
bug41655_1.phpt
tempnam_variation2.phpt
fseek_ftell_rewind_error3.phpt
fpassthru_error.phpt
readlink_realpath_basic2.phpt
readlink_realpath_basic1.phpt
tempnam_variation6.phpt
disk_total_space_variation.phpt
007_error.phpt
copy_variation18.phpt
is_readable_variation3.phpt
touch.phpt tempnam_variation5.phpt
ftruncate_error.phpt
disk_free_space_basic.phpt
popen_pclose_error-sunos.phpt
is_dir_variation3.phpt
fwrite_error.phpt
tempnam_variation3.phpt
fgets_error.phpt fflush_error.phpt
is_writable_variation3.phpt
fseek_dir_basic.phpt
filesize_variation1.phpt
is_file_variation4.phpt
fseek_ftell_rewind_error1.phpt
fgets_variation2.phpt
is_dir_variation2.phpt
disk_free_space_error.phpt
is_executable_variation3.phpt
006_variation2.phpt
flock_variation.phpt
tempnam_variation4.phpt
is_writable_variation1.phpt
001-win32.phpt
disk_total_space_error.phpt
006_error.phpt glob_basic.phpt
is_file_variation3.phpt
Log:
File system tests: checked on PHP 5.3 (Windows, Linux and Linux 64 bit).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk_free_space_variation.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/disk_free_space_variation.phpt diff -u php-src/ext/standard/tests/file/disk_free_space_variation.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/disk_free_space_variation.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/disk_free_space_variation.phpt:1.1.2.2.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/disk_free_space_variation.phpt Wed Nov 26 10:10:16 2008 @@ -1,5 +1,5 @@ --TEST-- -Test disk_free_space and its alias diskfreespace() functions : Usage Variations +Test disk_free_space and its alias diskfreespace() functions : usage variations --FILE-- <?php /* @@ -11,15 +11,16 @@ $file_path = dirname(__FILE__); -echo "*** Testing with a directory ***\n"; +echo "*** Testing disk_free_space() function with a directory ***\n"; var_dump( disk_free_space($file_path."/..") ); var_dump( diskfreespace($file_path."/..") ); -echo "\nTesting for the return type ***\n"; +echo "\n*** Testing for the return type ***\n"; $return_value = disk_free_space($file_path); var_dump( is_float($return_value) ); -echo "\n*** Testing with different directory combinations ***"; +echo "\n*** Testing disk_free_space() function with different styles of file and directory ***"; + $dir = "/disk_free_space"; mkdir($file_path.$dir); @@ -41,15 +42,15 @@ $file_path.$dir.chr(0), $file_path."/.".$dir.chr(0), ".".chr(0).$file_path.$dir, - ".".chr(0).$file_path.$dir.chr(0) + ".".chr(0).$file_path.$dir.chr(0) ); $count = 1; /* loop through to test each element the above array */ -foreach($dirs_arr as $dir1) { +foreach($dirs_arr as $dir) { echo "\n-- Iteration $count --\n"; - var_dump( disk_free_space( $dir1 ) ); - var_dump( diskfreespace( $dir1 ) ); + var_dump( disk_free_space( $dir ) ); + var_dump( diskfreespace( $dir ) ); $count++; } @@ -58,66 +59,65 @@ --CLEAN-- <?php -$file_path = dirname(__FILE__); -rmdir($file_path."/disk_free_space"); +$file_path = dirname(__FILE__)."/disk_free_space"; +rmdir($file_path); ?> - --EXPECTF-- -*** Testing with a directory *** -float(%d) -float(%d) +*** Testing disk_free_space() function with a directory *** +float(%f) +float(%f) -Testing for the return type *** +*** Testing for the return type *** bool(true) -*** Testing with different directory combinations *** +*** Testing disk_free_space() function with different styles of file and directory *** -- Iteration 1 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 2 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 3 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 4 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 5 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 6 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 7 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 8 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 9 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 10 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 11 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 12 -- -float(%d) -float(%d) +float(%f) +float(%f) --- Done --- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation1.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation1.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation1.phpt:1.1.2.2 php-src/ext/standard/tests/file/tempnam_variation1.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/file/tempnam_variation1.phpt:1.1.2.2 Fri Aug 10 12:11:46 2007 +++ php-src/ext/standard/tests/file/tempnam_variation1.phpt Wed Nov 26 10:10:16 2008 @@ -13,7 +13,8 @@ /* Creating number of unique files by passing a file name as prefix */ -$file_path = dirname(__FILE__); +$file_path = dirname(__FILE__)."/tempnamVar1"; +mkdir($file_path); echo "*** Testing tempnam() in creation of unique files ***\n"; for($i=1; $i<=10; $i++) { @@ -34,6 +35,19 @@ echo "File inode is => "; print_r( fileinode($files[$i]) ); //checking inodes echo "\n"; + + echo "File created in => "; + $file_dir = dirname($files[$i]); + + if ($file_dir == sys_get_temp_dir()) { + echo "temp dir\n"; + } + else if ($file_dir == $file_path) { + echo "directory specified\n"; + } + else { + echo "unknown location\n"; + } clearstatcache(); } else { @@ -44,48 +58,59 @@ unlink($files[$i]); } +rmdir($file_path); echo "*** Done ***\n"; ?> --EXPECTF-- *** Testing tempnam() in creation of unique files *** -- Iteration 1 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 2 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 3 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 4 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 5 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 6 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 7 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 8 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 9 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 10 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation1-win32.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation1-win32.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation1-win32.phpt:1.1.2.2 php-src/ext/standard/tests/file/tempnam_variation1-win32.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/file/tempnam_variation1-win32.phpt:1.1.2.2 Fri Aug 10 12:11:46 2007 +++ php-src/ext/standard/tests/file/tempnam_variation1-win32.phpt Wed Nov 26 10:10:16 2008 @@ -3,7 +3,7 @@ --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") - die("skip Run only on Windows"); + die("skip Only valid for Windows"); ?> --FILE-- <?php @@ -13,7 +13,8 @@ /* Creating number of unique files by passing a file name as prefix */ -$file_path = dirname(__FILE__); +$file_path = dirname(__FILE__)."/tempnamVar1"; +mkdir($file_path); echo "*** Testing tempnam() in creation of unique files ***\n"; for($i=1; $i<=10; $i++) { @@ -31,6 +32,19 @@ echo "\n"; clearstatcache(); + echo "File created in => "; + $file_dir = dirname($files[$i]); + + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { + echo "temp dir\n"; + } + else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { + echo "directory specified\n"; + } + else { + echo "unknown location\n"; + } + clearstatcache(); } else { print("- File is not created -"); @@ -39,39 +53,51 @@ for($i=1; $i<=10; $i++) { unlink($files[$i]); } +rmdir($file_path); + echo "*** Done ***\n"; ?> --EXPECTF-- *** Testing tempnam() in creation of unique files *** -- Iteration 1 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 2 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 3 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 4 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 5 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 6 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 7 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 8 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 9 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 10 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lstat_stat_variation2.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/lstat_stat_variation2.phpt diff -u php-src/ext/standard/tests/file/lstat_stat_variation2.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/lstat_stat_variation2.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/lstat_stat_variation2.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/lstat_stat_variation2.phpt Wed Nov 26 10:10:16 2008 @@ -21,13 +21,12 @@ require("file.inc"); /* create temp directory */ -@rmdir("$file_path/lstat_stat_variation2/"); //ensure that dir doesn't exists -mkdir("$file_path/lstat_stat_variation2/"); // temp dir +mkdir("$file_path/lstat_stat_variation1/"); // temp dir // renaming a directory and check stat echo "*** Testing stat() for directory after being renamed ***\n"; -$old_dirname = "$file_path/lstat_stat_variation2"; -$new_dirname = "$file_path/lstat_stat_variation2a"; +$old_dirname = "$file_path/lstat_stat_variation1"; +$new_dirname = "$file_path/lstat_stat_variation1a"; $old_stat = stat($old_dirname); clearstatcache(); var_dump( rename($old_dirname, $new_dirname) ); @@ -37,8 +36,11 @@ var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); -// compare the two stats -var_dump( compare_stats($old_stat, $new_stat, $all_stat_keys) ); +// compare the two stats - all except ctime +$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, + "dev", "ino", "mode", "nlink", "uid", "gid", + "rdev", "size", "atime", "mtime", "blksize", "blocks"); +var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) ); // clear the cache clearstatcache(); @@ -48,7 +50,7 @@ --CLEAN-- <?php $file_path = dirname(__FILE__); -rmdir("$file_path/lstat_stat_variation2a"); +rmdir("$file_path/lstat_stat_variation1a"); ?> --EXPECTF-- *** Testing stat() for directory after being renamed *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation3-win32.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation3-win32.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation3-win32.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/tempnam_variation3-win32.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/tempnam_variation3-win32.phpt:1.1.2.2.2.1 Sun Aug 17 11:04:16 2008 +++ php-src/ext/standard/tests/file/tempnam_variation3-win32.phpt Wed Nov 26 10:10:16 2008 @@ -1,9 +1,9 @@ --TEST-- -Test tempnam() function: usage variations - invalid/non-existing file +Test tempnam() function: usage variations - obscure prefixes --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") - die("skip Run only on Windows"); + die("skip run only on Windows"); ?> --FILE-- <?php @@ -13,10 +13,11 @@ /* Passing invalid/non-existing args for $prefix */ -echo "*** Testing tempnam() with invalid/non-existing file names ***\n"; -$file_path = dirname(__FILE__); +echo "*** Testing tempnam() with obscure prefixes ***\n"; +$file_path = dirname(__FILE__)."/tempnamVar3"; +mkdir($file_path); -/* An array of names, which will be passed as a file name */ +/* An array of prefixes */ $names_arr = array( /* Invalid args */ -1, @@ -25,16 +26,16 @@ NULL, "", " ", - "/0", + "\0", array(), - /* Non-existing dirs */ + /* prefix with path separator of a non existing directory*/ "/no/such/file/dir", - "php" + "php/php" ); -for( $i=1; $i<count($names_arr); $i++ ) { +for( $i=0; $i<count($names_arr); $i++ ) { echo "-- Iteration $i --\n"; $file_name = tempnam("$file_path", $names_arr[$i]); @@ -47,46 +48,73 @@ echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; + + echo "File created in => "; + $file_dir = dirname($file_name); + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { + echo "temp dir\n"; + } + else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { + echo "directory specified\n"; + } + else { + echo "unknown location\n"; + } } - else + else { echo "-- File is not created --\n"; + } unlink($file_name); } +rmdir($file_path); echo "\n*** Done ***\n"; ?> --EXPECTF-- -*** Testing tempnam() with invalid/non-existing file names *** +*** Testing tempnam() with obscure prefixes *** +-- Iteration 0 -- +File name is => %s\%s +File permissions are => 100666 +File created in => directory specified -- Iteration 1 -- -File name is => %s +File name is => %s\%s File permissions are => 100666 +File created in => directory specified -- Iteration 2 -- -File name is => %s +File name is => %s\%s File permissions are => 100666 +File created in => directory specified -- Iteration 3 -- -File name is => %s +File name is => %s\%s File permissions are => 100666 +File created in => directory specified -- Iteration 4 -- -File name is => %s +File name is => %s\%s File permissions are => 100666 +File created in => directory specified -- Iteration 5 -- -File name is => %s +File name is => %s\%s File permissions are => 100666 +File created in => directory specified -- Iteration 6 -- -File name is => %s +File name is => %s\%s File permissions are => 100666 +File created in => directory specified -- Iteration 7 -- Warning: tempnam() expects parameter 2 to be string, array given in %s on line %d -- File is not created -- -Warning: unlink(): %s in %s on line %d +Warning: unlink(): No such file or directory in %s on line %d -- Iteration 8 -- -File name is => %s +File name is => %s\di%s File permissions are => 100666 +File created in => directory specified -- Iteration 9 -- -File name is => %s +File name is => %s\ph%s File permissions are => 100666 +File created in => directory specified *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file.inc?r1=1.1.2.6.2.2&r2=1.1.2.6.2.3&diff_format=u Index: php-src/ext/standard/tests/file/file.inc diff -u php-src/ext/standard/tests/file/file.inc:1.1.2.6.2.2 php-src/ext/standard/tests/file/file.inc:1.1.2.6.2.3 --- php-src/ext/standard/tests/file/file.inc:1.1.2.6.2.2 Sun Aug 17 14:32:41 2008 +++ php-src/ext/standard/tests/file/file.inc Wed Nov 26 10:10:16 2008 @@ -7,7 +7,7 @@ delete_links() : delete links fill_files() : fill file with specified contents change_file_perms() : Change permission of files - fill_buffer() : fill buffer with specified contents + fill_buffer() : fills buffer with specified contents compare_self_stat() : compares the first 13 elements of the stat with the corresponding named key values of the same stat. @@ -80,7 +80,7 @@ } /* - Function : bool fill_file(resource $file_handle, string $fill_type, int $file_size); + Function : bool fill_file(resource $file_handle, string $fill_type, string $file_size); Description: Fills the file with data as specified with requested size. $file_handle = file handle, opened with write options, $fill_type: @@ -638,8 +638,6 @@ // if the result is false(i.e values are not as expected), // dump the stat array so that easy to figure out the error if ( $result == false ) { - echo "\n Dumping diff between stat array 1 and 2...\n"; - var_dump(array_diff($stat1, $stat2)); echo "\n Dumping stat array 1...\n"; var_dump($stat1); echo "\n Dumping stat array 2...\n"; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt diff -u php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt:1.1.2.2.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt Wed Nov 26 10:10:16 2008 @@ -87,9 +87,10 @@ Warning: ftell() expects parameter 1 to be resource, object given in %s on line %d bool(false) -- Testing ftell with closed/unset file handle -- -Warning: ftell(): 5 is not a valid stream resource in %s on line %d +Warning: ftell(): %d is not a valid stream resource in %s on line %d bool(false) Warning: ftell() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt:1.1.2.2.2.1 Fri Aug 15 16:51:23 2008 +++ php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt Wed Nov 26 10:10:16 2008 @@ -3,7 +3,7 @@ --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") - die("skip Run only on Windows"); + die("skip Only run on Windows"); ?> --FILE-- <?php @@ -15,8 +15,6 @@ hence the unique files will be created in temporary dir */ echo "*** Testing tempnam() with invalid/non-existing directory names ***\n"; -$file_path = dirname(__FILE__); - /* An array of names, which will be passed as a dir name */ $names_arr = array( /* Invalid args */ @@ -26,7 +24,7 @@ NULL, "", " ", - "/0", + "\0", array(), /* Non-existing dirs */ @@ -35,7 +33,7 @@ ); -for( $i=1; $i<count($names_arr); $i++ ) { +for( $i=0; $i<count($names_arr); $i++ ) { echo "-- Iteration $i --\n"; $file_name = tempnam($names_arr[$i], "tempnam_variation3.tmp"); @@ -48,9 +46,19 @@ echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; + + echo "File created in => "; + $file_dir = dirname($file_name); + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { + echo "temp dir\n"; + } + else { + echo "unknown location\n"; + } } - else + else { echo "-- File is not created --\n"; + } unlink($file_name); } @@ -59,24 +67,34 @@ ?> --EXPECTF-- *** Testing tempnam() with invalid/non-existing directory names *** +-- Iteration 0 -- +File name is => %s%et%s +File permissions are => 100666 +File created in => temp dir -- Iteration 1 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir -- Iteration 2 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir -- Iteration 3 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir -- Iteration 4 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir -- Iteration 5 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir -- Iteration 6 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir -- Iteration 7 -- Warning: tempnam() expects parameter 1 to be string, array given in %s on line %d @@ -84,10 +102,13 @@ Warning: unlink(): No such file or directory in %s on line %d -- Iteration 8 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir -- Iteration 9 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk.phpt?r1=1.1.2.4&r2=1.1.2.4.2.1&diff_format=u Index: php-src/ext/standard/tests/file/disk.phpt diff -u php-src/ext/standard/tests/file/disk.phpt:1.1.2.4 php-src/ext/standard/tests/file/disk.phpt:1.1.2.4.2.1 --- php-src/ext/standard/tests/file/disk.phpt:1.1.2.4 Thu Apr 26 23:30:00 2007 +++ php-src/ext/standard/tests/file/disk.phpt Wed Nov 26 10:10:16 2008 @@ -37,8 +37,8 @@ Warning: disk_total_space(): No such file or directory in %s on line %d bool(false) -float(%d) -float(%d) +float(%f) +float(%f) Warning: disk_free_space(): No such file or directory in %s on line %d bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation2-win32.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation2-win32.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation2-win32.phpt:1.1.2.2 php-src/ext/standard/tests/file/tempnam_variation2-win32.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/file/tempnam_variation2-win32.phpt:1.1.2.2 Fri Aug 10 12:11:46 2007 +++ php-src/ext/standard/tests/file/tempnam_variation2-win32.phpt Wed Nov 26 10:10:16 2008 @@ -1,9 +1,9 @@ --TEST-- -Test tempnam() function: usage variations - relative paths +Test tempnam() function: usage variations - various absolute and relative paths --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") - die("skip Run only on Windows"); + die("skip Only valid for Windows"); ?> --FILE-- <?php @@ -13,7 +13,7 @@ /* Creating unique files in various dirs by passing relative paths to $dir arg */ -echo "*** Testing tempnam() with relative paths ***\n"; +echo "*** Testing tempnam() with absolute and relative paths ***\n"; $dir_name = dirname(__FILE__)."/tempnam_variation2"; mkdir($dir_name); $dir_path = $dir_name."/tempnam_variation2_sub"; @@ -23,14 +23,24 @@ chdir(dirname(__FILE__)); $dir_paths = array( + // absolute paths "$dir_path", "$dir_path/", "$dir_path/..", "$dir_path//../", "$dir_path/../.././tempnam_variation2", "$dir_path/..///tempnam_variation2_sub//..//../tempnam_variation2", + "$dir_path/BADDIR", + + + // relative paths ".", - "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub" + "tempname_variation2", + "tempname_variation2/", + "tempnam_variation2/tempnam_variation2_sub", + "tempnam_variation2//tempnam_variation2_sub", + "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub", + "BADDIR", ); for($i = 0; $i<count($dir_paths); $i++) { @@ -47,10 +57,28 @@ echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; + + echo "File created in => "; + $file_dir = dirname($file_name); + $dir_req = $dir_paths[$i]; + + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { + echo "temp dir\n"; + } + else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { + echo "directory specified\n"; + } + else { + echo "unknown location\n"; + } + + } - else + else { echo "-- File is not created --"; - unlink($file_name); + } + + unlink($file_name); } chdir($old_dir_path); @@ -60,38 +88,76 @@ echo "\n*** Done ***\n"; ?> --EXPECTF-- -*** Testing tempnam() with relative paths *** +*** Testing tempnam() with absolute and relative paths *** -- Iteration 1 -- -File name is => %s +File name is => %s\tempnam_variation2\tempnam_variation2_sub\t%s File permissions are => 100666 +File created in => directory specified -- Iteration 2 -- -File name is => %s +File name is => %s\tempnam_variation2\tempnam_variation2_sub\t%s File permissions are => 100666 +File created in => directory specified -- Iteration 3 -- -File name is => %s +File name is => %s\tempnam_variation2\t%s File permissions are => 100666 +File created in => directory specified -- Iteration 4 -- -File name is => %s +File name is => %s\tempnam_variation2\t%s File permissions are => 100666 +File created in => directory specified -- Iteration 5 -- -File name is => %s +File name is => %s\tempnam_variation2\t%s File permissions are => 100666 +File created in => directory specified -- Iteration 6 -- -File name is => %s +File name is => %s\tempnam_variation2\t%s File permissions are => 100666 +File created in => directory specified -- Iteration 7 -- -File name is => %s +File name is => %s\t%s File permissions are => 100666 +File created in => temp dir -- Iteration 8 -- -File name is => %s +File name is => %s\t%s +File permissions are => 100666 +File created in => directory specified + +-- Iteration 9 -- +File name is => %s\t%s +File permissions are => 100666 +File created in => temp dir + +-- Iteration 10 -- +File name is => %s\t%s +File permissions are => 100666 +File created in => temp dir + +-- Iteration 11 -- +File name is => %s\tempnam_variation2\tempnam_variation2_sub\t%s +File permissions are => 100666 +File created in => directory specified + +-- Iteration 12 -- +File name is => %s\tempnam_variation2\tempnam_variation2_sub\t%s +File permissions are => 100666 +File created in => directory specified + +-- Iteration 13 -- +File name is => %s\tempnam_variation2\tempnam_variation2_sub\t%s +File permissions are => 100666 +File created in => directory specified + +-- Iteration 14 -- +File name is => %s\t%s File permissions are => 100666 +File created in => temp dir -*** Done *** +*** Done *** \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/flock_error.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/file/flock_error.phpt diff -u php-src/ext/standard/tests/file/flock_error.phpt:1.1.2.1 php-src/ext/standard/tests/file/flock_error.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/file/flock_error.phpt:1.1.2.1 Fri May 25 13:44:23 2007 +++ php-src/ext/standard/tests/file/flock_error.phpt Wed Nov 26 10:10:16 2008 @@ -94,7 +94,7 @@ Warning: flock() expects parameter 2 to be long, string given in %s on line %d NULL -Warning: flock(): 6 is not a valid stream resource in %s on line %d +Warning: flock(): %d is not a valid stream resource in %s on line %d bool(false) Warning: flock() expects parameter 1 to be resource, string given in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation7.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation7.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation7.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/tempnam_variation7.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/tempnam_variation7.phpt:1.1.2.2.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/tempnam_variation7.phpt Wed Nov 26 10:10:17 2008 @@ -3,7 +3,7 @@ --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == "WIN") - die("skip DO not run on Windows"); + die("skip Do not run on Windows"); ?> --FILE-- <?php @@ -15,8 +15,6 @@ hence the unique files will be created in temporary dir */ echo "*** Testing tempnam() with invalid/non-existing directory names ***\n"; -$file_path = dirname(__FILE__); - /* An array of names, which will be passed as a dir name */ $names_arr = array( /* Invalid args */ @@ -26,7 +24,7 @@ NULL, "", " ", - "/0", + "\0", array(), /* Non-existing dirs */ @@ -35,7 +33,7 @@ ); -for( $i=1; $i<count($names_arr); $i++ ) { +for( $i=0; $i<count($names_arr); $i++ ) { echo "-- Iteration $i --\n"; $file_name = tempnam($names_arr[$i], "tempnam_variation3.tmp"); @@ -48,9 +46,21 @@ echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; + + echo "File created in => "; + $file_dir = dirname($file_name); + + if (realpath($file_dir) == realpath(sys_get_temp_dir())) { + echo "temp dir\n"; + } + else { + echo "unknown location\n"; + } + } - else + else { echo "-- File is not created --\n"; + } unlink($file_name); } @@ -59,24 +69,34 @@ ?> --EXPECTF-- *** Testing tempnam() with invalid/non-existing directory names *** +-- Iteration 0 -- +File name is => %s%etempnam_variation3.tmp%s +File permissions are => 100600 +File created in => temp dir -- Iteration 1 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 2 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 3 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 4 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 5 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 6 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 7 -- Warning: tempnam() expects parameter 1 to be string, array given in %s on line %d @@ -84,10 +104,13 @@ Warning: unlink(): No such file or directory in %s on line %d -- Iteration 8 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 9 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk_total_space_basic.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/disk_total_space_basic.phpt diff -u php-src/ext/standard/tests/file/disk_total_space_basic.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/disk_total_space_basic.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/disk_total_space_basic.phpt:1.1.2.2.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/disk_total_space_basic.phpt Wed Nov 26 10:10:17 2008 @@ -4,31 +4,31 @@ <?php /* * Prototype: float disk_total_space( string $directory ); - * Description: given a string containing a directory, this function will - * return the total number of bytes on the corresponding filesyatem - * or disk partition. + * Description: given a string containing a directory, this + * function will return the total number of bytes + * on the corresponding filesyatem or disk partition. */ $file_path = dirname(__FILE__); -echo "*** Testing with normal directory ***\n"; +echo "*** Testing with existing directory ***\n"; var_dump( disk_total_space($file_path) ); echo "*** Testing with newly created directory ***\n"; -$dir = "/disk_total_space"; +mkdir($file_path."/disk_total_space"); +var_dump( disk_total_space($file_path."/disk_total_space") ); -mkdir($file_path.$dir); -var_dump( disk_total_space($file_path.$dir) ); -$fh = fopen($file_path.$dir."/disk_total_space.tmp", "w"); -fwrite($fh, (binary)"Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data"); +$fh = fopen($file_path."/disk_total_space/disk_total_space.tmp", "w"); +fwrite($fh, "Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data"); fclose($fh); -echo"\nTotal Space after writing to a file\n"; -var_dump( disk_total_space($file_path.$dir) ); +echo" \n Total Space after writing to a file\n"; +var_dump( disk_total_space($file_path."/disk_total_space") ); -echo"\n-- Done --"; +echo"\n--- Done ---"; ?> + --CLEAN-- <?php $file_path = dirname(__FILE__); @@ -37,12 +37,12 @@ ?> --EXPECTF-- -*** Testing with normal directory *** -float(%d) +*** Testing with existing directory *** +float(%f) *** Testing with newly created directory *** -float(%d) - -Total Space after writing to a file -float(%d) +float(%f) + + Total Space after writing to a file +float(%f) --- Done -- +--- Done --- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fread_error.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fread_error.phpt diff -u php-src/ext/standard/tests/file/fread_error.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/fread_error.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/fread_error.phpt:1.1.2.1.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fread_error.phpt Wed Nov 26 10:10:17 2008 @@ -103,7 +103,7 @@ Notice: Undefined variable: file_content_type in %s on line %d -Warning: fread(): 5 is not a valid stream resource in %s on line %d +Warning: fread(): %d is not a valid stream resource in %s on line %d bool(false) Warning: fread() expects parameter 1 to be resource, null given in %s on line %d @@ -112,3 +112,4 @@ Warning: fclose() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_readable_variation1.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/is_readable_variation1.phpt diff -u php-src/ext/standard/tests/file/is_readable_variation1.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/is_readable_variation1.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/is_readable_variation1.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/is_readable_variation1.phpt Wed Nov 26 10:10:17 2008 @@ -2,8 +2,16 @@ Test is_readable() function: usage variations - diff. file notations --SKIPIF-- <?php -if (substr(PHP_OS, 0, 3) == 'WIN') { - die('skip not for windows'); +if (substr(PHP_OS, 0, 3) != 'WIN') { + // Skip if being run by root (files are always readable, writeable and executable) + $filename = dirname(__FILE__)."/is_readable_root_check.tmp"; + $fp = fopen($filename, 'w'); + fclose($fp); + if(fileowner($filename) == 0) { + unlink ($filename); + die('skip cannot be run as root'); + } + unlink($filename); } ?> --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation13.phpt?r1=1.1.2.2.2.2&r2=1.1.2.2.2.3&diff_format=u Index: php-src/ext/standard/tests/file/copy_variation13.phpt diff -u php-src/ext/standard/tests/file/copy_variation13.phpt:1.1.2.2.2.2 php-src/ext/standard/tests/file/copy_variation13.phpt:1.1.2.2.2.3 --- php-src/ext/standard/tests/file/copy_variation13.phpt:1.1.2.2.2.2 Mon Aug 11 11:52:10 2008 +++ php-src/ext/standard/tests/file/copy_variation13.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,5 @@ --TEST-- -Test copy() function: usage variations - src as dir and dest as an existing file (Bug #42243) +Test copy() function: usage variations - src as dir and dest as an existing file(Bug #42243) --FILE-- <?php /* Prototype: bool copy ( string $source, string $dest ); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt?r1=1.1.2.2.2.2&r2=1.1.2.2.2.3&diff_format=u Index: php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt diff -u php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt:1.1.2.2.2.2 php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt:1.1.2.2.2.3 --- php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt:1.1.2.2.2.2 Tue Nov 6 17:11:57 2007 +++ php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt Wed Nov 26 10:10:17 2008 @@ -5,7 +5,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip no symlinks on Windows'); } -if (PHP_INT_SIZE != 4 ) { +if (PHP_INT_SIZE != 4) { die("skip this test is for 32bit platform only"); } ?> @@ -42,6 +42,7 @@ //invalid arguments var_dump( link(NULL, $linkname) ); // NULL as filename var_dump( link('', $linkname) ); // empty string as filename +var_dump( link(' ', $linkname) ); // space as filename var_dump( link(false, $linkname) ); // boolean false as filename var_dump( link($filename, NULL) ); // NULL as linkname var_dump( link($filename, '') ); // '' as linkname @@ -57,6 +58,7 @@ //invalid arguments var_dump( is_link(NULL) ); // NULL as linkname var_dump( is_link('') ); // empty string as linkname +var_dump( is_link(' ') ); // space as linkname var_dump( is_link(false) ); // boolean false as linkname var_dump( is_link($filename) ); // file given to is_link @@ -75,22 +77,25 @@ Warning: link() expects exactly 2 parameters, 3 given in %s on line %d NULL -Warning: link(): %s in %s on line %d +Warning: link(): No such file or directory in %s on line %d bool(false) -Warning: link(): %s in %s on line %d +Warning: link(): No such file or directory in %s on line %d bool(false) -Warning: link(): %s in %s on line %d +Warning: link(): No such file or directory in %s on line %d bool(false) -Warning: link(): %s in %s on line %d +Warning: link(): No such file or directory in %s on line %d bool(false) -Warning: link(): %s in %s on line %d +Warning: link(): No such file or directory in %s on line %d bool(false) -Warning: link(): %s in %s on line %d +Warning: link(): No such file or directory in %s on line %d +bool(false) + +Warning: link(): No such file or directory in %s on line %d bool(false) *** Testing is_link() for error conditions *** @@ -104,4 +109,6 @@ bool(false) bool(false) bool(false) +bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41655_1.phpt?r1=1.1.4.7&r2=1.1.4.7.2.1&diff_format=u Index: php-src/ext/standard/tests/file/bug41655_1.phpt diff -u php-src/ext/standard/tests/file/bug41655_1.phpt:1.1.4.7 php-src/ext/standard/tests/file/bug41655_1.phpt:1.1.4.7.2.1 --- php-src/ext/standard/tests/file/bug41655_1.phpt:1.1.4.7 Thu Sep 20 13:49:33 2007 +++ php-src/ext/standard/tests/file/bug41655_1.phpt Wed Nov 26 10:10:17 2008 @@ -1,12 +1,15 @@ --TEST-- Bug #41655 (open_basedir bypass via glob()) 1/2 +--CREDITS-- +Dave Kelsey <d_kelsey@uk.ibm.com> --INI-- open_basedir=/tmp --FILE-- <?php - $a=glob("./*.jpeg"); - +$a=glob("./*.jpeg"); +var_dump($a); echo "Done\n"; ?> --EXPECT-- +bool(false) Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation2.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation2.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation2.phpt:1.1.2.2 php-src/ext/standard/tests/file/tempnam_variation2.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/file/tempnam_variation2.phpt:1.1.2.2 Fri Aug 10 12:11:46 2007 +++ php-src/ext/standard/tests/file/tempnam_variation2.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - relative paths +Test tempnam() function: usage variations - various absolute and relative paths --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == "WIN") @@ -13,7 +13,7 @@ /* Creating unique files in various dirs by passing relative paths to $dir arg */ -echo "*** Testing tempnam() with relative paths ***\n"; +echo "*** Testing tempnam() with absolute and relative paths ***\n"; $dir_name = dirname(__FILE__)."/tempnam_variation2"; mkdir($dir_name); $dir_path = $dir_name."/tempnam_variation2_sub"; @@ -23,14 +23,24 @@ chdir(dirname(__FILE__)); $dir_paths = array( + // absolute paths "$dir_path", "$dir_path/", "$dir_path/..", "$dir_path//../", "$dir_path/../.././tempnam_variation2", "$dir_path/..///tempnam_variation2_sub//..//../tempnam_variation2", + "$dir_path/BADDIR", + + + // relative paths ".", - "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub" + "tempname_variation2", + "tempname_variation2/", + "tempnam_variation2/tempnam_variation2_sub", + "tempnam_variation2//tempnam_variation2_sub", + "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub", + "BADDIR", ); for($i = 0; $i<count($dir_paths); $i++) { @@ -47,10 +57,28 @@ echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; + + echo "File created in => "; + $file_dir = dirname($file_name); + $dir_req = $dir_paths[$i]; + + if (realpath($file_dir) == realpath(sys_get_temp_dir())) { + echo "temp dir\n"; + } + else if ($file_dir == realpath($dir_req)) { + echo "directory specified\n"; + } + else { + echo "unknown location\n"; + } + + } - else + else { echo "-- File is not created --"; - unlink($file_name); + } + + unlink($file_name); } chdir($old_dir_path); @@ -60,38 +88,76 @@ echo "\n*** Done ***\n"; ?> --EXPECTF-- -*** Testing tempnam() with relative paths *** +*** Testing tempnam() with absolute and relative paths *** -- Iteration 1 -- -File name is => %s +File name is => %s/tempnam_variation2/tempnam_variation2_sub/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => directory specified -- Iteration 2 -- -File name is => %s +File name is => %s/tempnam_variation2/tempnam_variation2_sub/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => directory specified -- Iteration 3 -- -File name is => %s +File name is => %s/tempnam_variation2/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => directory specified -- Iteration 4 -- -File name is => %s +File name is => %s/tempnam_variation2/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => directory specified -- Iteration 5 -- -File name is => %s +File name is => %s/tempnam_variation2/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => directory specified -- Iteration 6 -- -File name is => %s +File name is => %s/tempnam_variation2/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => directory specified -- Iteration 7 -- -File name is => %s +File name is => %s/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 8 -- -File name is => %s +File name is => %s/tempnam_variation2.tmp%s +File permissions are => 100600 +File created in => directory specified + +-- Iteration 9 -- +File name is => %s/tempnam_variation2.tmp%s +File permissions are => 100600 +File created in => temp dir + +-- Iteration 10 -- +File name is => %s/tempnam_variation2.tmp%s +File permissions are => 100600 +File created in => temp dir + +-- Iteration 11 -- +File name is => %s/tempnam_variation2/tempnam_variation2_sub/tempnam_variation2.tmp%s +File permissions are => 100600 +File created in => directory specified + +-- Iteration 12 -- +File name is => %s/tempnam_variation2/tempnam_variation2_sub/tempnam_variation2.tmp%s +File permissions are => 100600 +File created in => directory specified + +-- Iteration 13 -- +File name is => %s/tempnam_variation2/tempnam_variation2_sub/tempnam_variation2.tmp%s +File permissions are => 100600 +File created in => directory specified + +-- Iteration 14 -- +File name is => %s/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => temp dir -*** Done *** +*** Done *** \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt diff -u php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt:1.1.2.2.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt Wed Nov 26 10:10:17 2008 @@ -87,9 +87,10 @@ Warning: rewind() expects parameter 1 to be resource, object given in %s on line %d bool(false) -- Testing rewind() with closed/unset file handle -- -Warning: rewind(): 5 is not a valid stream resource in %s on line %d +Warning: rewind(): %d is not a valid stream resource in %s on line %d bool(false) Warning: rewind() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fpassthru_error.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fpassthru_error.phpt diff -u php-src/ext/standard/tests/file/fpassthru_error.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/fpassthru_error.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/fpassthru_error.phpt:1.1.2.1.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fpassthru_error.phpt Wed Nov 26 10:10:17 2008 @@ -20,6 +20,11 @@ /* No.of args greaer than expected */ var_dump( fpassthru("", "") ); +/* fpassthru on a closed file */ +$h = fopen(__FILE__,'r'); +fclose($h); +fpassthru($h); + echo "\n*** Done ***\n"; ?> @@ -37,4 +42,7 @@ Warning: fpassthru() expects exactly 1 parameter, 2 given in %s on line %d bool(false) +Warning: fpassthru(): 5 is not a valid stream resource in %s on line %d + *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_basic2.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/file/readlink_realpath_basic2.phpt diff -u php-src/ext/standard/tests/file/readlink_realpath_basic2.phpt:1.1.2.1 php-src/ext/standard/tests/file/readlink_realpath_basic2.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/file/readlink_realpath_basic2.phpt:1.1.2.1 Mon Jul 9 17:38:33 2007 +++ php-src/ext/standard/tests/file/readlink_realpath_basic2.phpt Wed Nov 26 10:10:17 2008 @@ -34,9 +34,6 @@ "$file_path/readlink_realpath_basic2//home/test//../test/./readlink_realpath_basic2.tmp", "$file_path/readlink_realpath_basic2/home//../././readlink_realpath_basic2.tmp", - // checking for binary safe - b"$file_path/readlink_realpath_basic2/home/readlink_realpath_basic2.tmp", - /* filenames with invalid path */ "$file_path///readlink_realpath_basic2/home//..//././test//readlink_realpath_basic2.tmp", "$file_path/readlink_realpath_basic2/home/../home/../test/../readlink_realpath_basic2.tmp", @@ -79,14 +76,11 @@ string(%d) "%s/readlink_realpath_basic2/readlink_realpath_basic2.tmp" -- Iteration 5 -- -string(%d) "%s/readlink_realpath_basic2/home/readlink_realpath_basic2.tmp" +bool(false) -- Iteration 6 -- bool(false) -- Iteration 7 -- -bool(false) - --- Iteration 8 -- %s Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt diff -u php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt:1.1.2.2 php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt:1.1.2.2 Wed Sep 12 09:47:35 2007 +++ php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt Wed Nov 26 10:10:17 2008 @@ -39,9 +39,6 @@ "$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1_link.tmp", "$file_path/readlink_realpath_basic1//home/test//../test/./readlink_realpath_basic1_link.tmp", - // checking for binary safe - b"$file_path/readlink_realpath_basic1/home/readlink_realpath_basic1_link.tmp", - /* linknames with invalid linkpath */ "$file_path///readlink_realpath_basic1/home//..//././test//readlink_realpath_basic1_link.tmp", "$file_path/readlink_realpath_basic1/home/../home/../test/../readlink_realpath_basic1_link.tmp", @@ -89,28 +86,24 @@ string(%d) "%s/readlink_realpath_basic1/home/test/readlink_realpath_basic1.tmp" -- Iteration 4 -- -string(%d) "%s/readlink_realpath_basic1/home/readlink_realpath_basic1.tmp" -string(%d) "%s/readlink_realpath_basic1/home/readlink_realpath_basic1.tmp" - --- Iteration 5 -- Warning: readlink(): No such file or directory in %s on line %d bool(false) bool(false) --- Iteration 6 -- +-- Iteration 5 -- Warning: readlink(): No such file or directory in %s on line %d bool(false) bool(false) --- Iteration 7 -- +-- Iteration 6 -- Warning: readlink(): No such file or directory in %s on line %d bool(false) %s --- Iteration 8 -- +-- Iteration 7 -- Warning: readlink(): %s in %s on line %d bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation6.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation6.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation6.phpt:1.1.2.1 php-src/ext/standard/tests/file/tempnam_variation6.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/file/tempnam_variation6.phpt:1.1.2.1 Thu Aug 9 03:34:00 2007 +++ php-src/ext/standard/tests/file/tempnam_variation6.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,10 @@ --TEST-- -Test tempnam() function: usage variations - Using previous unique filename +Test tempnam() function: usage variations - Using previous unique filename +--SKIPIF-- +<?php +if(substr(PHP_OS, 0, 3) == "WIN") + die("skip Do not run on Windows"); +?> --FILE-- <?php /* Prototype: string tempnam ( string $dir, string $prefix ); @@ -20,7 +25,20 @@ echo "File name is => "; print($file_name); echo "\n"; - } + + echo "File created in => "; + $file_dir = dirname($file_name); + + if ($file_dir == sys_get_temp_dir()) { + echo "temp dir\n"; + } + else if ($file_dir == $file_path) { + echo "directory specified\n"; + } + else { + echo "unknown location\n"; + } + } unlink($file_name); } @@ -30,10 +48,13 @@ --EXPECTF-- *** Test tempnam(): by passing previously created filenames *** -- Iteration 1 -- -File name is => %s +File name is => %s%etempnam_variation6.tmp%s +File created in => directory specified -- Iteration 2 -- -File name is => %s +File name is => %s%etempnam_variation6.tmp%s +File created in => directory specified -- Iteration 3 -- -File name is => %s +File name is => %s%etempnam_variation6.tmp%s +File created in => directory specified *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk_total_space_variation.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/disk_total_space_variation.phpt diff -u php-src/ext/standard/tests/file/disk_total_space_variation.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/disk_total_space_variation.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/disk_total_space_variation.phpt:1.1.2.2.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/disk_total_space_variation.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,5 @@ --TEST-- -Testing disk_total_space() functions : Usage Variations. +Test disk_total_space() functions : usage variations --FILE-- <?php /* @@ -18,9 +18,9 @@ $return_value = disk_total_space($file_path); var_dump( is_float($return_value) ); -echo "\n*** Testing with different directory combinations ***"; -$dir = "/disk_total_space"; +echo "\n*** Testing disk_total_space() function with different directory combinations ***"; +$dir = "/disk_total_space"; mkdir($file_path.$dir); $dirs_arr = array( @@ -29,7 +29,7 @@ $file_path."/.".$dir, /* Testing a file trailing slash */ - $file_path."".$dir."/", + $file_path.$dir."/", $file_path."/.".$dir."/", /* Testing file with double trailing slashes */ @@ -44,7 +44,6 @@ ".".chr(0).$file_path.$dir.chr(0) ); - $count = 1; /* loop through to test each element the above array */ foreach($dirs_arr as $dir1) { @@ -53,63 +52,57 @@ $count++; } -echo "*** Testing with Binary Input ***\n"; -var_dump( disk_total_space(b"$file_path") ); - echo"\n--- Done ---"; ?> --CLEAN-- <?php $file_path = dirname(__FILE__); -rmdir($file_path."/disk_total_space"); +$dir = "/disk_total_space"; +rmdir($file_path.$dir); ?> - - --EXPECTF-- *** Testing with a directory *** -float(%d) +float(%f) Testing for the return type *** bool(true) -*** Testing with different directory combinations *** +*** Testing disk_total_space() function with different directory combinations *** -- Iteration 1 -- -float(%d) +float(%f) -- Iteration 2 -- -float(%d) +float(%f) -- Iteration 3 -- -float(%d) +float(%f) -- Iteration 4 -- -float(%d) +float(%f) -- Iteration 5 -- -float(%d) +float(%f) -- Iteration 6 -- -float(%d) +float(%f) -- Iteration 7 -- -float(%d) +float(%f) -- Iteration 8 -- -float(%d) +float(%f) -- Iteration 9 -- -float(%d) +float(%f) -- Iteration 10 -- -float(%d) +float(%f) -- Iteration 11 -- -float(%d) +float(%f) -- Iteration 12 -- -float(%d) -*** Testing with Binary Input *** -float(%d) +float(%f) --- Done --- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/007_error.phpt?r1=1.1.2.1.2.2&r2=1.1.2.1.2.3&diff_format=u Index: php-src/ext/standard/tests/file/007_error.phpt diff -u php-src/ext/standard/tests/file/007_error.phpt:1.1.2.1.2.2 php-src/ext/standard/tests/file/007_error.phpt:1.1.2.1.2.3 --- php-src/ext/standard/tests/file/007_error.phpt:1.1.2.1.2.2 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/007_error.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,7 @@ --TEST-- Test fopen, fclose() & feof() functions: error conditions +--CREDITS-- +Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* @@ -44,7 +46,6 @@ fclose($fp); /* test invalid arguments : non-resources */ -chdir(dirname(__FILE__)); echo "-- Testing fopen(), fclose() & feof() with invalid arguments --\n"; $invalid_args = array ( "string", @@ -78,7 +79,7 @@ Warning: fclose(): 5 is not a valid stream resource in %s on line %d bool(false) -Warning: fclose() expects parameter 1 to be resource, string given %s on line %d +Warning: fclose() expects parameter 1 to be resource, string given in %s on line %d bool(false) Warning: fclose() expects exactly 1 parameter, 0 given in %s on line %d @@ -87,7 +88,7 @@ Warning: feof(): 5 is not a valid stream resource in %s on line %d bool(false) -Warning: feof() expects parameter 1 to be resource, string given %s on line %d +Warning: feof() expects parameter 1 to be resource, string given in %s on line %d bool(false) Warning: feof() expects exactly 1 parameter, 0 given in %s on line %d @@ -178,3 +179,4 @@ Warning: feof() expects parameter 1 to be resource, string given in %s on line %d bool(false) + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation18.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/copy_variation18.phpt diff -u php-src/ext/standard/tests/file/copy_variation18.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/copy_variation18.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/copy_variation18.phpt:1.1.2.1.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/copy_variation18.phpt Wed Nov 26 10:10:17 2008 @@ -16,7 +16,7 @@ echo "*** Test copy() function: stat of file before and after copy ***\n"; $src_file_name = $file_path."/copy_variation18.tmp"; $file_handle = fopen($src_file_name, "w"); -fwrite($file_handle, str_repeat(b"Hello2world...\n", 100)); +fwrite($file_handle, str_repeat("Hello2world...\n", 100)); fclose($file_handle); $dest_file_name = $file_path."/copy_copy_variation18.tmp"; @@ -32,8 +32,13 @@ $stat_after_copy = stat($src_file_name); clearstatcache(); +// compare all stat fields except access time +$stat_keys_to_compare = array("dev", "ino", "mode", "nlink", "uid", "gid", + "rdev", "size", "mtime", "ctime", + "blksize", "blocks"); + echo "Comparing the stats of file before and after copy operation => "; -var_dump( compare_stats($stat_before_copy, $stat_after_copy, $all_stat_keys) ); +var_dump( compare_stats($stat_before_copy, $stat_after_copy, $stat_keys_to_compare) ); echo "*** Done ***\n"; ?> @@ -43,6 +48,7 @@ unlink(dirname(__FILE__)."/copy_copy_variation18.tmp"); unlink(dirname(__FILE__)."/copy_variation18.tmp"); ?> + --EXPECTF-- *** Test copy() function: stat of file before and after copy *** Copy operation => bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_readable_variation3.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/is_readable_variation3.phpt diff -u php-src/ext/standard/tests/file/is_readable_variation3.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/is_readable_variation3.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/is_readable_variation3.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/is_readable_variation3.phpt Wed Nov 26 10:10:17 2008 @@ -2,8 +2,17 @@ Test is_readable() function: usage variations - invalid file names --SKIPIF-- <?php -if (substr(PHP_OS, 0, 3) == 'WIN') { - die('skip not for windows'); +if (substr(PHP_OS, 0, 3) != 'WIN') { + + // Skip if being run by root (files are always readable, writeable and executable) + $filename = dirname(__FILE__)."/is_readable_root_check.tmp"; + $fp = fopen($filename, 'w'); + fclose($fp); + if(fileowner($filename) == 0) { + unlink ($filename); + die('skip cannot be run as root'); + } + unlink($filename); } ?> --FILE-- @@ -27,6 +36,7 @@ TRUE, FALSE, NULL, + " ", @array(), @$file_handle ); @@ -49,8 +59,10 @@ bool(false) bool(false) bool(false) +bool(false) Warning: is_readable() expects parameter 1 to be string, array given in %s on line %d NULL bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch.phpt?r1=1.1.2.3.2.4&r2=1.1.2.3.2.5&diff_format=u Index: php-src/ext/standard/tests/file/touch.phpt diff -u php-src/ext/standard/tests/file/touch.phpt:1.1.2.3.2.4 php-src/ext/standard/tests/file/touch.phpt:1.1.2.3.2.5 --- php-src/ext/standard/tests/file/touch.phpt:1.1.2.3.2.4 Mon Aug 18 09:21:15 2008 +++ php-src/ext/standard/tests/file/touch.phpt Wed Nov 26 10:10:17 2008 @@ -1,8 +1,16 @@ --TEST-- touch() tests +--SKIPIF-- +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. only for Non Windows.'); +} +?> --FILE-- <?php +// This doesn't work for windows, time, atime usage results in very different +// output to linux. This could be a php.net bug on windows or a windows querk. $filename = dirname(__FILE__)."/touch.dat"; var_dump(touch()); @@ -44,6 +52,7 @@ bool(true) int(100) -Warning: touch(): Unable to create file /no/such/file/or/directory because No such file or directory in %s on line %d +Warning: touch(): Unable to create file /no/such/file/or/directory because %s in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation5.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation5.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation5.phpt:1.1.2.1 php-src/ext/standard/tests/file/tempnam_variation5.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/file/tempnam_variation5.phpt:1.1.2.1 Thu Aug 9 03:34:00 2007 +++ php-src/ext/standard/tests/file/tempnam_variation5.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,10 @@ --TEST-- Test tempnam() function: usage variations - existing file +--SKIPIF-- +<?php +if(substr(PHP_OS, 0, 3) == "WIN") + die("skip Do not run on Windows"); +?> --FILE-- <?php /* Prototype: string tempnam ( string $dir, string $prefix ); @@ -13,7 +18,7 @@ echo "*** Test tempnam() function: by passing an existing filename as prefix ***\n"; $dir_name = $file_path."/tempnam_variation6"; mkdir($dir_name); -fopen($dir_name."/tempnam_variation6.tmp", "w"); +$h = fopen($dir_name."/tempnam_variation6.tmp", "w"); for($i=1; $i<=3; $i++) { echo "-- Iteration $i --\n"; @@ -29,6 +34,7 @@ unlink($created_file); } +fclose($h); unlink($dir_name."/tempnam_variation6.tmp"); rmdir($dir_name); @@ -37,10 +43,10 @@ --EXPECTF-- *** Test tempnam() function: by passing an existing filename as prefix *** -- Iteration 1 -- -File name is => %s +File name is => %stempnam_variation6%etempnam_variation6.tmp%s -- Iteration 2 -- -File name is => %s +File name is => %stempnam_variation6%etempnam_variation6.tmp%s -- Iteration 3 -- -File name is => %s +File name is => %stempnam_variation6%etempnam_variation6.tmp%s *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/ftruncate_error.phpt?r1=1.1.2.2.2.2&r2=1.1.2.2.2.3&diff_format=u Index: php-src/ext/standard/tests/file/ftruncate_error.phpt diff -u php-src/ext/standard/tests/file/ftruncate_error.phpt:1.1.2.2.2.2 php-src/ext/standard/tests/file/ftruncate_error.phpt:1.1.2.2.2.3 --- php-src/ext/standard/tests/file/ftruncate_error.phpt:1.1.2.2.2.2 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/ftruncate_error.phpt Wed Nov 26 10:10:17 2008 @@ -11,7 +11,7 @@ $filename = dirname(__FILE__)."/ftruncate_error.tmp"; $file_handle = fopen($filename, "w" ); -fwrite($file_handle, (binary)"Testing ftruncate error conditions \n"); +fwrite($file_handle, "Testing ftruncate error conditions \n"); fflush($file_handle); echo "\n Initial file size = ".filesize($filename)."\n"; @@ -23,12 +23,14 @@ // arguments less than expected numbers var_dump( ftruncate( $file_handle ) ); // check the first size +clearstatcache(); var_dump( filesize($filename) ); echo "-- Testing ftruncate() with more than expected number of arguments --\n"; // more than expected number of arguments var_dump( ftruncate($file_handle, 10, 20) ); -// check the first size +// check the first size +clearstatcache(); var_dump( filesize($filename) ); // test invalid arguments : non-resources @@ -53,14 +55,16 @@ // ftruncate on close file handle fclose($file_handle); var_dump( ftruncate($file_handle,10) ); -// check the first size +// check the first size +clearstatcache(); var_dump( filesize($filename) ); // ftruncate on a file handle which is unset $fp = fopen($filename, "w"); unset($fp); //unset file handle var_dump( ftruncate(@$fp,10)); -// check the first size +// check the first size +clearstatcache(); var_dump( filesize($filename) ); echo "Done\n"; @@ -114,11 +118,12 @@ bool(false) -- Testing ftruncate() with closed/unset file handle -- -Warning: ftruncate(): 5 is not a valid stream resource in %s on line %d +Warning: ftruncate(): %d is not a valid stream resource in %s on line %d bool(false) int(36) Warning: ftruncate() expects parameter 1 to be resource, null given in %s on line %d bool(false) -int(36) +int(0) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk_free_space_basic.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/disk_free_space_basic.phpt diff -u php-src/ext/standard/tests/file/disk_free_space_basic.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/disk_free_space_basic.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/disk_free_space_basic.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/disk_free_space_basic.phpt Wed Nov 26 10:10:17 2008 @@ -7,27 +7,26 @@ /* * Prototype: float disk_free_space( string directory ) * Description: Given a string containing a directory, this function - * will return the number of bytes available on the corresponding - * filesystem or disk partition + * will return the number of bytes available on the corresponding + * filesystem or disk partition */ $file_path = dirname(__FILE__); +include($file_path."/file.inc"); echo "*** Testing with existing directory ***\n"; var_dump( disk_free_space($file_path) ); var_dump( diskfreespace($file_path) ); +$dir = "/disk_free_space"; echo "*** Testing with newly created directory ***\n"; -$dir = "/disk_free_space"; mkdir($file_path.$dir); echo" \n Free Space before writing to a file\n"; $space1 = disk_free_space($file_path.$dir); -var_dump( $space1 ); +var_dump($space1); -$fh = fopen($file_path.$dir."/disk_free_space.tmp", "a"); -for( $i=1; $i<=1000; $i++) -fwrite($fh, (binary)"x"); -fclose($fh); +fill_buffer($buffer, "text", 3000000); +file_put_contents($file_path.$dir."/disk_free_space.tmp", $buffer); echo "\n Free Space after writing to a file\n"; $space2 = disk_free_space($file_path.$dir); @@ -38,33 +37,29 @@ else echo "\n Free Space Value Is Incorrect\n"; -echo "*** Testing with Binary Input ***\n"; -var_dump( disk_free_space(b"$file_path") ); - -echo"\n--- Done ---"; +echo"\n-- Done --"; ?> --CLEAN-- <?php $file_path = dirname(__FILE__); -unlink($file_path."/disk_free_space/disk_free_space.tmp"); -rmdir($file_path."/disk_free_space"); +$dir = "/disk_free_space"; +unlink($file_path.$dir."/disk_free_space.tmp"); +rmdir($file_path.$dir); ?> --EXPECTF-- *** Testing with existing directory *** -float(%d) -float(%d) +float(%f) +float(%f) *** Testing with newly created directory *** Free Space before writing to a file -float(%d) +float(%f) Free Space after writing to a file -float(%d) +float(%f) Free Space Value Is Correct -*** Testing with Binary Input *** -float(%d) ---- Done --- +-- Done -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt diff -u php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt Wed Nov 26 10:10:17 2008 @@ -2,8 +2,8 @@ Test popen() and pclose function: error conditions --SKIPIF-- <?php -if(substr(PHP_OS, 0, 3) != 'Sun' ) - die("skip Only Valid for Sun Solaris"); +if( substr(PHP_OS, 0, 3) != 'Sun') + die("skip Only valid for Sun Solaris"); ?> --FILE-- @@ -35,13 +35,13 @@ --EXPECTF-- *** Testing for error conditions *** -Warning: popen() expects exactly 2 parameters, 0 given in %s on line %d +Warning: Wrong parameter count for popen() in %s on line %d NULL -Warning: popen() expects exactly 2 parameters, 1 given in %s on line %d +Warning: Wrong parameter count for popen() in %s on line %d NULL -resource(%d) of type (stream) sh: abc.txt: not found +resource(%d) of type (stream) Warning: Wrong parameter count for pclose() in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_dir_variation3.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/is_dir_variation3.phpt diff -u php-src/ext/standard/tests/file/is_dir_variation3.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/is_dir_variation3.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/is_dir_variation3.phpt:1.1.2.2.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/is_dir_variation3.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,5 @@ --TEST-- -Test is_dir() function: usage variations - invalid arguments +Test is_dir() function: usage variations - invalid arguments --FILE-- <?php /* Prototype: bool is_dir ( string $dirname ); @@ -18,9 +18,10 @@ TRUE, FALSE, NULL, + " ", $dir_handle, - /* Non-existing dirnames */ + /* scalars */ 0, 1234 ); @@ -39,6 +40,7 @@ bool(false) bool(false) bool(false) +bool(false) Warning: is_dir() expects parameter 1 to be string, resource given in %s on line %d NULL @@ -46,3 +48,4 @@ bool(false) *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fwrite_error.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fwrite_error.phpt diff -u php-src/ext/standard/tests/file/fwrite_error.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/fwrite_error.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/fwrite_error.phpt:1.1.2.1.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fwrite_error.phpt Wed Nov 26 10:10:17 2008 @@ -112,9 +112,10 @@ bool(false) -- Testing fwrite() with closed/unset file handle -- -Warning: fwrite(): 6 is not a valid stream resource in %s on line %d +Warning: fwrite(): %d is not a valid stream resource in %s on line %d bool(false) Warning: fwrite() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation3.phpt?r1=1.1.2.2.2.2&r2=1.1.2.2.2.3&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation3.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation3.phpt:1.1.2.2.2.2 php-src/ext/standard/tests/file/tempnam_variation3.phpt:1.1.2.2.2.3 --- php-src/ext/standard/tests/file/tempnam_variation3.phpt:1.1.2.2.2.2 Thu Nov 8 10:20:01 2007 +++ php-src/ext/standard/tests/file/tempnam_variation3.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - invalid/non-existing file +Test tempnam() function: usage variations - obscure prefixes --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == "WIN") @@ -13,10 +13,11 @@ /* Passing invalid/non-existing args for $prefix */ -echo "*** Testing tempnam() with invalid/non-existing file names ***\n"; -$file_path = dirname(__FILE__); +echo "*** Testing tempnam() with obscure prefixes ***\n"; +$file_path = dirname(__FILE__)."/tempnamVar3"; +mkdir($file_path); -/* An array of names, which will be passed as a file name */ +/* An array of prefixes */ $names_arr = array( /* Invalid args */ -1, @@ -25,16 +26,16 @@ NULL, "", " ", - "/0", + "\0", array(), - /* Non-existing dirs */ + /* prefix with path separator of a non existing directory*/ "/no/such/file/dir", - "php" + "php/php" ); -for( $i=1; $i<count($names_arr); $i++ ) { +for( $i=0; $i<count($names_arr); $i++ ) { echo "-- Iteration $i --\n"; $file_name = tempnam("$file_path", $names_arr[$i]); @@ -47,46 +48,75 @@ echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; + + echo "File created in => "; + $file_dir = dirname($file_name); + + if ($file_dir == sys_get_temp_dir()) { + echo "temp dir\n"; + } + else if ($file_dir == $file_path) { + echo "directory specified\n"; + } + else { + echo "unknown location\n"; + } + } - else + else { echo "-- File is not created --\n"; + } unlink($file_name); } +rmdir($file_path); echo "\n*** Done ***\n"; ?> --EXPECTF-- -*** Testing tempnam() with invalid/non-existing file names *** +*** Testing tempnam() with obscure prefixes *** +-- Iteration 0 -- +File name is => %s/%s +File permissions are => 100600 +File created in => directory specified -- Iteration 1 -- -File name is => %s +File name is => %s/%s File permissions are => 100600 +File created in => directory specified -- Iteration 2 -- -File name is => %s +File name is => %s/%s File permissions are => 100600 +File created in => directory specified -- Iteration 3 -- -File name is => %s +File name is => %s/%s File permissions are => 100600 +File created in => directory specified -- Iteration 4 -- -File name is => %s +File name is => %s/%s File permissions are => 100600 +File created in => directory specified -- Iteration 5 -- -File name is => %s +File name is => %s/%s File permissions are => 100600 +File created in => directory specified -- Iteration 6 -- -File name is => %s +File name is => %s/%s File permissions are => 100600 +File created in => directory specified -- Iteration 7 -- Warning: tempnam() expects parameter 2 to be string, array given in %s on line %d -- File is not created -- -Warning: unlink(): %s in %s on line %d +Warning: unlink(): No such file or directory in %s on line %d -- Iteration 8 -- -File name is => %s +File name is => %s/dir%s File permissions are => 100600 +File created in => directory specified -- Iteration 9 -- -File name is => %s +File name is => %s/php%s File permissions are => 100600 +File created in => directory specified *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgets_error.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fgets_error.phpt diff -u php-src/ext/standard/tests/file/fgets_error.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/fgets_error.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/fgets_error.phpt:1.1.2.1.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fgets_error.phpt Wed Nov 26 10:10:17 2008 @@ -99,9 +99,10 @@ Warning: fgets() expects parameter 1 to be resource, object given in %s on line %d bool(false) -- Testing fgets() with closed/unset file handle -- -Warning: fgets(): 5 is not a valid stream resource in %s on line %d +Warning: fgets(): %d is not a valid stream resource in %s on line %d bool(false) Warning: fgets() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fflush_error.phpt?r1=1.1.2.1.2.2&r2=1.1.2.1.2.3&diff_format=u Index: php-src/ext/standard/tests/file/fflush_error.phpt diff -u php-src/ext/standard/tests/file/fflush_error.phpt:1.1.2.1.2.2 php-src/ext/standard/tests/file/fflush_error.phpt:1.1.2.1.2.3 --- php-src/ext/standard/tests/file/fflush_error.phpt:1.1.2.1.2.2 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fflush_error.phpt Wed Nov 26 10:10:17 2008 @@ -24,9 +24,10 @@ var_dump( fflush($file_handle, $file_handle) ); fclose($file_handle); +fflush($file_handle); // test invalid arguments : non-resources -echo "-- Testing fflush(): with invalid arguments --\n"; +echo "\n-- Testing fflush(): with invalid arguments --\n"; $invalid_args = array ( "string", 10, @@ -41,7 +42,7 @@ echo "-- Iteration $loop_counter --\n"; var_dump( fflush($invalid_args[$loop_counter - 1]) ); } -echo "\n*** Done ***"; +echo "Done\n"; ?> --CLEAN-- @@ -60,6 +61,9 @@ Warning: fflush() expects exactly 1 parameter, 2 given in %s on line %d bool(false) + +Warning: fflush(): %d is not a valid stream resource in %s on line %d + -- Testing fflush(): with invalid arguments -- -- Iteration 1 -- @@ -85,6 +89,5 @@ Warning: fflush() expects parameter 1 to be resource, object given in %s on line %d bool(false) - -*** Done *** +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_writable_variation3.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/is_writable_variation3.phpt diff -u php-src/ext/standard/tests/file/is_writable_variation3.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/is_writable_variation3.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/is_writable_variation3.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/is_writable_variation3.phpt Wed Nov 26 10:10:17 2008 @@ -2,8 +2,16 @@ Test is_writable() and its alias is_writeable() function: usage variations - invalid file names --SKIPIF-- <?php -if (substr(PHP_OS, 0, 3) == 'WIN') { - die('skip.. only on LINUX'); +if (substr(PHP_OS, 0, 3) != 'WIN') { + // Skip if being run by root (files are always readable, writeable and executable) + $filename = dirname(__FILE__)."/is_writable_root_check.tmp"; + $fp = fopen($filename, 'w'); + fclose($fp); + if(fileowner($filename) == 0) { + unlink ($filename); + die('skip cannot be run as root'); + } + unlink($filename); } ?> --FILE-- @@ -26,6 +34,7 @@ TRUE, FALSE, NULL, + " ", @array(), @$file_handle ); @@ -55,6 +64,8 @@ bool(false) bool(false) bool(false) +bool(false) +bool(false) Warning: is_writable() expects parameter 1 to be string, array given in %s on line %d NULL @@ -64,3 +75,4 @@ bool(false) bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_dir_basic.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u Index: php-src/ext/standard/tests/file/fseek_dir_basic.phpt diff -u php-src/ext/standard/tests/file/fseek_dir_basic.phpt:1.1.4.3 php-src/ext/standard/tests/file/fseek_dir_basic.phpt:1.1.4.4 --- php-src/ext/standard/tests/file/fseek_dir_basic.phpt:1.1.4.3 Thu Mar 27 10:45:03 2008 +++ php-src/ext/standard/tests/file/fseek_dir_basic.phpt Wed Nov 26 10:10:17 2008 @@ -42,7 +42,7 @@ ?> --EXPECTF-- call readdir(): -resource(12) of type (stream) +resource(%d) of type (stream) array(6) { [0]=> bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filesize_variation1.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/file/filesize_variation1.phpt diff -u php-src/ext/standard/tests/file/filesize_variation1.phpt:1.1.2.1 php-src/ext/standard/tests/file/filesize_variation1.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/file/filesize_variation1.phpt:1.1.2.1 Tue Jul 3 07:10:01 2007 +++ php-src/ext/standard/tests/file/filesize_variation1.phpt Wed Nov 26 10:10:17 2008 @@ -3,7 +3,7 @@ --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { - die('skip only valid for Linux'); + die('skip Not valid on Windows'); } --FILE-- <?php @@ -32,14 +32,14 @@ --EXPECTF-- *** Testing filesize(): usage variations *** *** Checking filesize() with different size of files *** -int(1024) -int(1025024) -int(2049024) -int(3073024) -int(4097024) -int(5121024) -int(6145024) -int(7169024) -int(8193024) -int(9217024) +int(%d) +int(%d) +int(%d) +int(%d) +int(%d) +int(%d) +int(%d) +int(%d) +int(%d) +int(%d) Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_file_variation4.phpt?r1=1.1.2.5&r2=1.1.2.5.2.1&diff_format=u Index: php-src/ext/standard/tests/file/is_file_variation4.phpt diff -u php-src/ext/standard/tests/file/is_file_variation4.phpt:1.1.2.5 php-src/ext/standard/tests/file/is_file_variation4.phpt:1.1.2.5.2.1 --- php-src/ext/standard/tests/file/is_file_variation4.phpt:1.1.2.5 Wed Sep 12 08:27:35 2007 +++ php-src/ext/standard/tests/file/is_file_variation4.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,5 @@ --TEST-- -Test is_file() function: usage variations - diff. path notations (Bug #42027, #42638) +Test is_file() function: usage variations - diff. path notations (Bug #42027) --FILE-- <?php /* Prototype: bool is_file ( string $filename ); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt diff -u php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt:1.1.2.2.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt Wed Nov 26 10:10:17 2008 @@ -91,9 +91,10 @@ Warning: fseek() expects parameter 1 to be resource, object given in %s on line %d bool(false) -- Testing fseek() with closed/unset file handle -- -Warning: fseek(): 5 is not a valid stream resource in %s on line %d +Warning: fseek(): %d is not a valid stream resource in %s on line %d bool(false) Warning: fseek() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgets_variation2.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fgets_variation2.phpt diff -u php-src/ext/standard/tests/file/fgets_variation2.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/fgets_variation2.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/fgets_variation2.phpt:1.1.2.1.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fgets_variation2.phpt Wed Nov 26 10:10:17 2008 @@ -43,10 +43,10 @@ *** Testing fgets() : usage variations *** -- Testing fgets() with closed handle -- -Warning: fgets(): 6 is not a valid stream resource in %s on line %d +Warning: fgets(): %d is not a valid stream resource in %s on line %d bool(false) -Warning: fgets(): 6 is not a valid stream resource in %s on line %d +Warning: fgets(): %d is not a valid stream resource in %s on line %d bool(false) -- Testing fgets() with unset handle -- @@ -60,3 +60,4 @@ Warning: fgets() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_dir_variation2.phpt?r1=1.1.2.2.2.2&r2=1.1.2.2.2.3&diff_format=u Index: php-src/ext/standard/tests/file/is_dir_variation2.phpt diff -u php-src/ext/standard/tests/file/is_dir_variation2.phpt:1.1.2.2.2.2 php-src/ext/standard/tests/file/is_dir_variation2.phpt:1.1.2.2.2.3 --- php-src/ext/standard/tests/file/is_dir_variation2.phpt:1.1.2.2.2.2 Sun Feb 10 23:37:03 2008 +++ php-src/ext/standard/tests/file/is_dir_variation2.phpt Wed Nov 26 10:10:17 2008 @@ -14,7 +14,7 @@ /* Testing is_dir() with dir, soft & hard link to dir, and with file, soft & hard link to file */ - + $file_path = dirname(__FILE__); echo "*** Testing is_dir() with dir and links to dir ***\n"; @@ -70,7 +70,7 @@ -- With symlink -- bool(true) -- With hardlink -- -Warning: link(): %s in %s on line %d +Warning: link(): %s bool(false) *** Testing is_dir() with file and links to a file *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk_free_space_error.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/disk_free_space_error.phpt diff -u php-src/ext/standard/tests/file/disk_free_space_error.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/disk_free_space_error.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/disk_free_space_error.phpt:1.1.2.1.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/disk_free_space_error.phpt Wed Nov 26 10:10:17 2008 @@ -1,15 +1,15 @@ --TEST-- -Test disk_free_space and its alias diskfreespace() functions : error conditions. +Test disk_free_space and its alias diskfreespace() functions : error conditions --SKIPIF-- <?php -if(substr(PHP_OS, 0, 3) == 'WIN') - die("skip Not valid on Windows"); +if(substr(PHP_OS, 0, 3) == 'WIN' ) + die("skip Not Valid for Windows"); ?> --FILE-- <?php /* * Prototype: float disk_free_space( string directory ) - * Description: Given a string containing a directory, this function will + * Description: Given a string containing a directory, this function will * return the number of bytes available on the corresponding * filesystem or disk partition */ @@ -27,7 +27,7 @@ var_dump( diskfreespace( $file_path."/dir1" )); $fh = fopen( $file_path."/disk_free_space.tmp", "w" ); -fwrite( $fh, (binary)" Garbage data for the temporary file" ); +fwrite( $fh, " Garbage data for the temporary file" ); var_dump( disk_free_space( $file_path."/disk_free_space.tmp" )); // file input instead of directory var_dump( diskfreespace( $file_path."/disk_free_space.tmp" )); fclose($fh); @@ -55,13 +55,12 @@ Warning: diskfreespace() expects exactly 1 parameter, 2 given in %s on line %d NULL -Warning: disk_free_space(): No such file or directory in %s on line %d +Warning: disk_free_space(): %s in %s on line %d bool(false) -Warning: diskfreespace(): No such file or directory in %s on line %d +Warning: diskfreespace(): %s in %s on line %d bool(false) -float(%d) -float(%d) +float(%f) +float(%f) -- Done -- - http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_executable_variation3.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/is_executable_variation3.phpt diff -u php-src/ext/standard/tests/file/is_executable_variation3.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/is_executable_variation3.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/is_executable_variation3.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/is_executable_variation3.phpt Wed Nov 26 10:10:18 2008 @@ -5,6 +5,16 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip not for windows'); } +// Skip if being run by root (files are always readable, writeable and executable) +$filename = dirname(__FILE__)."/is_executable_root_check.tmp"; +$fp = fopen($filename, 'w'); +fclose($fp); +if(fileowner($filename) == 0) { + unlink ($filename); + die('skip cannot be run as root'); +} + +unlink($filename); ?> --FILE-- <?php @@ -27,6 +37,7 @@ TRUE, FALSE, NULL, + " ", @array(), @$file_handle ); @@ -49,8 +60,10 @@ bool(false) bool(false) bool(false) +bool(false) Warning: is_executable() expects parameter 1 to be string, array given in %s on line %d NULL bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_variation2.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/006_variation2.phpt diff -u php-src/ext/standard/tests/file/006_variation2.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/006_variation2.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/006_variation2.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:19 2007 +++ php-src/ext/standard/tests/file/006_variation2.phpt Wed Nov 26 10:10:18 2008 @@ -11,7 +11,7 @@ fclose($fp); if(fileowner($filename) == 0) { unlink ($filename); - die('skip cannot be run as root'); + die('skip...cannot be run as root\n'); } unlink($filename); @@ -94,93 +94,94 @@ *** Testing fileperms(), chmod() with miscellaneous permissions *** -- Iteration 1 -- bool(true) -107777 +%d bool(true) -47777 +%d -- Iteration 2 -- bool(true) -100000 +%d bool(true) -40000 +%d -- Iteration 3 -- bool(true) -101000 +%d bool(true) -41000 +%d -- Iteration 4 -- bool(true) -101111 +%d bool(true) -41111 +%d -- Iteration 5 -- bool(true) -107001 +%d bool(true) -47001 +%d -- Iteration 6 -- bool(true) -100001 +%d bool(true) -40001 +%d -- Iteration 7 -- bool(true) -101411 +%d bool(true) -41411 +%d -- Iteration 8 -- bool(true) -107141 +%d bool(true) -47141 +%d -- Iteration 9 -- bool(true) -100637 +%d bool(true) -40637 +%d -- Iteration 10 -- bool(true) -103567 +%d bool(true) -43567 +%d -- Iteration 11 -- bool(true) -103567 +%d bool(true) -43567 +%d -- Iteration 12 -- Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -103567 +%d Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -43567 +%d -- Iteration 13 -- Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -103567 +%d Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -43567 +%d -- Iteration 14 -- Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -103567 +%d Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -43567 +%d -- Iteration 15 -- Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -103567 +%d Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -43567 +%d *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/flock_variation.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/flock_variation.phpt diff -u php-src/ext/standard/tests/file/flock_variation.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/flock_variation.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/flock_variation.phpt:1.1.2.1.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/flock_variation.phpt Wed Nov 26 10:10:19 2008 @@ -1,371 +1,45 @@ --TEST-- -Test flock() function: Variations +Test flock() function: usage variations --FILE-- <?php /* Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]); -Description: PHP supports a portable way of locking complete files - in an advisory way +Description: PHP supports a portable way of locking complete files in an advisory way */ -echo "*** Testing flock() fun with the various operation and - wouldblock values ***\n"; -$file = dirname(__FILE__)."/flock.tmp"; -$fp = fopen($file, "w"); +echo "*** Test flock() function: with the operations given as numeric values ***\n"; -/* array of operatons */ -$operations = array( - LOCK_SH, - LOCK_EX, - LOCK_SH|LOCK_NB, - LOCK_EX|LOCK_NB, - LOCK_SH|LOCK_EX, - LOCK_UN, - 1, - 2, - 2.234, - TRUE -); +$filename = dirname(__FILE__)."/flock_variation.tmp"; +$file_handle = fopen($filename, "w"); -/* array of wouldblocks */ -$wouldblocks = array( - 0, - 1, - 2, - 1.234, - TRUE, - FALSE, - NULL, - array(1,2,3), - array(), - "string", - "", - /* binary input */ - b"string", - b"", - "\0" +/* array of operations */ +$operations = array( + 1, //nothing but LOCK_SH + 2, //nothing but LOCK_EX + 2.234, //nothing but LOCK_EX + TRUE //nothing but LOCK_SH ); $i = 0; foreach($operations as $operation) { - echo "--- Outer iteration $i ---\n"; - var_dump(flock($fp, $operation)); - $j = 0; - foreach($wouldblocks as $wouldblock) { - echo "-- Inner iteration $j in $i --\n"; - var_dump(flock($fp, $operation, $wouldblock)); - $j++; - } + var_dump(flock($file_handle, $operation)); + var_dump(flock($file_handle, 3)); //nothing but LOCK_UN $i++; } -fclose($fp); -@unlink($file); +fclose($file_handle); +unlink($filename); -echo "\n*** Done ***\n"; +echo "*** Done ***\n"; ?> --EXPECTF-- -*** Testing flock() fun with the various operation and - wouldblock values *** ---- Outer iteration 0 --- -bool(true) --- Inner iteration 0 in 0 -- -bool(true) --- Inner iteration 1 in 0 -- -bool(true) --- Inner iteration 2 in 0 -- -bool(true) --- Inner iteration 3 in 0 -- -bool(true) --- Inner iteration 4 in 0 -- -bool(true) --- Inner iteration 5 in 0 -- -bool(true) --- Inner iteration 6 in 0 -- -bool(true) --- Inner iteration 7 in 0 -- -bool(true) --- Inner iteration 8 in 0 -- -bool(true) --- Inner iteration 9 in 0 -- -bool(true) --- Inner iteration 10 in 0 -- -bool(true) --- Inner iteration 11 in 0 -- -bool(true) --- Inner iteration 12 in 0 -- -bool(true) --- Inner iteration 13 in 0 -- -bool(true) ---- Outer iteration 1 --- -bool(true) --- Inner iteration 0 in 1 -- -bool(true) --- Inner iteration 1 in 1 -- -bool(true) --- Inner iteration 2 in 1 -- -bool(true) --- Inner iteration 3 in 1 -- -bool(true) --- Inner iteration 4 in 1 -- -bool(true) --- Inner iteration 5 in 1 -- -bool(true) --- Inner iteration 6 in 1 -- -bool(true) --- Inner iteration 7 in 1 -- -bool(true) --- Inner iteration 8 in 1 -- -bool(true) --- Inner iteration 9 in 1 -- -bool(true) --- Inner iteration 10 in 1 -- -bool(true) --- Inner iteration 11 in 1 -- -bool(true) --- Inner iteration 12 in 1 -- -bool(true) --- Inner iteration 13 in 1 -- -bool(true) ---- Outer iteration 2 --- -bool(true) --- Inner iteration 0 in 2 -- -bool(true) --- Inner iteration 1 in 2 -- -bool(true) --- Inner iteration 2 in 2 -- -bool(true) --- Inner iteration 3 in 2 -- -bool(true) --- Inner iteration 4 in 2 -- -bool(true) --- Inner iteration 5 in 2 -- -bool(true) --- Inner iteration 6 in 2 -- -bool(true) --- Inner iteration 7 in 2 -- -bool(true) --- Inner iteration 8 in 2 -- -bool(true) --- Inner iteration 9 in 2 -- -bool(true) --- Inner iteration 10 in 2 -- -bool(true) --- Inner iteration 11 in 2 -- -bool(true) --- Inner iteration 12 in 2 -- -bool(true) --- Inner iteration 13 in 2 -- -bool(true) ---- Outer iteration 3 --- -bool(true) --- Inner iteration 0 in 3 -- -bool(true) --- Inner iteration 1 in 3 -- -bool(true) --- Inner iteration 2 in 3 -- -bool(true) --- Inner iteration 3 in 3 -- -bool(true) --- Inner iteration 4 in 3 -- -bool(true) --- Inner iteration 5 in 3 -- -bool(true) --- Inner iteration 6 in 3 -- -bool(true) --- Inner iteration 7 in 3 -- -bool(true) --- Inner iteration 8 in 3 -- -bool(true) --- Inner iteration 9 in 3 -- -bool(true) --- Inner iteration 10 in 3 -- -bool(true) --- Inner iteration 11 in 3 -- -bool(true) --- Inner iteration 12 in 3 -- -bool(true) --- Inner iteration 13 in 3 -- -bool(true) ---- Outer iteration 4 --- -bool(true) --- Inner iteration 0 in 4 -- -bool(true) --- Inner iteration 1 in 4 -- -bool(true) --- Inner iteration 2 in 4 -- -bool(true) --- Inner iteration 3 in 4 -- -bool(true) --- Inner iteration 4 in 4 -- -bool(true) --- Inner iteration 5 in 4 -- -bool(true) --- Inner iteration 6 in 4 -- -bool(true) --- Inner iteration 7 in 4 -- -bool(true) --- Inner iteration 8 in 4 -- -bool(true) --- Inner iteration 9 in 4 -- +*** Test flock() function: with the operations given as numeric values *** bool(true) --- Inner iteration 10 in 4 -- bool(true) --- Inner iteration 11 in 4 -- bool(true) --- Inner iteration 12 in 4 -- bool(true) --- Inner iteration 13 in 4 -- bool(true) ---- Outer iteration 5 --- bool(true) --- Inner iteration 0 in 5 -- bool(true) --- Inner iteration 1 in 5 -- bool(true) --- Inner iteration 2 in 5 -- -bool(true) --- Inner iteration 3 in 5 -- -bool(true) --- Inner iteration 4 in 5 -- -bool(true) --- Inner iteration 5 in 5 -- -bool(true) --- Inner iteration 6 in 5 -- -bool(true) --- Inner iteration 7 in 5 -- -bool(true) --- Inner iteration 8 in 5 -- -bool(true) --- Inner iteration 9 in 5 -- -bool(true) --- Inner iteration 10 in 5 -- -bool(true) --- Inner iteration 11 in 5 -- -bool(true) --- Inner iteration 12 in 5 -- -bool(true) --- Inner iteration 13 in 5 -- -bool(true) ---- Outer iteration 6 --- -bool(true) --- Inner iteration 0 in 6 -- -bool(true) --- Inner iteration 1 in 6 -- -bool(true) --- Inner iteration 2 in 6 -- -bool(true) --- Inner iteration 3 in 6 -- -bool(true) --- Inner iteration 4 in 6 -- -bool(true) --- Inner iteration 5 in 6 -- -bool(true) --- Inner iteration 6 in 6 -- -bool(true) --- Inner iteration 7 in 6 -- -bool(true) --- Inner iteration 8 in 6 -- -bool(true) --- Inner iteration 9 in 6 -- -bool(true) --- Inner iteration 10 in 6 -- -bool(true) --- Inner iteration 11 in 6 -- -bool(true) --- Inner iteration 12 in 6 -- -bool(true) --- Inner iteration 13 in 6 -- -bool(true) ---- Outer iteration 7 --- -bool(true) --- Inner iteration 0 in 7 -- -bool(true) --- Inner iteration 1 in 7 -- -bool(true) --- Inner iteration 2 in 7 -- -bool(true) --- Inner iteration 3 in 7 -- -bool(true) --- Inner iteration 4 in 7 -- -bool(true) --- Inner iteration 5 in 7 -- -bool(true) --- Inner iteration 6 in 7 -- -bool(true) --- Inner iteration 7 in 7 -- -bool(true) --- Inner iteration 8 in 7 -- -bool(true) --- Inner iteration 9 in 7 -- -bool(true) --- Inner iteration 10 in 7 -- -bool(true) --- Inner iteration 11 in 7 -- -bool(true) --- Inner iteration 12 in 7 -- -bool(true) --- Inner iteration 13 in 7 -- -bool(true) ---- Outer iteration 8 --- -bool(true) --- Inner iteration 0 in 8 -- -bool(true) --- Inner iteration 1 in 8 -- -bool(true) --- Inner iteration 2 in 8 -- -bool(true) --- Inner iteration 3 in 8 -- -bool(true) --- Inner iteration 4 in 8 -- -bool(true) --- Inner iteration 5 in 8 -- -bool(true) --- Inner iteration 6 in 8 -- -bool(true) --- Inner iteration 7 in 8 -- -bool(true) --- Inner iteration 8 in 8 -- -bool(true) --- Inner iteration 9 in 8 -- -bool(true) --- Inner iteration 10 in 8 -- -bool(true) --- Inner iteration 11 in 8 -- -bool(true) --- Inner iteration 12 in 8 -- -bool(true) --- Inner iteration 13 in 8 -- -bool(true) ---- Outer iteration 9 --- -bool(true) --- Inner iteration 0 in 9 -- -bool(true) --- Inner iteration 1 in 9 -- -bool(true) --- Inner iteration 2 in 9 -- -bool(true) --- Inner iteration 3 in 9 -- -bool(true) --- Inner iteration 4 in 9 -- -bool(true) --- Inner iteration 5 in 9 -- -bool(true) --- Inner iteration 6 in 9 -- -bool(true) --- Inner iteration 7 in 9 -- -bool(true) --- Inner iteration 8 in 9 -- -bool(true) --- Inner iteration 9 in 9 -- -bool(true) --- Inner iteration 10 in 9 -- -bool(true) --- Inner iteration 11 in 9 -- -bool(true) --- Inner iteration 12 in 9 -- -bool(true) --- Inner iteration 13 in 9 -- -bool(true) - *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation4.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation4.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation4.phpt:1.1.2.1 php-src/ext/standard/tests/file/tempnam_variation4.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/file/tempnam_variation4.phpt:1.1.2.1 Thu Aug 9 03:34:00 2007 +++ php-src/ext/standard/tests/file/tempnam_variation4.phpt Wed Nov 26 10:10:19 2008 @@ -20,22 +20,34 @@ echo "*** Testing tempnam() with dir of permissions from 0000 to 0777 ***\n"; $file_path = dirname(__FILE__); $dir_name = $file_path."/tempnam_variation4"; +$prefix = "tempnamVar4."; + mkdir($dir_name); -for($mode = 0000; $mode<=0777; $mode++) { +for($mode = 0000; $mode <= 0777; $mode++) { echo "-- dir perms "; printf("%o", $mode); echo " --\n"; chmod($dir_name, $mode); - $file_name = tempnam($dir_name, "tempnam_variation4.tmp"); + $file_name = tempnam($dir_name, $prefix); if(file_exists($file_name) ) { - print($file_name); - echo "\n"; + if (realpath(dirname($file_name)) == realpath(sys_get_temp_dir())) { + $msg = " created in temp directory"; + } + else if (dirname($file_name) == $dir_name) { + $msg = " created in requested directory"; + } + else { + $msg = " created in unexpected directory"; + } + + echo basename($file_name).$msg."\n"; + unlink($file_name); + } + else { + print("FAILED: File is not created\n"); } - else - print("-- File is not created --"); - unlink($file_name); } rmdir($dir_name); @@ -45,1027 +57,1027 @@ --EXPECTF-- *** Testing tempnam() with dir of permissions from 0000 to 0777 *** -- dir perms 0 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 1 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 2 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 3 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 4 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 5 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 6 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 7 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 10 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 11 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 12 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 13 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 14 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 15 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 16 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 17 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 20 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 21 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 22 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 23 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 24 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 25 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 26 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 27 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 30 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 31 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 32 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 33 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 34 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 35 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 36 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 37 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 40 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 41 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 42 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 43 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 44 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 45 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 46 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 47 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 50 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 51 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 52 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 53 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 54 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 55 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 56 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 57 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 60 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 61 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 62 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 63 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 64 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 65 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 66 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 67 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 70 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 71 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 72 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 73 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 74 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 75 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 76 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 77 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 100 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 101 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 102 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 103 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 104 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 105 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 106 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 107 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 110 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 111 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 112 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 113 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 114 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 115 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 116 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 117 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 120 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 121 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 122 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 123 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 124 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 125 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 126 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 127 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 130 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 131 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 132 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 133 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 134 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 135 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 136 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 137 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 140 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 141 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 142 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 143 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 144 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 145 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 146 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 147 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 150 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 151 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 152 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 153 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 154 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 155 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 156 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 157 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 160 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 161 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 162 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 163 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 164 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 165 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 166 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 167 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 170 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 171 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 172 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 173 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 174 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 175 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 176 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 177 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 200 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 201 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 202 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 203 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 204 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 205 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 206 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 207 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 210 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 211 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 212 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 213 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 214 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 215 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 216 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 217 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 220 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 221 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 222 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 223 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 224 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 225 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 226 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 227 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 230 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 231 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 232 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 233 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 234 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 235 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 236 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 237 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 240 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 241 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 242 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 243 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 244 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 245 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 246 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 247 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 250 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 251 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 252 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 253 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 254 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 255 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 256 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 257 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 260 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 261 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 262 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 263 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 264 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 265 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 266 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 267 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 270 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 271 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 272 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 273 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 274 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 275 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 276 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 277 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 300 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 301 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 302 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 303 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 304 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 305 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 306 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 307 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 310 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 311 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 312 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 313 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 314 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 315 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 316 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 317 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 320 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 321 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 322 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 323 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 324 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 325 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 326 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 327 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 330 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 331 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 332 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 333 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 334 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 335 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 336 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 337 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 340 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 341 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 342 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 343 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 344 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 345 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 346 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 347 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 350 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 351 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 352 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 353 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 354 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 355 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 356 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 357 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 360 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 361 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 362 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 363 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 364 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 365 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 366 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 367 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 370 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 371 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 372 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 373 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 374 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 375 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 376 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 377 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 400 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 401 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 402 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 403 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 404 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 405 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 406 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 407 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 410 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 411 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 412 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 413 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 414 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 415 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 416 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 417 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 420 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 421 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 422 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 423 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 424 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 425 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 426 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 427 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 430 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 431 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 432 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 433 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 434 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 435 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 436 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 437 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 440 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 441 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 442 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 443 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 444 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 445 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 446 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 447 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 450 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 451 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 452 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 453 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 454 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 455 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 456 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 457 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 460 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 461 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 462 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 463 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 464 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 465 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 466 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 467 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 470 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 471 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 472 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 473 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 474 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 475 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 476 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 477 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 500 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 501 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 502 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 503 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 504 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 505 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 506 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 507 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 510 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 511 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 512 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 513 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 514 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 515 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 516 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 517 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 520 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 521 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 522 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 523 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 524 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 525 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 526 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 527 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 530 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 531 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 532 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 533 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 534 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 535 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 536 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 537 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 540 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 541 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 542 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 543 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 544 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 545 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 546 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 547 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 550 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 551 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 552 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 553 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 554 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 555 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 556 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 557 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 560 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 561 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 562 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 563 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 564 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 565 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 566 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 567 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 570 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 571 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 572 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 573 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 574 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 575 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 576 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 577 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 600 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 601 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 602 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 603 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 604 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 605 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 606 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 607 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 610 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 611 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 612 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 613 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 614 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 615 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 616 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 617 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 620 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 621 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 622 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 623 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 624 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 625 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 626 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 627 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 630 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 631 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 632 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 633 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 634 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 635 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 636 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 637 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 640 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 641 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 642 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 643 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 644 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 645 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 646 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 647 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 650 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 651 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 652 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 653 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 654 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 655 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 656 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 657 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 660 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 661 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 662 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 663 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 664 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 665 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 666 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 667 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 670 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 671 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 672 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 673 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 674 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 675 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 676 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 677 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 700 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 701 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 702 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 703 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 704 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 705 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 706 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 707 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 710 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 711 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 712 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 713 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 714 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 715 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 716 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 717 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 720 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 721 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 722 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 723 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 724 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 725 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 726 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 727 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 730 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 731 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 732 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 733 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 734 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 735 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 736 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 737 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 740 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 741 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 742 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 743 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 744 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 745 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 746 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 747 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 750 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 751 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 752 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 753 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 754 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 755 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 756 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 757 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 760 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 761 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 762 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 763 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 764 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 765 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 766 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 767 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 770 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 771 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 772 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 773 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 774 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 775 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 776 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 777 -- -%s -*** Done *** +tempnamVar4.%s created in requested directory +*** Done *** \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_writable_variation1.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/is_writable_variation1.phpt diff -u php-src/ext/standard/tests/file/is_writable_variation1.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/is_writable_variation1.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/is_writable_variation1.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/is_writable_variation1.phpt Wed Nov 26 10:10:19 2008 @@ -2,8 +2,18 @@ Test is_writable() and its alias is_writeable() function: usage variations - diff. path notations --SKIPIF-- <?php -if (substr(PHP_OS, 0, 3) == 'WIN') { - die('skip.. only on LINUX'); +if (substr(PHP_OS, 0, 3) != 'WIN') { + + // Skip if being run by root (files are always readable, writeable and executable) + $filename = dirname(__FILE__)."/is_writable_root_check.tmp"; + $fp = fopen($filename, 'w'); + fclose($fp); + if(fileowner($filename) == 0) { + unlink ($filename); + die('skip cannot be run as root'); + } + + unlink($filename); } ?> --FILE-- @@ -100,4 +110,4 @@ -- Iteration 11 -- bool(true) bool(true) -Done +Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/001-win32.phpt?r1=1.2.8.1&r2=1.2.8.2&diff_format=u Index: php-src/ext/standard/tests/file/001-win32.phpt diff -u php-src/ext/standard/tests/file/001-win32.phpt:1.2.8.1 php-src/ext/standard/tests/file/001-win32.phpt:1.2.8.2 --- php-src/ext/standard/tests/file/001-win32.phpt:1.2.8.1 Wed May 21 18:56:05 2008 +++ php-src/ext/standard/tests/file/001-win32.phpt Wed Nov 26 10:10:19 2008 @@ -1,5 +1,7 @@ --TEST-- File type functions +--CREDITS-- +Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -10,7 +12,6 @@ <?php chdir(dirname(__FILE__)); @unlink('test.file'); -@unlink('test.link'); if (file_exists('test.file')) { echo "test.file exists\n"; } else { @@ -23,22 +24,11 @@ } else { echo "test.file does not exist\n"; } -sleep (2); -if (file_exists('test.link')) { - echo "test.link exists\n"; -} else { - echo "test.link does not exist\n"; -} if (is_link('test.file')) { echo "test.file is a symlink\n"; } else { echo "test.file is not a symlink\n"; } -if (is_link('test.link')) { - echo "test.link is a symlink\n"; -} else { - echo "test.link is not a symlink\n"; -} if (file_exists('test.file')) { echo "test.file exists\n"; } else { @@ -52,7 +42,6 @@ } } echo "test.file is " . filetype('test.file') . "\n"; -echo "test.link is <" . filetype('test.link') . ">\n"; printf ("test.file permissions are 0%o\n", 0777 & fileperms('test.file')); echo "test.file size is " . filesize('test.file') . "\n"; if (is_writeable('test.file')) { @@ -70,16 +59,6 @@ } else { echo "test.file is not a regular file\n"; } -if (is_file('test.link')) { - echo "test.link is a regular file\n"; -} else { - echo "test.link is not a regular file\n"; -} -if (is_dir('test.link')) { - echo "test.link is a directory\n"; -} else { - echo "test.link is not a directory\n"; -} if (is_dir('../file')) { echo "../file is a directory\n"; } else { @@ -103,25 +82,19 @@ echo "test.file does not exist\n"; } ?> ---EXPECTF-- +--EXPECT-- test.file does not exist test.file exists -test.link does not exist test.file is not a symlink -test.link is not a symlink test.file exists test.file is file - -Warning: filetype(): Lstat failed for test.link in %s -test.link is <> test.file permissions are 0666 test.file size is 0 test.file is writeable test.file is readable test.file is a regular file -test.link is not a regular file -test.link is not a directory ../file is a directory test.file is not a directory test.file does not exist test.file does not exist + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk_total_space_error.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/disk_total_space_error.phpt diff -u php-src/ext/standard/tests/file/disk_total_space_error.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/disk_total_space_error.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/disk_total_space_error.phpt:1.1.2.1.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/disk_total_space_error.phpt Wed Nov 26 10:10:19 2008 @@ -2,14 +2,14 @@ Test disk_total_space() function : error conditions --SKIPIF-- <?php -if(substr(PHP_OS, 0, 3) == 'WIN') - die("skip Not valid on Windows"); +if(substr(PHP_OS, 0, 3) == 'WIN' ) + die("skip Not Valid for Windows"); ?> --FILE-- <?php /* * Prototype: float disk_total_space( string $directory ); - * Description: given a string containing a directory, this function + * Description: given a string containing a directory, this function * will return the total number of bytes on the corresponding * filesystem or disk partition */ @@ -24,7 +24,7 @@ var_dump( disk_total_space( $file_path."/dir1" )); // Invalid directory $fh = fopen( $file_path."/disk_total_space.tmp", "w" ); -fwrite( $fh, (binary)" Garbage data for the temporary file" ); +fwrite( $fh, " Garbage data for the temporary file" ); var_dump( disk_total_space( $file_path."/disk_total_space.tmp" )); // file input instead of directory fclose($fh); @@ -46,7 +46,6 @@ Warning: disk_total_space(): No such file or directory in %s on line %d bool(false) -float(%d) +float(%f) --- Done --- - http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_error.phpt?r1=1.1.2.3.2.2&r2=1.1.2.3.2.3&diff_format=u Index: php-src/ext/standard/tests/file/006_error.phpt diff -u php-src/ext/standard/tests/file/006_error.phpt:1.1.2.3.2.2 php-src/ext/standard/tests/file/006_error.phpt:1.1.2.3.2.3 --- php-src/ext/standard/tests/file/006_error.phpt:1.1.2.3.2.2 Mon Nov 5 17:43:19 2007 +++ php-src/ext/standard/tests/file/006_error.phpt Wed Nov 26 10:10:19 2008 @@ -11,7 +11,7 @@ fclose($fp); if(fileowner($filename) == 0) { unlink ($filename); - die('skip cannot be run as root'); + die('skip...cannot be run as root\n'); } unlink($filename); @@ -68,13 +68,13 @@ --EXPECTF-- *** Testing error conditions for fileperms(), chmod() *** -Warning: chmod(): %s in %s on line %d +Warning: chmod(): Operation not permitted in %s on line %d bool(false) -100%d44 +%d -Warning: chmod(): %s in %s on line %d +Warning: chmod(): Operation not permitted in %s on line %d bool(false) -40755 +%d Warning: chmod(): No such file or directory in %s on line %d bool(false) @@ -105,3 +105,4 @@ NULL *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/glob_basic.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/file/glob_basic.phpt diff -u php-src/ext/standard/tests/file/glob_basic.phpt:1.1.2.1 php-src/ext/standard/tests/file/glob_basic.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/file/glob_basic.phpt:1.1.2.1 Mon Jul 23 05:22:59 2007 +++ php-src/ext/standard/tests/file/glob_basic.phpt Wed Nov 26 10:10:19 2008 @@ -25,14 +25,19 @@ fclose($fp); // glob() with default arguments -var_dump( glob($dirname."/*") ); -var_dump( glob($dirname."/*.txt") ); -var_dump( glob($dirname."/*.t?t") ); -var_dump( glob($dirname."/*.t*t") ); -var_dump( glob($dirname."/*.?") ); -var_dump( glob($dirname."/*.*") ); +sort_var_dump( glob($dirname."/*") ); +sort_var_dump( glob($dirname."/*.txt") ); +sort_var_dump( glob($dirname."/*.t?t") ); +sort_var_dump( glob($dirname."/*.t*t") ); +sort_var_dump( glob($dirname."/*.?") ); +sort_var_dump( glob($dirname."/*.*") ); echo "Done\n"; + +function sort_var_dump($results) { + sort($results); + var_dump($results); +} ?> --CLEAN-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_file_variation3.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/is_file_variation3.phpt diff -u php-src/ext/standard/tests/file/is_file_variation3.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/is_file_variation3.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/is_file_variation3.phpt:1.1.2.2.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/is_file_variation3.phpt Wed Nov 26 10:10:19 2008 @@ -1,5 +1,5 @@ --TEST-- -Test is_file() function: usage variations - invalid arguments +Test is_file() function: usage variations - invalid filenames --FILE-- <?php /* Prototype: bool is_file ( string $filename ); @@ -16,17 +16,18 @@ $filenames = array( /* Invalid filenames */ -2.34555, + " ", "", TRUE, FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( is_file($filename) ); @@ -48,6 +49,7 @@ bool(false) bool(false) bool(false) +bool(false) Warning: is_file() expects parameter 1 to be string, resource given in %s on line %d NULL @@ -55,3 +57,4 @@ bool(false) *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation7-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation7-win32.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation7-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation19.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation19.phpt +++ php-src/ext/standard/tests/file/fopen_variation19.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/unlink_variation8.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/unlink_variation8.phpt +++ php-src/ext/standard/tests/file/unlink_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/basename-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/basename-win32.phpt +++ php-src/ext/standard/tests/file/basename-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation7.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation7.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/mkdir_variation4.phpt +++ php-src/ext/standard/tests/file/mkdir_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fpassthru_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fpassthru_variation1.phpt +++ php-src/ext/standard/tests/file/fpassthru_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/feof_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/feof_basic.phpt +++ php-src/ext/standard/tests/file/feof_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation13.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation13.phpt +++ php-src/ext/standard/tests/file/fopen_variation13.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/unlink_variation7.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/unlink_variation7.phpt +++ php-src/ext/standard/tests/file/unlink_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation3.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation6.phpt +++ php-src/ext/standard/tests/file/fopen_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation15-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation15-win32.phpt +++ php-src/ext/standard/tests/file/fopen_variation15-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation2.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pclose_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pclose_variation1.phpt +++ php-src/ext/standard/tests/file/pclose_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_exists_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_exists_error.phpt +++ php-src/ext/standard/tests/file/file_exists_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/chmod_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/chmod_variation4.phpt +++ php-src/ext/standard/tests/file/chmod_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation1.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/unlink_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/unlink_variation6.phpt +++ php-src/ext/standard/tests/file/unlink_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/basename_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/basename_error.phpt +++ php-src/ext/standard/tests/file/basename_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/unlink_variation8-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/unlink_variation8-win32.phpt +++ php-src/ext/standard/tests/file/unlink_variation8-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation6.phpt +++ php-src/ext/standard/tests/file/readfile_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation5.phpt +++ php-src/ext/standard/tests/file/fopen_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_basic.phpt +++ php-src/ext/standard/tests/file/file_get_contents_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/glob_error_002-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/glob_error_002-win32.phpt +++ php-src/ext/standard/tests/file/glob_error_002-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation3-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation3-win32.phpt +++ php-src/ext/standard/tests/file/touch_variation3-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation11-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation11-win32.phpt +++ php-src/ext/standard/tests/file/fopen_variation11-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation5-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/mkdir_variation5-win32.phpt +++ php-src/ext/standard/tests/file/mkdir_variation5-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rmdir_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rmdir_variation2.phpt +++ php-src/ext/standard/tests/file/rmdir_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileowner_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileowner_variation1.phpt +++ php-src/ext/standard/tests/file/fileowner_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileperms_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileperms_variation3.phpt +++ php-src/ext/standard/tests/file/fileperms_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation7.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation7.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/parse_ini_file_variation1.phpt +++ php-src/ext/standard/tests/file/parse_ini_file_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/mkdir_variation3.phpt +++ php-src/ext/standard/tests/file/mkdir_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation16.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation16.phpt +++ php-src/ext/standard/tests/file/fopen_variation16.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/parse_ini_file_variation5.phpt +++ php-src/ext/standard/tests/file/parse_ini_file_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation5.phpt +++ php-src/ext/standard/tests/file/readfile_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation13.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rename_variation13.phpt +++ php-src/ext/standard/tests/file/rename_variation13.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation10-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation10-win32.phpt +++ php-src/ext/standard/tests/file/readfile_variation10-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filegroup_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/filegroup_variation2.phpt +++ php-src/ext/standard/tests/file/filegroup_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation8-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation8-win32.phpt +++ php-src/ext/standard/tests/file/readfile_variation8-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/005_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/005_variation2.phpt +++ php-src/ext/standard/tests/file/005_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_basic1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pathinfo_basic1.phpt +++ php-src/ext/standard/tests/file/pathinfo_basic1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filegroup_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/filegroup_variation1.phpt +++ php-src/ext/standard/tests/file/filegroup_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/unlink_variation9-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/unlink_variation9-win32.phpt +++ php-src/ext/standard/tests/file/unlink_variation9-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation11-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rename_variation11-win32.phpt +++ php-src/ext/standard/tests/file/rename_variation11-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/dirname_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/dirname_basic.phpt +++ php-src/ext/standard/tests/file/dirname_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation1.phpt +++ php-src/ext/standard/tests/file/touch_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation8.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation8.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgets_socket_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fgets_socket_variation2.phpt +++ php-src/ext/standard/tests/file/fgets_socket_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation6.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation12.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation12.phpt +++ php-src/ext/standard/tests/file/fopen_variation12.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/mkdir_variation1.phpt +++ php-src/ext/standard/tests/file/mkdir_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation7.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation7.phpt +++ php-src/ext/standard/tests/file/readfile_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation14.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation14.phpt +++ php-src/ext/standard/tests/file/fopen_variation14.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation4.phpt +++ php-src/ext/standard/tests/file/touch_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rmdir_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rmdir_variation1.phpt +++ php-src/ext/standard/tests/file/rmdir_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation4.phpt +++ php-src/ext/standard/tests/file/readfile_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fwrite_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fwrite_variation5.phpt +++ php-src/ext/standard/tests/file/fwrite_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_uploaded_file_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/is_uploaded_file_basic.phpt +++ php-src/ext/standard/tests/file/is_uploaded_file_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation13-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rename_variation13-win32.phpt +++ php-src/ext/standard/tests/file/rename_variation13-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/mkdir_variation5.phpt +++ php-src/ext/standard/tests/file/mkdir_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileinode_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileinode_variation1.phpt +++ php-src/ext/standard/tests/file/fileinode_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation8-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/tempnam_variation8-win32.phpt +++ php-src/ext/standard/tests/file/tempnam_variation8-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_exists_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_exists_variation1.phpt +++ php-src/ext/standard/tests/file/file_exists_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_basic-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_basic-win32.phpt +++ php-src/ext/standard/tests/file/touch_basic-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/move_uploaded_file_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/move_uploaded_file_basic.phpt +++ php-src/ext/standard/tests/file/move_uploaded_file_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readlink_variation1.phpt +++ php-src/ext/standard/tests/file/readlink_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt +++ php-src/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_error.phpt +++ php-src/ext/standard/tests/file/file_get_contents_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt +++ php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_variation9.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_variation9.phpt +++ php-src/ext/standard/tests/file/file_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileinode_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileinode_variation3.phpt +++ php-src/ext/standard/tests/file/fileinode_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation4.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pathinfo_variation2.phpt +++ php-src/ext/standard/tests/file/pathinfo_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileperms_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileperms_variation1.phpt +++ php-src/ext/standard/tests/file/fileperms_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/flock_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/flock_variation1.phpt +++ php-src/ext/standard/tests/file/flock_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation8.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation8.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/basename.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/basename.phpt +++ php-src/ext/standard/tests/file/basename.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation5.phpt +++ php-src/ext/standard/tests/file/touch_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/005_variation2-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/005_variation2-win32.phpt +++ php-src/ext/standard/tests/file/005_variation2-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileowner_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileowner_variation3.phpt +++ php-src/ext/standard/tests/file/fileowner_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/realpath_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/realpath_variation2.phpt +++ php-src/ext/standard/tests/file/realpath_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation2.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/parse_ini_file_variation2.phpt +++ php-src/ext/standard/tests/file/parse_ini_file_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation12.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rename_variation12.phpt +++ php-src/ext/standard/tests/file/rename_variation12.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation1.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pathinfo_variation1.phpt +++ php-src/ext/standard/tests/file/pathinfo_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rmdir_variation3-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rmdir_variation3-win32.phpt +++ php-src/ext/standard/tests/file/rmdir_variation3-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation5.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation8.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation8.phpt +++ php-src/ext/standard/tests/file/fopen_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filetype_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/filetype_variation2.phpt +++ php-src/ext/standard/tests/file/filetype_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_include_path.inc?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_include_path.inc +++ php-src/ext/standard/tests/file/fopen_include_path.inc http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_variation8-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_variation8-win32.phpt +++ php-src/ext/standard/tests/file/file_variation8-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/mkdir_variation2.phpt +++ php-src/ext/standard/tests/file/mkdir_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation6-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation6-win32.phpt +++ php-src/ext/standard/tests/file/touch_variation6-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/chmod_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/chmod_variation3.phpt +++ php-src/ext/standard/tests/file/chmod_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation9.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation9.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation7.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation7.phpt +++ php-src/ext/standard/tests/file/fopen_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation8-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation8-win32.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation8-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgets_socket_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fgets_socket_variation1.phpt +++ php-src/ext/standard/tests/file/fgets_socket_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation3.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rmdir_variation1-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rmdir_variation1-win32.phpt +++ php-src/ext/standard/tests/file/rmdir_variation1-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation6.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation4.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation1-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/mkdir_variation1-win32.phpt +++ php-src/ext/standard/tests/file/mkdir_variation1-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_basic.phpt +++ php-src/ext/standard/tests/file/touch_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileowner_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileowner_variation2.phpt +++ php-src/ext/standard/tests/file/fileowner_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileinode_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileinode_variation2.phpt +++ php-src/ext/standard/tests/file/fileinode_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation4.phpt +++ php-src/ext/standard/tests/file/fopen_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation9.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation9.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation15.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation15.phpt +++ php-src/ext/standard/tests/file/fopen_variation15.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/dirname_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/dirname_error.phpt +++ php-src/ext/standard/tests/file/dirname_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_basic1-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pathinfo_basic1-win32.phpt +++ php-src/ext/standard/tests/file/pathinfo_basic1-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation3.phpt +++ php-src/ext/standard/tests/file/touch_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/umask_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/umask_variation3.phpt +++ php-src/ext/standard/tests/file/umask_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fread_fwrite_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fread_fwrite_basic.phpt +++ php-src/ext/standard/tests/file/fread_fwrite_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation10-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation10-win32.phpt +++ php-src/ext/standard/tests/file/fopen_variation10-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fseek_variation2.phpt +++ php-src/ext/standard/tests/file/fseek_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation5-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation5-win32.phpt +++ php-src/ext/standard/tests/file/touch_variation5-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pathinfo_variation3.phpt +++ php-src/ext/standard/tests/file/pathinfo_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation17.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation17.phpt +++ php-src/ext/standard/tests/file/fopen_variation17.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/unlink_variation10.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/unlink_variation10.phpt +++ php-src/ext/standard/tests/file/unlink_variation10.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation9.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation9.phpt +++ php-src/ext/standard/tests/file/fopen_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation14-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation14-win32.phpt +++ php-src/ext/standard/tests/file/fopen_variation14-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fseek_variation1.phpt +++ php-src/ext/standard/tests/file/fseek_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rmdir_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rmdir_variation3.phpt +++ php-src/ext/standard/tests/file/rmdir_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation2.phpt +++ php-src/ext/standard/tests/file/touch_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_error.phpt +++ php-src/ext/standard/tests/file/touch_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filesize_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/filesize_variation5.phpt +++ php-src/ext/standard/tests/file/filesize_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/glob_error_002.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/glob_error_002.phpt +++ php-src/ext/standard/tests/file/glob_error_002.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation5-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/tempnam_variation5-win32.phpt +++ php-src/ext/standard/tests/file/tempnam_variation5-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fseek_variation3.phpt +++ php-src/ext/standard/tests/file/fseek_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/parse_ini_file_variation3.phpt +++ php-src/ext/standard/tests/file/parse_ini_file_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/parse_ini_file_variation6.phpt +++ php-src/ext/standard/tests/file/parse_ini_file_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lstat_stat_variation22.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/lstat_stat_variation22.phpt +++ php-src/ext/standard/tests/file/lstat_stat_variation22.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filegroup_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/filegroup_variation3.phpt +++ php-src/ext/standard/tests/file/filegroup_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_basic2-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pathinfo_basic2-win32.phpt +++ php-src/ext/standard/tests/file/pathinfo_basic2-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/dirname_basic-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/dirname_basic-win32.phpt +++ php-src/ext/standard/tests/file/dirname_basic-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation3.phpt +++ php-src/ext/standard/tests/file/fopen_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileperms_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileperms_variation2.phpt +++ php-src/ext/standard/tests/file/fileperms_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation4-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation4-win32.phpt +++ php-src/ext/standard/tests/file/touch_variation4-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation9.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation9.phpt +++ php-src/ext/standard/tests/file/readfile_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation5.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_basic2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pathinfo_basic2.phpt +++ php-src/ext/standard/tests/file/pathinfo_basic2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation7-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation7-win32.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation7-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation6-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/tempnam_variation6-win32.phpt +++ php-src/ext/standard/tests/file/tempnam_variation6-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_variation8.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_variation8.phpt +++ php-src/ext/standard/tests/file/file_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation10.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rename_variation10.phpt +++ php-src/ext/standard/tests/file/rename_variation10.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/dirname_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/dirname_variation1.phpt +++ php-src/ext/standard/tests/file/dirname_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation10.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation10.phpt +++ php-src/ext/standard/tests/file/readfile_variation10.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk_free_space_variation.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/disk_free_space_variation.phpt diff -u php-src/ext/standard/tests/file/disk_free_space_variation.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/disk_free_space_variation.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/disk_free_space_variation.phpt:1.1.2.2.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/disk_free_space_variation.phpt Wed Nov 26 10:10:16 2008 @@ -1,5 +1,5 @@ --TEST-- -Test disk_free_space and its alias diskfreespace() functions : Usage Variations +Test disk_free_space and its alias diskfreespace() functions : usage variations --FILE-- <?php /* @@ -11,15 +11,16 @@ $file_path = dirname(__FILE__); -echo "*** Testing with a directory ***\n"; +echo "*** Testing disk_free_space() function with a directory ***\n"; var_dump( disk_free_space($file_path."/..") ); var_dump( diskfreespace($file_path."/..") ); -echo "\nTesting for the return type ***\n"; +echo "\n*** Testing for the return type ***\n"; $return_value = disk_free_space($file_path); var_dump( is_float($return_value) ); -echo "\n*** Testing with different directory combinations ***"; +echo "\n*** Testing disk_free_space() function with different styles of file and directory ***"; + $dir = "/disk_free_space"; mkdir($file_path.$dir); @@ -41,15 +42,15 @@ $file_path.$dir.chr(0), $file_path."/.".$dir.chr(0), ".".chr(0).$file_path.$dir, - ".".chr(0).$file_path.$dir.chr(0) + ".".chr(0).$file_path.$dir.chr(0) ); $count = 1; /* loop through to test each element the above array */ -foreach($dirs_arr as $dir1) { +foreach($dirs_arr as $dir) { echo "\n-- Iteration $count --\n"; - var_dump( disk_free_space( $dir1 ) ); - var_dump( diskfreespace( $dir1 ) ); + var_dump( disk_free_space( $dir ) ); + var_dump( diskfreespace( $dir ) ); $count++; } @@ -58,66 +59,65 @@ --CLEAN-- <?php -$file_path = dirname(__FILE__); -rmdir($file_path."/disk_free_space"); +$file_path = dirname(__FILE__)."/disk_free_space"; +rmdir($file_path); ?> - --EXPECTF-- -*** Testing with a directory *** -float(%d) -float(%d) +*** Testing disk_free_space() function with a directory *** +float(%f) +float(%f) -Testing for the return type *** +*** Testing for the return type *** bool(true) -*** Testing with different directory combinations *** +*** Testing disk_free_space() function with different styles of file and directory *** -- Iteration 1 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 2 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 3 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 4 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 5 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 6 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 7 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 8 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 9 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 10 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 11 -- -float(%d) -float(%d) +float(%f) +float(%f) -- Iteration 12 -- -float(%d) -float(%d) +float(%f) +float(%f) --- Done --- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation1.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation1.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation1.phpt:1.1.2.2 php-src/ext/standard/tests/file/tempnam_variation1.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/file/tempnam_variation1.phpt:1.1.2.2 Fri Aug 10 12:11:46 2007 +++ php-src/ext/standard/tests/file/tempnam_variation1.phpt Wed Nov 26 10:10:16 2008 @@ -13,7 +13,8 @@ /* Creating number of unique files by passing a file name as prefix */ -$file_path = dirname(__FILE__); +$file_path = dirname(__FILE__)."/tempnamVar1"; +mkdir($file_path); echo "*** Testing tempnam() in creation of unique files ***\n"; for($i=1; $i<=10; $i++) { @@ -34,6 +35,19 @@ echo "File inode is => "; print_r( fileinode($files[$i]) ); //checking inodes echo "\n"; + + echo "File created in => "; + $file_dir = dirname($files[$i]); + + if ($file_dir == sys_get_temp_dir()) { + echo "temp dir\n"; + } + else if ($file_dir == $file_path) { + echo "directory specified\n"; + } + else { + echo "unknown location\n"; + } clearstatcache(); } else { @@ -44,48 +58,59 @@ unlink($files[$i]); } +rmdir($file_path); echo "*** Done ***\n"; ?> --EXPECTF-- *** Testing tempnam() in creation of unique files *** -- Iteration 1 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 2 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 3 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 4 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 5 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 6 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 7 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 8 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 9 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified -- Iteration 10 -- -File name is => %s +File name is => %s%etempnam_variation1.tmp%s File permissions are => 100600 File inode is => %d +File created in => directory specified *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation1-win32.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation1-win32.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation1-win32.phpt:1.1.2.2 php-src/ext/standard/tests/file/tempnam_variation1-win32.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/file/tempnam_variation1-win32.phpt:1.1.2.2 Fri Aug 10 12:11:46 2007 +++ php-src/ext/standard/tests/file/tempnam_variation1-win32.phpt Wed Nov 26 10:10:16 2008 @@ -3,7 +3,7 @@ --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") - die("skip Run only on Windows"); + die("skip Only valid for Windows"); ?> --FILE-- <?php @@ -13,7 +13,8 @@ /* Creating number of unique files by passing a file name as prefix */ -$file_path = dirname(__FILE__); +$file_path = dirname(__FILE__)."/tempnamVar1"; +mkdir($file_path); echo "*** Testing tempnam() in creation of unique files ***\n"; for($i=1; $i<=10; $i++) { @@ -31,6 +32,19 @@ echo "\n"; clearstatcache(); + echo "File created in => "; + $file_dir = dirname($files[$i]); + + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { + echo "temp dir\n"; + } + else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { + echo "directory specified\n"; + } + else { + echo "unknown location\n"; + } + clearstatcache(); } else { print("- File is not created -"); @@ -39,39 +53,51 @@ for($i=1; $i<=10; $i++) { unlink($files[$i]); } +rmdir($file_path); + echo "*** Done ***\n"; ?> --EXPECTF-- *** Testing tempnam() in creation of unique files *** -- Iteration 1 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 2 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 3 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 4 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 5 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 6 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 7 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 8 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 9 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified -- Iteration 10 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => directory specified *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lstat_stat_variation2.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/lstat_stat_variation2.phpt diff -u php-src/ext/standard/tests/file/lstat_stat_variation2.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/lstat_stat_variation2.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/lstat_stat_variation2.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/lstat_stat_variation2.phpt Wed Nov 26 10:10:16 2008 @@ -21,13 +21,12 @@ require("file.inc"); /* create temp directory */ -@rmdir("$file_path/lstat_stat_variation2/"); //ensure that dir doesn't exists -mkdir("$file_path/lstat_stat_variation2/"); // temp dir +mkdir("$file_path/lstat_stat_variation1/"); // temp dir // renaming a directory and check stat echo "*** Testing stat() for directory after being renamed ***\n"; -$old_dirname = "$file_path/lstat_stat_variation2"; -$new_dirname = "$file_path/lstat_stat_variation2a"; +$old_dirname = "$file_path/lstat_stat_variation1"; +$new_dirname = "$file_path/lstat_stat_variation1a"; $old_stat = stat($old_dirname); clearstatcache(); var_dump( rename($old_dirname, $new_dirname) ); @@ -37,8 +36,11 @@ var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); -// compare the two stats -var_dump( compare_stats($old_stat, $new_stat, $all_stat_keys) ); +// compare the two stats - all except ctime +$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, + "dev", "ino", "mode", "nlink", "uid", "gid", + "rdev", "size", "atime", "mtime", "blksize", "blocks"); +var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) ); // clear the cache clearstatcache(); @@ -48,7 +50,7 @@ --CLEAN-- <?php $file_path = dirname(__FILE__); -rmdir("$file_path/lstat_stat_variation2a"); +rmdir("$file_path/lstat_stat_variation1a"); ?> --EXPECTF-- *** Testing stat() for directory after being renamed *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation3-win32.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation3-win32.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation3-win32.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/tempnam_variation3-win32.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/tempnam_variation3-win32.phpt:1.1.2.2.2.1 Sun Aug 17 11:04:16 2008 +++ php-src/ext/standard/tests/file/tempnam_variation3-win32.phpt Wed Nov 26 10:10:16 2008 @@ -1,9 +1,9 @@ --TEST-- -Test tempnam() function: usage variations - invalid/non-existing file +Test tempnam() function: usage variations - obscure prefixes --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") - die("skip Run only on Windows"); + die("skip run only on Windows"); ?> --FILE-- <?php @@ -13,10 +13,11 @@ /* Passing invalid/non-existing args for $prefix */ -echo "*** Testing tempnam() with invalid/non-existing file names ***\n"; -$file_path = dirname(__FILE__); +echo "*** Testing tempnam() with obscure prefixes ***\n"; +$file_path = dirname(__FILE__)."/tempnamVar3"; +mkdir($file_path); -/* An array of names, which will be passed as a file name */ +/* An array of prefixes */ $names_arr = array( /* Invalid args */ -1, @@ -25,16 +26,16 @@ NULL, "", " ", - "/0", + "\0", array(), - /* Non-existing dirs */ + /* prefix with path separator of a non existing directory*/ "/no/such/file/dir", - "php" + "php/php" ); -for( $i=1; $i<count($names_arr); $i++ ) { +for( $i=0; $i<count($names_arr); $i++ ) { echo "-- Iteration $i --\n"; $file_name = tempnam("$file_path", $names_arr[$i]); @@ -47,46 +48,73 @@ echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; + + echo "File created in => "; + $file_dir = dirname($file_name); + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { + echo "temp dir\n"; + } + else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { + echo "directory specified\n"; + } + else { + echo "unknown location\n"; + } } - else + else { echo "-- File is not created --\n"; + } unlink($file_name); } +rmdir($file_path); echo "\n*** Done ***\n"; ?> --EXPECTF-- -*** Testing tempnam() with invalid/non-existing file names *** +*** Testing tempnam() with obscure prefixes *** +-- Iteration 0 -- +File name is => %s\%s +File permissions are => 100666 +File created in => directory specified -- Iteration 1 -- -File name is => %s +File name is => %s\%s File permissions are => 100666 +File created in => directory specified -- Iteration 2 -- -File name is => %s +File name is => %s\%s File permissions are => 100666 +File created in => directory specified -- Iteration 3 -- -File name is => %s +File name is => %s\%s File permissions are => 100666 +File created in => directory specified -- Iteration 4 -- -File name is => %s +File name is => %s\%s File permissions are => 100666 +File created in => directory specified -- Iteration 5 -- -File name is => %s +File name is => %s\%s File permissions are => 100666 +File created in => directory specified -- Iteration 6 -- -File name is => %s +File name is => %s\%s File permissions are => 100666 +File created in => directory specified -- Iteration 7 -- Warning: tempnam() expects parameter 2 to be string, array given in %s on line %d -- File is not created -- -Warning: unlink(): %s in %s on line %d +Warning: unlink(): No such file or directory in %s on line %d -- Iteration 8 -- -File name is => %s +File name is => %s\di%s File permissions are => 100666 +File created in => directory specified -- Iteration 9 -- -File name is => %s +File name is => %s\ph%s File permissions are => 100666 +File created in => directory specified *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file.inc?r1=1.1.2.6.2.2&r2=1.1.2.6.2.3&diff_format=u Index: php-src/ext/standard/tests/file/file.inc diff -u php-src/ext/standard/tests/file/file.inc:1.1.2.6.2.2 php-src/ext/standard/tests/file/file.inc:1.1.2.6.2.3 --- php-src/ext/standard/tests/file/file.inc:1.1.2.6.2.2 Sun Aug 17 14:32:41 2008 +++ php-src/ext/standard/tests/file/file.inc Wed Nov 26 10:10:16 2008 @@ -7,7 +7,7 @@ delete_links() : delete links fill_files() : fill file with specified contents change_file_perms() : Change permission of files - fill_buffer() : fill buffer with specified contents + fill_buffer() : fills buffer with specified contents compare_self_stat() : compares the first 13 elements of the stat with the corresponding named key values of the same stat. @@ -80,7 +80,7 @@ } /* - Function : bool fill_file(resource $file_handle, string $fill_type, int $file_size); + Function : bool fill_file(resource $file_handle, string $fill_type, string $file_size); Description: Fills the file with data as specified with requested size. $file_handle = file handle, opened with write options, $fill_type: @@ -638,8 +638,6 @@ // if the result is false(i.e values are not as expected), // dump the stat array so that easy to figure out the error if ( $result == false ) { - echo "\n Dumping diff between stat array 1 and 2...\n"; - var_dump(array_diff($stat1, $stat2)); echo "\n Dumping stat array 1...\n"; var_dump($stat1); echo "\n Dumping stat array 2...\n"; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt diff -u php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt:1.1.2.2.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt Wed Nov 26 10:10:16 2008 @@ -87,9 +87,10 @@ Warning: ftell() expects parameter 1 to be resource, object given in %s on line %d bool(false) -- Testing ftell with closed/unset file handle -- -Warning: ftell(): 5 is not a valid stream resource in %s on line %d +Warning: ftell(): %d is not a valid stream resource in %s on line %d bool(false) Warning: ftell() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt:1.1.2.2.2.1 Fri Aug 15 16:51:23 2008 +++ php-src/ext/standard/tests/file/tempnam_variation7-win32.phpt Wed Nov 26 10:10:16 2008 @@ -3,7 +3,7 @@ --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") - die("skip Run only on Windows"); + die("skip Only run on Windows"); ?> --FILE-- <?php @@ -15,8 +15,6 @@ hence the unique files will be created in temporary dir */ echo "*** Testing tempnam() with invalid/non-existing directory names ***\n"; -$file_path = dirname(__FILE__); - /* An array of names, which will be passed as a dir name */ $names_arr = array( /* Invalid args */ @@ -26,7 +24,7 @@ NULL, "", " ", - "/0", + "\0", array(), /* Non-existing dirs */ @@ -35,7 +33,7 @@ ); -for( $i=1; $i<count($names_arr); $i++ ) { +for( $i=0; $i<count($names_arr); $i++ ) { echo "-- Iteration $i --\n"; $file_name = tempnam($names_arr[$i], "tempnam_variation3.tmp"); @@ -48,9 +46,19 @@ echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; + + echo "File created in => "; + $file_dir = dirname($file_name); + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { + echo "temp dir\n"; + } + else { + echo "unknown location\n"; + } } - else + else { echo "-- File is not created --\n"; + } unlink($file_name); } @@ -59,24 +67,34 @@ ?> --EXPECTF-- *** Testing tempnam() with invalid/non-existing directory names *** +-- Iteration 0 -- +File name is => %s%et%s +File permissions are => 100666 +File created in => temp dir -- Iteration 1 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir -- Iteration 2 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir -- Iteration 3 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir -- Iteration 4 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir -- Iteration 5 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir -- Iteration 6 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir -- Iteration 7 -- Warning: tempnam() expects parameter 1 to be string, array given in %s on line %d @@ -84,10 +102,13 @@ Warning: unlink(): No such file or directory in %s on line %d -- Iteration 8 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir -- Iteration 9 -- -File name is => %s +File name is => %s%et%s File permissions are => 100666 +File created in => temp dir *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk.phpt?r1=1.1.2.4&r2=1.1.2.4.2.1&diff_format=u Index: php-src/ext/standard/tests/file/disk.phpt diff -u php-src/ext/standard/tests/file/disk.phpt:1.1.2.4 php-src/ext/standard/tests/file/disk.phpt:1.1.2.4.2.1 --- php-src/ext/standard/tests/file/disk.phpt:1.1.2.4 Thu Apr 26 23:30:00 2007 +++ php-src/ext/standard/tests/file/disk.phpt Wed Nov 26 10:10:16 2008 @@ -37,8 +37,8 @@ Warning: disk_total_space(): No such file or directory in %s on line %d bool(false) -float(%d) -float(%d) +float(%f) +float(%f) Warning: disk_free_space(): No such file or directory in %s on line %d bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation2-win32.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation2-win32.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation2-win32.phpt:1.1.2.2 php-src/ext/standard/tests/file/tempnam_variation2-win32.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/file/tempnam_variation2-win32.phpt:1.1.2.2 Fri Aug 10 12:11:46 2007 +++ php-src/ext/standard/tests/file/tempnam_variation2-win32.phpt Wed Nov 26 10:10:16 2008 @@ -1,9 +1,9 @@ --TEST-- -Test tempnam() function: usage variations - relative paths +Test tempnam() function: usage variations - various absolute and relative paths --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") - die("skip Run only on Windows"); + die("skip Only valid for Windows"); ?> --FILE-- <?php @@ -13,7 +13,7 @@ /* Creating unique files in various dirs by passing relative paths to $dir arg */ -echo "*** Testing tempnam() with relative paths ***\n"; +echo "*** Testing tempnam() with absolute and relative paths ***\n"; $dir_name = dirname(__FILE__)."/tempnam_variation2"; mkdir($dir_name); $dir_path = $dir_name."/tempnam_variation2_sub"; @@ -23,14 +23,24 @@ chdir(dirname(__FILE__)); $dir_paths = array( + // absolute paths "$dir_path", "$dir_path/", "$dir_path/..", "$dir_path//../", "$dir_path/../.././tempnam_variation2", "$dir_path/..///tempnam_variation2_sub//..//../tempnam_variation2", + "$dir_path/BADDIR", + + + // relative paths ".", - "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub" + "tempname_variation2", + "tempname_variation2/", + "tempnam_variation2/tempnam_variation2_sub", + "tempnam_variation2//tempnam_variation2_sub", + "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub", + "BADDIR", ); for($i = 0; $i<count($dir_paths); $i++) { @@ -47,10 +57,28 @@ echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; + + echo "File created in => "; + $file_dir = dirname($file_name); + $dir_req = $dir_paths[$i]; + + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { + echo "temp dir\n"; + } + else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { + echo "directory specified\n"; + } + else { + echo "unknown location\n"; + } + + } - else + else { echo "-- File is not created --"; - unlink($file_name); + } + + unlink($file_name); } chdir($old_dir_path); @@ -60,38 +88,76 @@ echo "\n*** Done ***\n"; ?> --EXPECTF-- -*** Testing tempnam() with relative paths *** +*** Testing tempnam() with absolute and relative paths *** -- Iteration 1 -- -File name is => %s +File name is => %s\tempnam_variation2\tempnam_variation2_sub\t%s File permissions are => 100666 +File created in => directory specified -- Iteration 2 -- -File name is => %s +File name is => %s\tempnam_variation2\tempnam_variation2_sub\t%s File permissions are => 100666 +File created in => directory specified -- Iteration 3 -- -File name is => %s +File name is => %s\tempnam_variation2\t%s File permissions are => 100666 +File created in => directory specified -- Iteration 4 -- -File name is => %s +File name is => %s\tempnam_variation2\t%s File permissions are => 100666 +File created in => directory specified -- Iteration 5 -- -File name is => %s +File name is => %s\tempnam_variation2\t%s File permissions are => 100666 +File created in => directory specified -- Iteration 6 -- -File name is => %s +File name is => %s\tempnam_variation2\t%s File permissions are => 100666 +File created in => directory specified -- Iteration 7 -- -File name is => %s +File name is => %s\t%s File permissions are => 100666 +File created in => temp dir -- Iteration 8 -- -File name is => %s +File name is => %s\t%s +File permissions are => 100666 +File created in => directory specified + +-- Iteration 9 -- +File name is => %s\t%s +File permissions are => 100666 +File created in => temp dir + +-- Iteration 10 -- +File name is => %s\t%s +File permissions are => 100666 +File created in => temp dir + +-- Iteration 11 -- +File name is => %s\tempnam_variation2\tempnam_variation2_sub\t%s +File permissions are => 100666 +File created in => directory specified + +-- Iteration 12 -- +File name is => %s\tempnam_variation2\tempnam_variation2_sub\t%s +File permissions are => 100666 +File created in => directory specified + +-- Iteration 13 -- +File name is => %s\tempnam_variation2\tempnam_variation2_sub\t%s +File permissions are => 100666 +File created in => directory specified + +-- Iteration 14 -- +File name is => %s\t%s File permissions are => 100666 +File created in => temp dir -*** Done *** +*** Done *** \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/flock_error.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/file/flock_error.phpt diff -u php-src/ext/standard/tests/file/flock_error.phpt:1.1.2.1 php-src/ext/standard/tests/file/flock_error.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/file/flock_error.phpt:1.1.2.1 Fri May 25 13:44:23 2007 +++ php-src/ext/standard/tests/file/flock_error.phpt Wed Nov 26 10:10:16 2008 @@ -94,7 +94,7 @@ Warning: flock() expects parameter 2 to be long, string given in %s on line %d NULL -Warning: flock(): 6 is not a valid stream resource in %s on line %d +Warning: flock(): %d is not a valid stream resource in %s on line %d bool(false) Warning: flock() expects parameter 1 to be resource, string given in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation7.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation7.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation7.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/tempnam_variation7.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/tempnam_variation7.phpt:1.1.2.2.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/tempnam_variation7.phpt Wed Nov 26 10:10:17 2008 @@ -3,7 +3,7 @@ --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == "WIN") - die("skip DO not run on Windows"); + die("skip Do not run on Windows"); ?> --FILE-- <?php @@ -15,8 +15,6 @@ hence the unique files will be created in temporary dir */ echo "*** Testing tempnam() with invalid/non-existing directory names ***\n"; -$file_path = dirname(__FILE__); - /* An array of names, which will be passed as a dir name */ $names_arr = array( /* Invalid args */ @@ -26,7 +24,7 @@ NULL, "", " ", - "/0", + "\0", array(), /* Non-existing dirs */ @@ -35,7 +33,7 @@ ); -for( $i=1; $i<count($names_arr); $i++ ) { +for( $i=0; $i<count($names_arr); $i++ ) { echo "-- Iteration $i --\n"; $file_name = tempnam($names_arr[$i], "tempnam_variation3.tmp"); @@ -48,9 +46,21 @@ echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; + + echo "File created in => "; + $file_dir = dirname($file_name); + + if (realpath($file_dir) == realpath(sys_get_temp_dir())) { + echo "temp dir\n"; + } + else { + echo "unknown location\n"; + } + } - else + else { echo "-- File is not created --\n"; + } unlink($file_name); } @@ -59,24 +69,34 @@ ?> --EXPECTF-- *** Testing tempnam() with invalid/non-existing directory names *** +-- Iteration 0 -- +File name is => %s%etempnam_variation3.tmp%s +File permissions are => 100600 +File created in => temp dir -- Iteration 1 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 2 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 3 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 4 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 5 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 6 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 7 -- Warning: tempnam() expects parameter 1 to be string, array given in %s on line %d @@ -84,10 +104,13 @@ Warning: unlink(): No such file or directory in %s on line %d -- Iteration 8 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 9 -- -File name is => %s +File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 +File created in => temp dir *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk_total_space_basic.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/disk_total_space_basic.phpt diff -u php-src/ext/standard/tests/file/disk_total_space_basic.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/disk_total_space_basic.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/disk_total_space_basic.phpt:1.1.2.2.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/disk_total_space_basic.phpt Wed Nov 26 10:10:17 2008 @@ -4,31 +4,31 @@ <?php /* * Prototype: float disk_total_space( string $directory ); - * Description: given a string containing a directory, this function will - * return the total number of bytes on the corresponding filesyatem - * or disk partition. + * Description: given a string containing a directory, this + * function will return the total number of bytes + * on the corresponding filesyatem or disk partition. */ $file_path = dirname(__FILE__); -echo "*** Testing with normal directory ***\n"; +echo "*** Testing with existing directory ***\n"; var_dump( disk_total_space($file_path) ); echo "*** Testing with newly created directory ***\n"; -$dir = "/disk_total_space"; +mkdir($file_path."/disk_total_space"); +var_dump( disk_total_space($file_path."/disk_total_space") ); -mkdir($file_path.$dir); -var_dump( disk_total_space($file_path.$dir) ); -$fh = fopen($file_path.$dir."/disk_total_space.tmp", "w"); -fwrite($fh, (binary)"Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data"); +$fh = fopen($file_path."/disk_total_space/disk_total_space.tmp", "w"); +fwrite($fh, "Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data Garbage Data"); fclose($fh); -echo"\nTotal Space after writing to a file\n"; -var_dump( disk_total_space($file_path.$dir) ); +echo" \n Total Space after writing to a file\n"; +var_dump( disk_total_space($file_path."/disk_total_space") ); -echo"\n-- Done --"; +echo"\n--- Done ---"; ?> + --CLEAN-- <?php $file_path = dirname(__FILE__); @@ -37,12 +37,12 @@ ?> --EXPECTF-- -*** Testing with normal directory *** -float(%d) +*** Testing with existing directory *** +float(%f) *** Testing with newly created directory *** -float(%d) - -Total Space after writing to a file -float(%d) +float(%f) + + Total Space after writing to a file +float(%f) --- Done -- +--- Done --- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fread_error.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fread_error.phpt diff -u php-src/ext/standard/tests/file/fread_error.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/fread_error.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/fread_error.phpt:1.1.2.1.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fread_error.phpt Wed Nov 26 10:10:17 2008 @@ -103,7 +103,7 @@ Notice: Undefined variable: file_content_type in %s on line %d -Warning: fread(): 5 is not a valid stream resource in %s on line %d +Warning: fread(): %d is not a valid stream resource in %s on line %d bool(false) Warning: fread() expects parameter 1 to be resource, null given in %s on line %d @@ -112,3 +112,4 @@ Warning: fclose() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_readable_variation1.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/is_readable_variation1.phpt diff -u php-src/ext/standard/tests/file/is_readable_variation1.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/is_readable_variation1.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/is_readable_variation1.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/is_readable_variation1.phpt Wed Nov 26 10:10:17 2008 @@ -2,8 +2,16 @@ Test is_readable() function: usage variations - diff. file notations --SKIPIF-- <?php -if (substr(PHP_OS, 0, 3) == 'WIN') { - die('skip not for windows'); +if (substr(PHP_OS, 0, 3) != 'WIN') { + // Skip if being run by root (files are always readable, writeable and executable) + $filename = dirname(__FILE__)."/is_readable_root_check.tmp"; + $fp = fopen($filename, 'w'); + fclose($fp); + if(fileowner($filename) == 0) { + unlink ($filename); + die('skip cannot be run as root'); + } + unlink($filename); } ?> --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation13.phpt?r1=1.1.2.2.2.2&r2=1.1.2.2.2.3&diff_format=u Index: php-src/ext/standard/tests/file/copy_variation13.phpt diff -u php-src/ext/standard/tests/file/copy_variation13.phpt:1.1.2.2.2.2 php-src/ext/standard/tests/file/copy_variation13.phpt:1.1.2.2.2.3 --- php-src/ext/standard/tests/file/copy_variation13.phpt:1.1.2.2.2.2 Mon Aug 11 11:52:10 2008 +++ php-src/ext/standard/tests/file/copy_variation13.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,5 @@ --TEST-- -Test copy() function: usage variations - src as dir and dest as an existing file (Bug #42243) +Test copy() function: usage variations - src as dir and dest as an existing file(Bug #42243) --FILE-- <?php /* Prototype: bool copy ( string $source, string $dest ); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt?r1=1.1.2.2.2.2&r2=1.1.2.2.2.3&diff_format=u Index: php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt diff -u php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt:1.1.2.2.2.2 php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt:1.1.2.2.2.3 --- php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt:1.1.2.2.2.2 Tue Nov 6 17:11:57 2007 +++ php-src/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt Wed Nov 26 10:10:17 2008 @@ -5,7 +5,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip no symlinks on Windows'); } -if (PHP_INT_SIZE != 4 ) { +if (PHP_INT_SIZE != 4) { die("skip this test is for 32bit platform only"); } ?> @@ -42,6 +42,7 @@ //invalid arguments var_dump( link(NULL, $linkname) ); // NULL as filename var_dump( link('', $linkname) ); // empty string as filename +var_dump( link(' ', $linkname) ); // space as filename var_dump( link(false, $linkname) ); // boolean false as filename var_dump( link($filename, NULL) ); // NULL as linkname var_dump( link($filename, '') ); // '' as linkname @@ -57,6 +58,7 @@ //invalid arguments var_dump( is_link(NULL) ); // NULL as linkname var_dump( is_link('') ); // empty string as linkname +var_dump( is_link(' ') ); // space as linkname var_dump( is_link(false) ); // boolean false as linkname var_dump( is_link($filename) ); // file given to is_link @@ -75,22 +77,25 @@ Warning: link() expects exactly 2 parameters, 3 given in %s on line %d NULL -Warning: link(): %s in %s on line %d +Warning: link(): No such file or directory in %s on line %d bool(false) -Warning: link(): %s in %s on line %d +Warning: link(): No such file or directory in %s on line %d bool(false) -Warning: link(): %s in %s on line %d +Warning: link(): No such file or directory in %s on line %d bool(false) -Warning: link(): %s in %s on line %d +Warning: link(): No such file or directory in %s on line %d bool(false) -Warning: link(): %s in %s on line %d +Warning: link(): No such file or directory in %s on line %d bool(false) -Warning: link(): %s in %s on line %d +Warning: link(): No such file or directory in %s on line %d +bool(false) + +Warning: link(): No such file or directory in %s on line %d bool(false) *** Testing is_link() for error conditions *** @@ -104,4 +109,6 @@ bool(false) bool(false) bool(false) +bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41655_1.phpt?r1=1.1.4.7&r2=1.1.4.7.2.1&diff_format=u Index: php-src/ext/standard/tests/file/bug41655_1.phpt diff -u php-src/ext/standard/tests/file/bug41655_1.phpt:1.1.4.7 php-src/ext/standard/tests/file/bug41655_1.phpt:1.1.4.7.2.1 --- php-src/ext/standard/tests/file/bug41655_1.phpt:1.1.4.7 Thu Sep 20 13:49:33 2007 +++ php-src/ext/standard/tests/file/bug41655_1.phpt Wed Nov 26 10:10:17 2008 @@ -1,12 +1,15 @@ --TEST-- Bug #41655 (open_basedir bypass via glob()) 1/2 +--CREDITS-- +Dave Kelsey <d_kelsey@uk.ibm.com> --INI-- open_basedir=/tmp --FILE-- <?php - $a=glob("./*.jpeg"); - +$a=glob("./*.jpeg"); +var_dump($a); echo "Done\n"; ?> --EXPECT-- +bool(false) Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation2.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation2.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation2.phpt:1.1.2.2 php-src/ext/standard/tests/file/tempnam_variation2.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/file/tempnam_variation2.phpt:1.1.2.2 Fri Aug 10 12:11:46 2007 +++ php-src/ext/standard/tests/file/tempnam_variation2.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - relative paths +Test tempnam() function: usage variations - various absolute and relative paths --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == "WIN") @@ -13,7 +13,7 @@ /* Creating unique files in various dirs by passing relative paths to $dir arg */ -echo "*** Testing tempnam() with relative paths ***\n"; +echo "*** Testing tempnam() with absolute and relative paths ***\n"; $dir_name = dirname(__FILE__)."/tempnam_variation2"; mkdir($dir_name); $dir_path = $dir_name."/tempnam_variation2_sub"; @@ -23,14 +23,24 @@ chdir(dirname(__FILE__)); $dir_paths = array( + // absolute paths "$dir_path", "$dir_path/", "$dir_path/..", "$dir_path//../", "$dir_path/../.././tempnam_variation2", "$dir_path/..///tempnam_variation2_sub//..//../tempnam_variation2", + "$dir_path/BADDIR", + + + // relative paths ".", - "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub" + "tempname_variation2", + "tempname_variation2/", + "tempnam_variation2/tempnam_variation2_sub", + "tempnam_variation2//tempnam_variation2_sub", + "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub", + "BADDIR", ); for($i = 0; $i<count($dir_paths); $i++) { @@ -47,10 +57,28 @@ echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; + + echo "File created in => "; + $file_dir = dirname($file_name); + $dir_req = $dir_paths[$i]; + + if (realpath($file_dir) == realpath(sys_get_temp_dir())) { + echo "temp dir\n"; + } + else if ($file_dir == realpath($dir_req)) { + echo "directory specified\n"; + } + else { + echo "unknown location\n"; + } + + } - else + else { echo "-- File is not created --"; - unlink($file_name); + } + + unlink($file_name); } chdir($old_dir_path); @@ -60,38 +88,76 @@ echo "\n*** Done ***\n"; ?> --EXPECTF-- -*** Testing tempnam() with relative paths *** +*** Testing tempnam() with absolute and relative paths *** -- Iteration 1 -- -File name is => %s +File name is => %s/tempnam_variation2/tempnam_variation2_sub/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => directory specified -- Iteration 2 -- -File name is => %s +File name is => %s/tempnam_variation2/tempnam_variation2_sub/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => directory specified -- Iteration 3 -- -File name is => %s +File name is => %s/tempnam_variation2/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => directory specified -- Iteration 4 -- -File name is => %s +File name is => %s/tempnam_variation2/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => directory specified -- Iteration 5 -- -File name is => %s +File name is => %s/tempnam_variation2/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => directory specified -- Iteration 6 -- -File name is => %s +File name is => %s/tempnam_variation2/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => directory specified -- Iteration 7 -- -File name is => %s +File name is => %s/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => temp dir -- Iteration 8 -- -File name is => %s +File name is => %s/tempnam_variation2.tmp%s +File permissions are => 100600 +File created in => directory specified + +-- Iteration 9 -- +File name is => %s/tempnam_variation2.tmp%s +File permissions are => 100600 +File created in => temp dir + +-- Iteration 10 -- +File name is => %s/tempnam_variation2.tmp%s +File permissions are => 100600 +File created in => temp dir + +-- Iteration 11 -- +File name is => %s/tempnam_variation2/tempnam_variation2_sub/tempnam_variation2.tmp%s +File permissions are => 100600 +File created in => directory specified + +-- Iteration 12 -- +File name is => %s/tempnam_variation2/tempnam_variation2_sub/tempnam_variation2.tmp%s +File permissions are => 100600 +File created in => directory specified + +-- Iteration 13 -- +File name is => %s/tempnam_variation2/tempnam_variation2_sub/tempnam_variation2.tmp%s +File permissions are => 100600 +File created in => directory specified + +-- Iteration 14 -- +File name is => %s/tempnam_variation2.tmp%s File permissions are => 100600 +File created in => temp dir -*** Done *** +*** Done *** \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt diff -u php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt:1.1.2.2.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt Wed Nov 26 10:10:17 2008 @@ -87,9 +87,10 @@ Warning: rewind() expects parameter 1 to be resource, object given in %s on line %d bool(false) -- Testing rewind() with closed/unset file handle -- -Warning: rewind(): 5 is not a valid stream resource in %s on line %d +Warning: rewind(): %d is not a valid stream resource in %s on line %d bool(false) Warning: rewind() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fpassthru_error.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fpassthru_error.phpt diff -u php-src/ext/standard/tests/file/fpassthru_error.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/fpassthru_error.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/fpassthru_error.phpt:1.1.2.1.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fpassthru_error.phpt Wed Nov 26 10:10:17 2008 @@ -20,6 +20,11 @@ /* No.of args greaer than expected */ var_dump( fpassthru("", "") ); +/* fpassthru on a closed file */ +$h = fopen(__FILE__,'r'); +fclose($h); +fpassthru($h); + echo "\n*** Done ***\n"; ?> @@ -37,4 +42,7 @@ Warning: fpassthru() expects exactly 1 parameter, 2 given in %s on line %d bool(false) +Warning: fpassthru(): 5 is not a valid stream resource in %s on line %d + *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_basic2.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/file/readlink_realpath_basic2.phpt diff -u php-src/ext/standard/tests/file/readlink_realpath_basic2.phpt:1.1.2.1 php-src/ext/standard/tests/file/readlink_realpath_basic2.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/file/readlink_realpath_basic2.phpt:1.1.2.1 Mon Jul 9 17:38:33 2007 +++ php-src/ext/standard/tests/file/readlink_realpath_basic2.phpt Wed Nov 26 10:10:17 2008 @@ -34,9 +34,6 @@ "$file_path/readlink_realpath_basic2//home/test//../test/./readlink_realpath_basic2.tmp", "$file_path/readlink_realpath_basic2/home//../././readlink_realpath_basic2.tmp", - // checking for binary safe - b"$file_path/readlink_realpath_basic2/home/readlink_realpath_basic2.tmp", - /* filenames with invalid path */ "$file_path///readlink_realpath_basic2/home//..//././test//readlink_realpath_basic2.tmp", "$file_path/readlink_realpath_basic2/home/../home/../test/../readlink_realpath_basic2.tmp", @@ -79,14 +76,11 @@ string(%d) "%s/readlink_realpath_basic2/readlink_realpath_basic2.tmp" -- Iteration 5 -- -string(%d) "%s/readlink_realpath_basic2/home/readlink_realpath_basic2.tmp" +bool(false) -- Iteration 6 -- bool(false) -- Iteration 7 -- -bool(false) - --- Iteration 8 -- %s Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt diff -u php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt:1.1.2.2 php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt:1.1.2.2 Wed Sep 12 09:47:35 2007 +++ php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt Wed Nov 26 10:10:17 2008 @@ -39,9 +39,6 @@ "$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1_link.tmp", "$file_path/readlink_realpath_basic1//home/test//../test/./readlink_realpath_basic1_link.tmp", - // checking for binary safe - b"$file_path/readlink_realpath_basic1/home/readlink_realpath_basic1_link.tmp", - /* linknames with invalid linkpath */ "$file_path///readlink_realpath_basic1/home//..//././test//readlink_realpath_basic1_link.tmp", "$file_path/readlink_realpath_basic1/home/../home/../test/../readlink_realpath_basic1_link.tmp", @@ -89,28 +86,24 @@ string(%d) "%s/readlink_realpath_basic1/home/test/readlink_realpath_basic1.tmp" -- Iteration 4 -- -string(%d) "%s/readlink_realpath_basic1/home/readlink_realpath_basic1.tmp" -string(%d) "%s/readlink_realpath_basic1/home/readlink_realpath_basic1.tmp" - --- Iteration 5 -- Warning: readlink(): No such file or directory in %s on line %d bool(false) bool(false) --- Iteration 6 -- +-- Iteration 5 -- Warning: readlink(): No such file or directory in %s on line %d bool(false) bool(false) --- Iteration 7 -- +-- Iteration 6 -- Warning: readlink(): No such file or directory in %s on line %d bool(false) %s --- Iteration 8 -- +-- Iteration 7 -- Warning: readlink(): %s in %s on line %d bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation6.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation6.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation6.phpt:1.1.2.1 php-src/ext/standard/tests/file/tempnam_variation6.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/file/tempnam_variation6.phpt:1.1.2.1 Thu Aug 9 03:34:00 2007 +++ php-src/ext/standard/tests/file/tempnam_variation6.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,10 @@ --TEST-- -Test tempnam() function: usage variations - Using previous unique filename +Test tempnam() function: usage variations - Using previous unique filename +--SKIPIF-- +<?php +if(substr(PHP_OS, 0, 3) == "WIN") + die("skip Do not run on Windows"); +?> --FILE-- <?php /* Prototype: string tempnam ( string $dir, string $prefix ); @@ -20,7 +25,20 @@ echo "File name is => "; print($file_name); echo "\n"; - } + + echo "File created in => "; + $file_dir = dirname($file_name); + + if ($file_dir == sys_get_temp_dir()) { + echo "temp dir\n"; + } + else if ($file_dir == $file_path) { + echo "directory specified\n"; + } + else { + echo "unknown location\n"; + } + } unlink($file_name); } @@ -30,10 +48,13 @@ --EXPECTF-- *** Test tempnam(): by passing previously created filenames *** -- Iteration 1 -- -File name is => %s +File name is => %s%etempnam_variation6.tmp%s +File created in => directory specified -- Iteration 2 -- -File name is => %s +File name is => %s%etempnam_variation6.tmp%s +File created in => directory specified -- Iteration 3 -- -File name is => %s +File name is => %s%etempnam_variation6.tmp%s +File created in => directory specified *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk_total_space_variation.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/disk_total_space_variation.phpt diff -u php-src/ext/standard/tests/file/disk_total_space_variation.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/disk_total_space_variation.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/disk_total_space_variation.phpt:1.1.2.2.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/disk_total_space_variation.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,5 @@ --TEST-- -Testing disk_total_space() functions : Usage Variations. +Test disk_total_space() functions : usage variations --FILE-- <?php /* @@ -18,9 +18,9 @@ $return_value = disk_total_space($file_path); var_dump( is_float($return_value) ); -echo "\n*** Testing with different directory combinations ***"; -$dir = "/disk_total_space"; +echo "\n*** Testing disk_total_space() function with different directory combinations ***"; +$dir = "/disk_total_space"; mkdir($file_path.$dir); $dirs_arr = array( @@ -29,7 +29,7 @@ $file_path."/.".$dir, /* Testing a file trailing slash */ - $file_path."".$dir."/", + $file_path.$dir."/", $file_path."/.".$dir."/", /* Testing file with double trailing slashes */ @@ -44,7 +44,6 @@ ".".chr(0).$file_path.$dir.chr(0) ); - $count = 1; /* loop through to test each element the above array */ foreach($dirs_arr as $dir1) { @@ -53,63 +52,57 @@ $count++; } -echo "*** Testing with Binary Input ***\n"; -var_dump( disk_total_space(b"$file_path") ); - echo"\n--- Done ---"; ?> --CLEAN-- <?php $file_path = dirname(__FILE__); -rmdir($file_path."/disk_total_space"); +$dir = "/disk_total_space"; +rmdir($file_path.$dir); ?> - - --EXPECTF-- *** Testing with a directory *** -float(%d) +float(%f) Testing for the return type *** bool(true) -*** Testing with different directory combinations *** +*** Testing disk_total_space() function with different directory combinations *** -- Iteration 1 -- -float(%d) +float(%f) -- Iteration 2 -- -float(%d) +float(%f) -- Iteration 3 -- -float(%d) +float(%f) -- Iteration 4 -- -float(%d) +float(%f) -- Iteration 5 -- -float(%d) +float(%f) -- Iteration 6 -- -float(%d) +float(%f) -- Iteration 7 -- -float(%d) +float(%f) -- Iteration 8 -- -float(%d) +float(%f) -- Iteration 9 -- -float(%d) +float(%f) -- Iteration 10 -- -float(%d) +float(%f) -- Iteration 11 -- -float(%d) +float(%f) -- Iteration 12 -- -float(%d) -*** Testing with Binary Input *** -float(%d) +float(%f) --- Done --- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/007_error.phpt?r1=1.1.2.1.2.2&r2=1.1.2.1.2.3&diff_format=u Index: php-src/ext/standard/tests/file/007_error.phpt diff -u php-src/ext/standard/tests/file/007_error.phpt:1.1.2.1.2.2 php-src/ext/standard/tests/file/007_error.phpt:1.1.2.1.2.3 --- php-src/ext/standard/tests/file/007_error.phpt:1.1.2.1.2.2 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/007_error.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,7 @@ --TEST-- Test fopen, fclose() & feof() functions: error conditions +--CREDITS-- +Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* @@ -44,7 +46,6 @@ fclose($fp); /* test invalid arguments : non-resources */ -chdir(dirname(__FILE__)); echo "-- Testing fopen(), fclose() & feof() with invalid arguments --\n"; $invalid_args = array ( "string", @@ -78,7 +79,7 @@ Warning: fclose(): 5 is not a valid stream resource in %s on line %d bool(false) -Warning: fclose() expects parameter 1 to be resource, string given %s on line %d +Warning: fclose() expects parameter 1 to be resource, string given in %s on line %d bool(false) Warning: fclose() expects exactly 1 parameter, 0 given in %s on line %d @@ -87,7 +88,7 @@ Warning: feof(): 5 is not a valid stream resource in %s on line %d bool(false) -Warning: feof() expects parameter 1 to be resource, string given %s on line %d +Warning: feof() expects parameter 1 to be resource, string given in %s on line %d bool(false) Warning: feof() expects exactly 1 parameter, 0 given in %s on line %d @@ -178,3 +179,4 @@ Warning: feof() expects parameter 1 to be resource, string given in %s on line %d bool(false) + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation18.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/copy_variation18.phpt diff -u php-src/ext/standard/tests/file/copy_variation18.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/copy_variation18.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/copy_variation18.phpt:1.1.2.1.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/copy_variation18.phpt Wed Nov 26 10:10:17 2008 @@ -16,7 +16,7 @@ echo "*** Test copy() function: stat of file before and after copy ***\n"; $src_file_name = $file_path."/copy_variation18.tmp"; $file_handle = fopen($src_file_name, "w"); -fwrite($file_handle, str_repeat(b"Hello2world...\n", 100)); +fwrite($file_handle, str_repeat("Hello2world...\n", 100)); fclose($file_handle); $dest_file_name = $file_path."/copy_copy_variation18.tmp"; @@ -32,8 +32,13 @@ $stat_after_copy = stat($src_file_name); clearstatcache(); +// compare all stat fields except access time +$stat_keys_to_compare = array("dev", "ino", "mode", "nlink", "uid", "gid", + "rdev", "size", "mtime", "ctime", + "blksize", "blocks"); + echo "Comparing the stats of file before and after copy operation => "; -var_dump( compare_stats($stat_before_copy, $stat_after_copy, $all_stat_keys) ); +var_dump( compare_stats($stat_before_copy, $stat_after_copy, $stat_keys_to_compare) ); echo "*** Done ***\n"; ?> @@ -43,6 +48,7 @@ unlink(dirname(__FILE__)."/copy_copy_variation18.tmp"); unlink(dirname(__FILE__)."/copy_variation18.tmp"); ?> + --EXPECTF-- *** Test copy() function: stat of file before and after copy *** Copy operation => bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_readable_variation3.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/is_readable_variation3.phpt diff -u php-src/ext/standard/tests/file/is_readable_variation3.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/is_readable_variation3.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/is_readable_variation3.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/is_readable_variation3.phpt Wed Nov 26 10:10:17 2008 @@ -2,8 +2,17 @@ Test is_readable() function: usage variations - invalid file names --SKIPIF-- <?php -if (substr(PHP_OS, 0, 3) == 'WIN') { - die('skip not for windows'); +if (substr(PHP_OS, 0, 3) != 'WIN') { + + // Skip if being run by root (files are always readable, writeable and executable) + $filename = dirname(__FILE__)."/is_readable_root_check.tmp"; + $fp = fopen($filename, 'w'); + fclose($fp); + if(fileowner($filename) == 0) { + unlink ($filename); + die('skip cannot be run as root'); + } + unlink($filename); } ?> --FILE-- @@ -27,6 +36,7 @@ TRUE, FALSE, NULL, + " ", @array(), @$file_handle ); @@ -49,8 +59,10 @@ bool(false) bool(false) bool(false) +bool(false) Warning: is_readable() expects parameter 1 to be string, array given in %s on line %d NULL bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch.phpt?r1=1.1.2.3.2.4&r2=1.1.2.3.2.5&diff_format=u Index: php-src/ext/standard/tests/file/touch.phpt diff -u php-src/ext/standard/tests/file/touch.phpt:1.1.2.3.2.4 php-src/ext/standard/tests/file/touch.phpt:1.1.2.3.2.5 --- php-src/ext/standard/tests/file/touch.phpt:1.1.2.3.2.4 Mon Aug 18 09:21:15 2008 +++ php-src/ext/standard/tests/file/touch.phpt Wed Nov 26 10:10:17 2008 @@ -1,8 +1,16 @@ --TEST-- touch() tests +--SKIPIF-- +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. only for Non Windows.'); +} +?> --FILE-- <?php +// This doesn't work for windows, time, atime usage results in very different +// output to linux. This could be a php.net bug on windows or a windows querk. $filename = dirname(__FILE__)."/touch.dat"; var_dump(touch()); @@ -44,6 +52,7 @@ bool(true) int(100) -Warning: touch(): Unable to create file /no/such/file/or/directory because No such file or directory in %s on line %d +Warning: touch(): Unable to create file /no/such/file/or/directory because %s in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation5.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation5.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation5.phpt:1.1.2.1 php-src/ext/standard/tests/file/tempnam_variation5.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/file/tempnam_variation5.phpt:1.1.2.1 Thu Aug 9 03:34:00 2007 +++ php-src/ext/standard/tests/file/tempnam_variation5.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,10 @@ --TEST-- Test tempnam() function: usage variations - existing file +--SKIPIF-- +<?php +if(substr(PHP_OS, 0, 3) == "WIN") + die("skip Do not run on Windows"); +?> --FILE-- <?php /* Prototype: string tempnam ( string $dir, string $prefix ); @@ -13,7 +18,7 @@ echo "*** Test tempnam() function: by passing an existing filename as prefix ***\n"; $dir_name = $file_path."/tempnam_variation6"; mkdir($dir_name); -fopen($dir_name."/tempnam_variation6.tmp", "w"); +$h = fopen($dir_name."/tempnam_variation6.tmp", "w"); for($i=1; $i<=3; $i++) { echo "-- Iteration $i --\n"; @@ -29,6 +34,7 @@ unlink($created_file); } +fclose($h); unlink($dir_name."/tempnam_variation6.tmp"); rmdir($dir_name); @@ -37,10 +43,10 @@ --EXPECTF-- *** Test tempnam() function: by passing an existing filename as prefix *** -- Iteration 1 -- -File name is => %s +File name is => %stempnam_variation6%etempnam_variation6.tmp%s -- Iteration 2 -- -File name is => %s +File name is => %stempnam_variation6%etempnam_variation6.tmp%s -- Iteration 3 -- -File name is => %s +File name is => %stempnam_variation6%etempnam_variation6.tmp%s *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/ftruncate_error.phpt?r1=1.1.2.2.2.2&r2=1.1.2.2.2.3&diff_format=u Index: php-src/ext/standard/tests/file/ftruncate_error.phpt diff -u php-src/ext/standard/tests/file/ftruncate_error.phpt:1.1.2.2.2.2 php-src/ext/standard/tests/file/ftruncate_error.phpt:1.1.2.2.2.3 --- php-src/ext/standard/tests/file/ftruncate_error.phpt:1.1.2.2.2.2 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/ftruncate_error.phpt Wed Nov 26 10:10:17 2008 @@ -11,7 +11,7 @@ $filename = dirname(__FILE__)."/ftruncate_error.tmp"; $file_handle = fopen($filename, "w" ); -fwrite($file_handle, (binary)"Testing ftruncate error conditions \n"); +fwrite($file_handle, "Testing ftruncate error conditions \n"); fflush($file_handle); echo "\n Initial file size = ".filesize($filename)."\n"; @@ -23,12 +23,14 @@ // arguments less than expected numbers var_dump( ftruncate( $file_handle ) ); // check the first size +clearstatcache(); var_dump( filesize($filename) ); echo "-- Testing ftruncate() with more than expected number of arguments --\n"; // more than expected number of arguments var_dump( ftruncate($file_handle, 10, 20) ); -// check the first size +// check the first size +clearstatcache(); var_dump( filesize($filename) ); // test invalid arguments : non-resources @@ -53,14 +55,16 @@ // ftruncate on close file handle fclose($file_handle); var_dump( ftruncate($file_handle,10) ); -// check the first size +// check the first size +clearstatcache(); var_dump( filesize($filename) ); // ftruncate on a file handle which is unset $fp = fopen($filename, "w"); unset($fp); //unset file handle var_dump( ftruncate(@$fp,10)); -// check the first size +// check the first size +clearstatcache(); var_dump( filesize($filename) ); echo "Done\n"; @@ -114,11 +118,12 @@ bool(false) -- Testing ftruncate() with closed/unset file handle -- -Warning: ftruncate(): 5 is not a valid stream resource in %s on line %d +Warning: ftruncate(): %d is not a valid stream resource in %s on line %d bool(false) int(36) Warning: ftruncate() expects parameter 1 to be resource, null given in %s on line %d bool(false) -int(36) +int(0) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk_free_space_basic.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/disk_free_space_basic.phpt diff -u php-src/ext/standard/tests/file/disk_free_space_basic.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/disk_free_space_basic.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/disk_free_space_basic.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/disk_free_space_basic.phpt Wed Nov 26 10:10:17 2008 @@ -7,27 +7,26 @@ /* * Prototype: float disk_free_space( string directory ) * Description: Given a string containing a directory, this function - * will return the number of bytes available on the corresponding - * filesystem or disk partition + * will return the number of bytes available on the corresponding + * filesystem or disk partition */ $file_path = dirname(__FILE__); +include($file_path."/file.inc"); echo "*** Testing with existing directory ***\n"; var_dump( disk_free_space($file_path) ); var_dump( diskfreespace($file_path) ); +$dir = "/disk_free_space"; echo "*** Testing with newly created directory ***\n"; -$dir = "/disk_free_space"; mkdir($file_path.$dir); echo" \n Free Space before writing to a file\n"; $space1 = disk_free_space($file_path.$dir); -var_dump( $space1 ); +var_dump($space1); -$fh = fopen($file_path.$dir."/disk_free_space.tmp", "a"); -for( $i=1; $i<=1000; $i++) -fwrite($fh, (binary)"x"); -fclose($fh); +fill_buffer($buffer, "text", 3000000); +file_put_contents($file_path.$dir."/disk_free_space.tmp", $buffer); echo "\n Free Space after writing to a file\n"; $space2 = disk_free_space($file_path.$dir); @@ -38,33 +37,29 @@ else echo "\n Free Space Value Is Incorrect\n"; -echo "*** Testing with Binary Input ***\n"; -var_dump( disk_free_space(b"$file_path") ); - -echo"\n--- Done ---"; +echo"\n-- Done --"; ?> --CLEAN-- <?php $file_path = dirname(__FILE__); -unlink($file_path."/disk_free_space/disk_free_space.tmp"); -rmdir($file_path."/disk_free_space"); +$dir = "/disk_free_space"; +unlink($file_path.$dir."/disk_free_space.tmp"); +rmdir($file_path.$dir); ?> --EXPECTF-- *** Testing with existing directory *** -float(%d) -float(%d) +float(%f) +float(%f) *** Testing with newly created directory *** Free Space before writing to a file -float(%d) +float(%f) Free Space after writing to a file -float(%d) +float(%f) Free Space Value Is Correct -*** Testing with Binary Input *** -float(%d) ---- Done --- +-- Done -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt diff -u php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt Wed Nov 26 10:10:17 2008 @@ -2,8 +2,8 @@ Test popen() and pclose function: error conditions --SKIPIF-- <?php -if(substr(PHP_OS, 0, 3) != 'Sun' ) - die("skip Only Valid for Sun Solaris"); +if( substr(PHP_OS, 0, 3) != 'Sun') + die("skip Only valid for Sun Solaris"); ?> --FILE-- @@ -35,13 +35,13 @@ --EXPECTF-- *** Testing for error conditions *** -Warning: popen() expects exactly 2 parameters, 0 given in %s on line %d +Warning: Wrong parameter count for popen() in %s on line %d NULL -Warning: popen() expects exactly 2 parameters, 1 given in %s on line %d +Warning: Wrong parameter count for popen() in %s on line %d NULL -resource(%d) of type (stream) sh: abc.txt: not found +resource(%d) of type (stream) Warning: Wrong parameter count for pclose() in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_dir_variation3.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/is_dir_variation3.phpt diff -u php-src/ext/standard/tests/file/is_dir_variation3.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/is_dir_variation3.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/is_dir_variation3.phpt:1.1.2.2.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/is_dir_variation3.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,5 @@ --TEST-- -Test is_dir() function: usage variations - invalid arguments +Test is_dir() function: usage variations - invalid arguments --FILE-- <?php /* Prototype: bool is_dir ( string $dirname ); @@ -18,9 +18,10 @@ TRUE, FALSE, NULL, + " ", $dir_handle, - /* Non-existing dirnames */ + /* scalars */ 0, 1234 ); @@ -39,6 +40,7 @@ bool(false) bool(false) bool(false) +bool(false) Warning: is_dir() expects parameter 1 to be string, resource given in %s on line %d NULL @@ -46,3 +48,4 @@ bool(false) *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fwrite_error.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fwrite_error.phpt diff -u php-src/ext/standard/tests/file/fwrite_error.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/fwrite_error.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/fwrite_error.phpt:1.1.2.1.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fwrite_error.phpt Wed Nov 26 10:10:17 2008 @@ -112,9 +112,10 @@ bool(false) -- Testing fwrite() with closed/unset file handle -- -Warning: fwrite(): 6 is not a valid stream resource in %s on line %d +Warning: fwrite(): %d is not a valid stream resource in %s on line %d bool(false) Warning: fwrite() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation3.phpt?r1=1.1.2.2.2.2&r2=1.1.2.2.2.3&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation3.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation3.phpt:1.1.2.2.2.2 php-src/ext/standard/tests/file/tempnam_variation3.phpt:1.1.2.2.2.3 --- php-src/ext/standard/tests/file/tempnam_variation3.phpt:1.1.2.2.2.2 Thu Nov 8 10:20:01 2007 +++ php-src/ext/standard/tests/file/tempnam_variation3.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - invalid/non-existing file +Test tempnam() function: usage variations - obscure prefixes --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == "WIN") @@ -13,10 +13,11 @@ /* Passing invalid/non-existing args for $prefix */ -echo "*** Testing tempnam() with invalid/non-existing file names ***\n"; -$file_path = dirname(__FILE__); +echo "*** Testing tempnam() with obscure prefixes ***\n"; +$file_path = dirname(__FILE__)."/tempnamVar3"; +mkdir($file_path); -/* An array of names, which will be passed as a file name */ +/* An array of prefixes */ $names_arr = array( /* Invalid args */ -1, @@ -25,16 +26,16 @@ NULL, "", " ", - "/0", + "\0", array(), - /* Non-existing dirs */ + /* prefix with path separator of a non existing directory*/ "/no/such/file/dir", - "php" + "php/php" ); -for( $i=1; $i<count($names_arr); $i++ ) { +for( $i=0; $i<count($names_arr); $i++ ) { echo "-- Iteration $i --\n"; $file_name = tempnam("$file_path", $names_arr[$i]); @@ -47,46 +48,75 @@ echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; + + echo "File created in => "; + $file_dir = dirname($file_name); + + if ($file_dir == sys_get_temp_dir()) { + echo "temp dir\n"; + } + else if ($file_dir == $file_path) { + echo "directory specified\n"; + } + else { + echo "unknown location\n"; + } + } - else + else { echo "-- File is not created --\n"; + } unlink($file_name); } +rmdir($file_path); echo "\n*** Done ***\n"; ?> --EXPECTF-- -*** Testing tempnam() with invalid/non-existing file names *** +*** Testing tempnam() with obscure prefixes *** +-- Iteration 0 -- +File name is => %s/%s +File permissions are => 100600 +File created in => directory specified -- Iteration 1 -- -File name is => %s +File name is => %s/%s File permissions are => 100600 +File created in => directory specified -- Iteration 2 -- -File name is => %s +File name is => %s/%s File permissions are => 100600 +File created in => directory specified -- Iteration 3 -- -File name is => %s +File name is => %s/%s File permissions are => 100600 +File created in => directory specified -- Iteration 4 -- -File name is => %s +File name is => %s/%s File permissions are => 100600 +File created in => directory specified -- Iteration 5 -- -File name is => %s +File name is => %s/%s File permissions are => 100600 +File created in => directory specified -- Iteration 6 -- -File name is => %s +File name is => %s/%s File permissions are => 100600 +File created in => directory specified -- Iteration 7 -- Warning: tempnam() expects parameter 2 to be string, array given in %s on line %d -- File is not created -- -Warning: unlink(): %s in %s on line %d +Warning: unlink(): No such file or directory in %s on line %d -- Iteration 8 -- -File name is => %s +File name is => %s/dir%s File permissions are => 100600 +File created in => directory specified -- Iteration 9 -- -File name is => %s +File name is => %s/php%s File permissions are => 100600 +File created in => directory specified *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgets_error.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fgets_error.phpt diff -u php-src/ext/standard/tests/file/fgets_error.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/fgets_error.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/fgets_error.phpt:1.1.2.1.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fgets_error.phpt Wed Nov 26 10:10:17 2008 @@ -99,9 +99,10 @@ Warning: fgets() expects parameter 1 to be resource, object given in %s on line %d bool(false) -- Testing fgets() with closed/unset file handle -- -Warning: fgets(): 5 is not a valid stream resource in %s on line %d +Warning: fgets(): %d is not a valid stream resource in %s on line %d bool(false) Warning: fgets() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fflush_error.phpt?r1=1.1.2.1.2.2&r2=1.1.2.1.2.3&diff_format=u Index: php-src/ext/standard/tests/file/fflush_error.phpt diff -u php-src/ext/standard/tests/file/fflush_error.phpt:1.1.2.1.2.2 php-src/ext/standard/tests/file/fflush_error.phpt:1.1.2.1.2.3 --- php-src/ext/standard/tests/file/fflush_error.phpt:1.1.2.1.2.2 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fflush_error.phpt Wed Nov 26 10:10:17 2008 @@ -24,9 +24,10 @@ var_dump( fflush($file_handle, $file_handle) ); fclose($file_handle); +fflush($file_handle); // test invalid arguments : non-resources -echo "-- Testing fflush(): with invalid arguments --\n"; +echo "\n-- Testing fflush(): with invalid arguments --\n"; $invalid_args = array ( "string", 10, @@ -41,7 +42,7 @@ echo "-- Iteration $loop_counter --\n"; var_dump( fflush($invalid_args[$loop_counter - 1]) ); } -echo "\n*** Done ***"; +echo "Done\n"; ?> --CLEAN-- @@ -60,6 +61,9 @@ Warning: fflush() expects exactly 1 parameter, 2 given in %s on line %d bool(false) + +Warning: fflush(): %d is not a valid stream resource in %s on line %d + -- Testing fflush(): with invalid arguments -- -- Iteration 1 -- @@ -85,6 +89,5 @@ Warning: fflush() expects parameter 1 to be resource, object given in %s on line %d bool(false) - -*** Done *** +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_writable_variation3.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/is_writable_variation3.phpt diff -u php-src/ext/standard/tests/file/is_writable_variation3.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/is_writable_variation3.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/is_writable_variation3.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/is_writable_variation3.phpt Wed Nov 26 10:10:17 2008 @@ -2,8 +2,16 @@ Test is_writable() and its alias is_writeable() function: usage variations - invalid file names --SKIPIF-- <?php -if (substr(PHP_OS, 0, 3) == 'WIN') { - die('skip.. only on LINUX'); +if (substr(PHP_OS, 0, 3) != 'WIN') { + // Skip if being run by root (files are always readable, writeable and executable) + $filename = dirname(__FILE__)."/is_writable_root_check.tmp"; + $fp = fopen($filename, 'w'); + fclose($fp); + if(fileowner($filename) == 0) { + unlink ($filename); + die('skip cannot be run as root'); + } + unlink($filename); } ?> --FILE-- @@ -26,6 +34,7 @@ TRUE, FALSE, NULL, + " ", @array(), @$file_handle ); @@ -55,6 +64,8 @@ bool(false) bool(false) bool(false) +bool(false) +bool(false) Warning: is_writable() expects parameter 1 to be string, array given in %s on line %d NULL @@ -64,3 +75,4 @@ bool(false) bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_dir_basic.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u Index: php-src/ext/standard/tests/file/fseek_dir_basic.phpt diff -u php-src/ext/standard/tests/file/fseek_dir_basic.phpt:1.1.4.3 php-src/ext/standard/tests/file/fseek_dir_basic.phpt:1.1.4.4 --- php-src/ext/standard/tests/file/fseek_dir_basic.phpt:1.1.4.3 Thu Mar 27 10:45:03 2008 +++ php-src/ext/standard/tests/file/fseek_dir_basic.phpt Wed Nov 26 10:10:17 2008 @@ -42,7 +42,7 @@ ?> --EXPECTF-- call readdir(): -resource(12) of type (stream) +resource(%d) of type (stream) array(6) { [0]=> bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filesize_variation1.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/file/filesize_variation1.phpt diff -u php-src/ext/standard/tests/file/filesize_variation1.phpt:1.1.2.1 php-src/ext/standard/tests/file/filesize_variation1.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/file/filesize_variation1.phpt:1.1.2.1 Tue Jul 3 07:10:01 2007 +++ php-src/ext/standard/tests/file/filesize_variation1.phpt Wed Nov 26 10:10:17 2008 @@ -3,7 +3,7 @@ --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { - die('skip only valid for Linux'); + die('skip Not valid on Windows'); } --FILE-- <?php @@ -32,14 +32,14 @@ --EXPECTF-- *** Testing filesize(): usage variations *** *** Checking filesize() with different size of files *** -int(1024) -int(1025024) -int(2049024) -int(3073024) -int(4097024) -int(5121024) -int(6145024) -int(7169024) -int(8193024) -int(9217024) +int(%d) +int(%d) +int(%d) +int(%d) +int(%d) +int(%d) +int(%d) +int(%d) +int(%d) +int(%d) Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_file_variation4.phpt?r1=1.1.2.5&r2=1.1.2.5.2.1&diff_format=u Index: php-src/ext/standard/tests/file/is_file_variation4.phpt diff -u php-src/ext/standard/tests/file/is_file_variation4.phpt:1.1.2.5 php-src/ext/standard/tests/file/is_file_variation4.phpt:1.1.2.5.2.1 --- php-src/ext/standard/tests/file/is_file_variation4.phpt:1.1.2.5 Wed Sep 12 08:27:35 2007 +++ php-src/ext/standard/tests/file/is_file_variation4.phpt Wed Nov 26 10:10:17 2008 @@ -1,5 +1,5 @@ --TEST-- -Test is_file() function: usage variations - diff. path notations (Bug #42027, #42638) +Test is_file() function: usage variations - diff. path notations (Bug #42027) --FILE-- <?php /* Prototype: bool is_file ( string $filename ); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt diff -u php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt:1.1.2.2.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt Wed Nov 26 10:10:17 2008 @@ -91,9 +91,10 @@ Warning: fseek() expects parameter 1 to be resource, object given in %s on line %d bool(false) -- Testing fseek() with closed/unset file handle -- -Warning: fseek(): 5 is not a valid stream resource in %s on line %d +Warning: fseek(): %d is not a valid stream resource in %s on line %d bool(false) Warning: fseek() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgets_variation2.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/fgets_variation2.phpt diff -u php-src/ext/standard/tests/file/fgets_variation2.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/fgets_variation2.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/fgets_variation2.phpt:1.1.2.1.2.1 Thu Jul 3 20:19:26 2008 +++ php-src/ext/standard/tests/file/fgets_variation2.phpt Wed Nov 26 10:10:17 2008 @@ -43,10 +43,10 @@ *** Testing fgets() : usage variations *** -- Testing fgets() with closed handle -- -Warning: fgets(): 6 is not a valid stream resource in %s on line %d +Warning: fgets(): %d is not a valid stream resource in %s on line %d bool(false) -Warning: fgets(): 6 is not a valid stream resource in %s on line %d +Warning: fgets(): %d is not a valid stream resource in %s on line %d bool(false) -- Testing fgets() with unset handle -- @@ -60,3 +60,4 @@ Warning: fgets() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_dir_variation2.phpt?r1=1.1.2.2.2.2&r2=1.1.2.2.2.3&diff_format=u Index: php-src/ext/standard/tests/file/is_dir_variation2.phpt diff -u php-src/ext/standard/tests/file/is_dir_variation2.phpt:1.1.2.2.2.2 php-src/ext/standard/tests/file/is_dir_variation2.phpt:1.1.2.2.2.3 --- php-src/ext/standard/tests/file/is_dir_variation2.phpt:1.1.2.2.2.2 Sun Feb 10 23:37:03 2008 +++ php-src/ext/standard/tests/file/is_dir_variation2.phpt Wed Nov 26 10:10:17 2008 @@ -14,7 +14,7 @@ /* Testing is_dir() with dir, soft & hard link to dir, and with file, soft & hard link to file */ - + $file_path = dirname(__FILE__); echo "*** Testing is_dir() with dir and links to dir ***\n"; @@ -70,7 +70,7 @@ -- With symlink -- bool(true) -- With hardlink -- -Warning: link(): %s in %s on line %d +Warning: link(): %s bool(false) *** Testing is_dir() with file and links to a file *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk_free_space_error.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/disk_free_space_error.phpt diff -u php-src/ext/standard/tests/file/disk_free_space_error.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/disk_free_space_error.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/disk_free_space_error.phpt:1.1.2.1.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/disk_free_space_error.phpt Wed Nov 26 10:10:17 2008 @@ -1,15 +1,15 @@ --TEST-- -Test disk_free_space and its alias diskfreespace() functions : error conditions. +Test disk_free_space and its alias diskfreespace() functions : error conditions --SKIPIF-- <?php -if(substr(PHP_OS, 0, 3) == 'WIN') - die("skip Not valid on Windows"); +if(substr(PHP_OS, 0, 3) == 'WIN' ) + die("skip Not Valid for Windows"); ?> --FILE-- <?php /* * Prototype: float disk_free_space( string directory ) - * Description: Given a string containing a directory, this function will + * Description: Given a string containing a directory, this function will * return the number of bytes available on the corresponding * filesystem or disk partition */ @@ -27,7 +27,7 @@ var_dump( diskfreespace( $file_path."/dir1" )); $fh = fopen( $file_path."/disk_free_space.tmp", "w" ); -fwrite( $fh, (binary)" Garbage data for the temporary file" ); +fwrite( $fh, " Garbage data for the temporary file" ); var_dump( disk_free_space( $file_path."/disk_free_space.tmp" )); // file input instead of directory var_dump( diskfreespace( $file_path."/disk_free_space.tmp" )); fclose($fh); @@ -55,13 +55,12 @@ Warning: diskfreespace() expects exactly 1 parameter, 2 given in %s on line %d NULL -Warning: disk_free_space(): No such file or directory in %s on line %d +Warning: disk_free_space(): %s in %s on line %d bool(false) -Warning: diskfreespace(): No such file or directory in %s on line %d +Warning: diskfreespace(): %s in %s on line %d bool(false) -float(%d) -float(%d) +float(%f) +float(%f) -- Done -- - http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_executable_variation3.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/is_executable_variation3.phpt diff -u php-src/ext/standard/tests/file/is_executable_variation3.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/is_executable_variation3.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/is_executable_variation3.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/is_executable_variation3.phpt Wed Nov 26 10:10:18 2008 @@ -5,6 +5,16 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip not for windows'); } +// Skip if being run by root (files are always readable, writeable and executable) +$filename = dirname(__FILE__)."/is_executable_root_check.tmp"; +$fp = fopen($filename, 'w'); +fclose($fp); +if(fileowner($filename) == 0) { + unlink ($filename); + die('skip cannot be run as root'); +} + +unlink($filename); ?> --FILE-- <?php @@ -27,6 +37,7 @@ TRUE, FALSE, NULL, + " ", @array(), @$file_handle ); @@ -49,8 +60,10 @@ bool(false) bool(false) bool(false) +bool(false) Warning: is_executable() expects parameter 1 to be string, array given in %s on line %d NULL bool(false) Done + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_variation2.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/006_variation2.phpt diff -u php-src/ext/standard/tests/file/006_variation2.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/006_variation2.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/006_variation2.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:19 2007 +++ php-src/ext/standard/tests/file/006_variation2.phpt Wed Nov 26 10:10:18 2008 @@ -11,7 +11,7 @@ fclose($fp); if(fileowner($filename) == 0) { unlink ($filename); - die('skip cannot be run as root'); + die('skip...cannot be run as root\n'); } unlink($filename); @@ -94,93 +94,94 @@ *** Testing fileperms(), chmod() with miscellaneous permissions *** -- Iteration 1 -- bool(true) -107777 +%d bool(true) -47777 +%d -- Iteration 2 -- bool(true) -100000 +%d bool(true) -40000 +%d -- Iteration 3 -- bool(true) -101000 +%d bool(true) -41000 +%d -- Iteration 4 -- bool(true) -101111 +%d bool(true) -41111 +%d -- Iteration 5 -- bool(true) -107001 +%d bool(true) -47001 +%d -- Iteration 6 -- bool(true) -100001 +%d bool(true) -40001 +%d -- Iteration 7 -- bool(true) -101411 +%d bool(true) -41411 +%d -- Iteration 8 -- bool(true) -107141 +%d bool(true) -47141 +%d -- Iteration 9 -- bool(true) -100637 +%d bool(true) -40637 +%d -- Iteration 10 -- bool(true) -103567 +%d bool(true) -43567 +%d -- Iteration 11 -- bool(true) -103567 +%d bool(true) -43567 +%d -- Iteration 12 -- Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -103567 +%d Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -43567 +%d -- Iteration 13 -- Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -103567 +%d Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -43567 +%d -- Iteration 14 -- Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -103567 +%d Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -43567 +%d -- Iteration 15 -- Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -103567 +%d Warning: chmod() expects parameter 2 to be long, string given in %s on line %d NULL -43567 +%d *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/flock_variation.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/flock_variation.phpt diff -u php-src/ext/standard/tests/file/flock_variation.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/flock_variation.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/flock_variation.phpt:1.1.2.1.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/flock_variation.phpt Wed Nov 26 10:10:19 2008 @@ -1,371 +1,45 @@ --TEST-- -Test flock() function: Variations +Test flock() function: usage variations --FILE-- <?php /* Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]); -Description: PHP supports a portable way of locking complete files - in an advisory way +Description: PHP supports a portable way of locking complete files in an advisory way */ -echo "*** Testing flock() fun with the various operation and - wouldblock values ***\n"; -$file = dirname(__FILE__)."/flock.tmp"; -$fp = fopen($file, "w"); +echo "*** Test flock() function: with the operations given as numeric values ***\n"; -/* array of operatons */ -$operations = array( - LOCK_SH, - LOCK_EX, - LOCK_SH|LOCK_NB, - LOCK_EX|LOCK_NB, - LOCK_SH|LOCK_EX, - LOCK_UN, - 1, - 2, - 2.234, - TRUE -); +$filename = dirname(__FILE__)."/flock_variation.tmp"; +$file_handle = fopen($filename, "w"); -/* array of wouldblocks */ -$wouldblocks = array( - 0, - 1, - 2, - 1.234, - TRUE, - FALSE, - NULL, - array(1,2,3), - array(), - "string", - "", - /* binary input */ - b"string", - b"", - "\0" +/* array of operations */ +$operations = array( + 1, //nothing but LOCK_SH + 2, //nothing but LOCK_EX + 2.234, //nothing but LOCK_EX + TRUE //nothing but LOCK_SH ); $i = 0; foreach($operations as $operation) { - echo "--- Outer iteration $i ---\n"; - var_dump(flock($fp, $operation)); - $j = 0; - foreach($wouldblocks as $wouldblock) { - echo "-- Inner iteration $j in $i --\n"; - var_dump(flock($fp, $operation, $wouldblock)); - $j++; - } + var_dump(flock($file_handle, $operation)); + var_dump(flock($file_handle, 3)); //nothing but LOCK_UN $i++; } -fclose($fp); -@unlink($file); +fclose($file_handle); +unlink($filename); -echo "\n*** Done ***\n"; +echo "*** Done ***\n"; ?> --EXPECTF-- -*** Testing flock() fun with the various operation and - wouldblock values *** ---- Outer iteration 0 --- -bool(true) --- Inner iteration 0 in 0 -- -bool(true) --- Inner iteration 1 in 0 -- -bool(true) --- Inner iteration 2 in 0 -- -bool(true) --- Inner iteration 3 in 0 -- -bool(true) --- Inner iteration 4 in 0 -- -bool(true) --- Inner iteration 5 in 0 -- -bool(true) --- Inner iteration 6 in 0 -- -bool(true) --- Inner iteration 7 in 0 -- -bool(true) --- Inner iteration 8 in 0 -- -bool(true) --- Inner iteration 9 in 0 -- -bool(true) --- Inner iteration 10 in 0 -- -bool(true) --- Inner iteration 11 in 0 -- -bool(true) --- Inner iteration 12 in 0 -- -bool(true) --- Inner iteration 13 in 0 -- -bool(true) ---- Outer iteration 1 --- -bool(true) --- Inner iteration 0 in 1 -- -bool(true) --- Inner iteration 1 in 1 -- -bool(true) --- Inner iteration 2 in 1 -- -bool(true) --- Inner iteration 3 in 1 -- -bool(true) --- Inner iteration 4 in 1 -- -bool(true) --- Inner iteration 5 in 1 -- -bool(true) --- Inner iteration 6 in 1 -- -bool(true) --- Inner iteration 7 in 1 -- -bool(true) --- Inner iteration 8 in 1 -- -bool(true) --- Inner iteration 9 in 1 -- -bool(true) --- Inner iteration 10 in 1 -- -bool(true) --- Inner iteration 11 in 1 -- -bool(true) --- Inner iteration 12 in 1 -- -bool(true) --- Inner iteration 13 in 1 -- -bool(true) ---- Outer iteration 2 --- -bool(true) --- Inner iteration 0 in 2 -- -bool(true) --- Inner iteration 1 in 2 -- -bool(true) --- Inner iteration 2 in 2 -- -bool(true) --- Inner iteration 3 in 2 -- -bool(true) --- Inner iteration 4 in 2 -- -bool(true) --- Inner iteration 5 in 2 -- -bool(true) --- Inner iteration 6 in 2 -- -bool(true) --- Inner iteration 7 in 2 -- -bool(true) --- Inner iteration 8 in 2 -- -bool(true) --- Inner iteration 9 in 2 -- -bool(true) --- Inner iteration 10 in 2 -- -bool(true) --- Inner iteration 11 in 2 -- -bool(true) --- Inner iteration 12 in 2 -- -bool(true) --- Inner iteration 13 in 2 -- -bool(true) ---- Outer iteration 3 --- -bool(true) --- Inner iteration 0 in 3 -- -bool(true) --- Inner iteration 1 in 3 -- -bool(true) --- Inner iteration 2 in 3 -- -bool(true) --- Inner iteration 3 in 3 -- -bool(true) --- Inner iteration 4 in 3 -- -bool(true) --- Inner iteration 5 in 3 -- -bool(true) --- Inner iteration 6 in 3 -- -bool(true) --- Inner iteration 7 in 3 -- -bool(true) --- Inner iteration 8 in 3 -- -bool(true) --- Inner iteration 9 in 3 -- -bool(true) --- Inner iteration 10 in 3 -- -bool(true) --- Inner iteration 11 in 3 -- -bool(true) --- Inner iteration 12 in 3 -- -bool(true) --- Inner iteration 13 in 3 -- -bool(true) ---- Outer iteration 4 --- -bool(true) --- Inner iteration 0 in 4 -- -bool(true) --- Inner iteration 1 in 4 -- -bool(true) --- Inner iteration 2 in 4 -- -bool(true) --- Inner iteration 3 in 4 -- -bool(true) --- Inner iteration 4 in 4 -- -bool(true) --- Inner iteration 5 in 4 -- -bool(true) --- Inner iteration 6 in 4 -- -bool(true) --- Inner iteration 7 in 4 -- -bool(true) --- Inner iteration 8 in 4 -- -bool(true) --- Inner iteration 9 in 4 -- +*** Test flock() function: with the operations given as numeric values *** bool(true) --- Inner iteration 10 in 4 -- bool(true) --- Inner iteration 11 in 4 -- bool(true) --- Inner iteration 12 in 4 -- bool(true) --- Inner iteration 13 in 4 -- bool(true) ---- Outer iteration 5 --- bool(true) --- Inner iteration 0 in 5 -- bool(true) --- Inner iteration 1 in 5 -- bool(true) --- Inner iteration 2 in 5 -- -bool(true) --- Inner iteration 3 in 5 -- -bool(true) --- Inner iteration 4 in 5 -- -bool(true) --- Inner iteration 5 in 5 -- -bool(true) --- Inner iteration 6 in 5 -- -bool(true) --- Inner iteration 7 in 5 -- -bool(true) --- Inner iteration 8 in 5 -- -bool(true) --- Inner iteration 9 in 5 -- -bool(true) --- Inner iteration 10 in 5 -- -bool(true) --- Inner iteration 11 in 5 -- -bool(true) --- Inner iteration 12 in 5 -- -bool(true) --- Inner iteration 13 in 5 -- -bool(true) ---- Outer iteration 6 --- -bool(true) --- Inner iteration 0 in 6 -- -bool(true) --- Inner iteration 1 in 6 -- -bool(true) --- Inner iteration 2 in 6 -- -bool(true) --- Inner iteration 3 in 6 -- -bool(true) --- Inner iteration 4 in 6 -- -bool(true) --- Inner iteration 5 in 6 -- -bool(true) --- Inner iteration 6 in 6 -- -bool(true) --- Inner iteration 7 in 6 -- -bool(true) --- Inner iteration 8 in 6 -- -bool(true) --- Inner iteration 9 in 6 -- -bool(true) --- Inner iteration 10 in 6 -- -bool(true) --- Inner iteration 11 in 6 -- -bool(true) --- Inner iteration 12 in 6 -- -bool(true) --- Inner iteration 13 in 6 -- -bool(true) ---- Outer iteration 7 --- -bool(true) --- Inner iteration 0 in 7 -- -bool(true) --- Inner iteration 1 in 7 -- -bool(true) --- Inner iteration 2 in 7 -- -bool(true) --- Inner iteration 3 in 7 -- -bool(true) --- Inner iteration 4 in 7 -- -bool(true) --- Inner iteration 5 in 7 -- -bool(true) --- Inner iteration 6 in 7 -- -bool(true) --- Inner iteration 7 in 7 -- -bool(true) --- Inner iteration 8 in 7 -- -bool(true) --- Inner iteration 9 in 7 -- -bool(true) --- Inner iteration 10 in 7 -- -bool(true) --- Inner iteration 11 in 7 -- -bool(true) --- Inner iteration 12 in 7 -- -bool(true) --- Inner iteration 13 in 7 -- -bool(true) ---- Outer iteration 8 --- -bool(true) --- Inner iteration 0 in 8 -- -bool(true) --- Inner iteration 1 in 8 -- -bool(true) --- Inner iteration 2 in 8 -- -bool(true) --- Inner iteration 3 in 8 -- -bool(true) --- Inner iteration 4 in 8 -- -bool(true) --- Inner iteration 5 in 8 -- -bool(true) --- Inner iteration 6 in 8 -- -bool(true) --- Inner iteration 7 in 8 -- -bool(true) --- Inner iteration 8 in 8 -- -bool(true) --- Inner iteration 9 in 8 -- -bool(true) --- Inner iteration 10 in 8 -- -bool(true) --- Inner iteration 11 in 8 -- -bool(true) --- Inner iteration 12 in 8 -- -bool(true) --- Inner iteration 13 in 8 -- -bool(true) ---- Outer iteration 9 --- -bool(true) --- Inner iteration 0 in 9 -- -bool(true) --- Inner iteration 1 in 9 -- -bool(true) --- Inner iteration 2 in 9 -- -bool(true) --- Inner iteration 3 in 9 -- -bool(true) --- Inner iteration 4 in 9 -- -bool(true) --- Inner iteration 5 in 9 -- -bool(true) --- Inner iteration 6 in 9 -- -bool(true) --- Inner iteration 7 in 9 -- -bool(true) --- Inner iteration 8 in 9 -- -bool(true) --- Inner iteration 9 in 9 -- -bool(true) --- Inner iteration 10 in 9 -- -bool(true) --- Inner iteration 11 in 9 -- -bool(true) --- Inner iteration 12 in 9 -- -bool(true) --- Inner iteration 13 in 9 -- -bool(true) - *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation4.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation4.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation4.phpt:1.1.2.1 php-src/ext/standard/tests/file/tempnam_variation4.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/file/tempnam_variation4.phpt:1.1.2.1 Thu Aug 9 03:34:00 2007 +++ php-src/ext/standard/tests/file/tempnam_variation4.phpt Wed Nov 26 10:10:19 2008 @@ -20,22 +20,34 @@ echo "*** Testing tempnam() with dir of permissions from 0000 to 0777 ***\n"; $file_path = dirname(__FILE__); $dir_name = $file_path."/tempnam_variation4"; +$prefix = "tempnamVar4."; + mkdir($dir_name); -for($mode = 0000; $mode<=0777; $mode++) { +for($mode = 0000; $mode <= 0777; $mode++) { echo "-- dir perms "; printf("%o", $mode); echo " --\n"; chmod($dir_name, $mode); - $file_name = tempnam($dir_name, "tempnam_variation4.tmp"); + $file_name = tempnam($dir_name, $prefix); if(file_exists($file_name) ) { - print($file_name); - echo "\n"; + if (realpath(dirname($file_name)) == realpath(sys_get_temp_dir())) { + $msg = " created in temp directory"; + } + else if (dirname($file_name) == $dir_name) { + $msg = " created in requested directory"; + } + else { + $msg = " created in unexpected directory"; + } + + echo basename($file_name).$msg."\n"; + unlink($file_name); + } + else { + print("FAILED: File is not created\n"); } - else - print("-- File is not created --"); - unlink($file_name); } rmdir($dir_name); @@ -45,1027 +57,1027 @@ --EXPECTF-- *** Testing tempnam() with dir of permissions from 0000 to 0777 *** -- dir perms 0 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 1 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 2 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 3 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 4 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 5 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 6 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 7 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 10 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 11 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 12 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 13 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 14 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 15 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 16 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 17 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 20 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 21 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 22 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 23 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 24 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 25 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 26 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 27 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 30 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 31 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 32 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 33 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 34 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 35 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 36 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 37 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 40 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 41 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 42 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 43 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 44 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 45 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 46 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 47 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 50 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 51 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 52 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 53 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 54 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 55 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 56 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 57 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 60 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 61 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 62 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 63 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 64 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 65 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 66 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 67 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 70 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 71 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 72 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 73 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 74 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 75 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 76 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 77 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 100 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 101 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 102 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 103 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 104 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 105 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 106 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 107 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 110 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 111 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 112 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 113 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 114 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 115 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 116 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 117 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 120 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 121 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 122 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 123 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 124 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 125 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 126 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 127 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 130 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 131 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 132 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 133 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 134 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 135 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 136 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 137 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 140 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 141 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 142 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 143 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 144 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 145 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 146 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 147 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 150 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 151 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 152 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 153 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 154 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 155 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 156 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 157 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 160 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 161 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 162 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 163 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 164 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 165 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 166 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 167 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 170 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 171 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 172 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 173 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 174 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 175 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 176 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 177 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 200 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 201 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 202 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 203 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 204 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 205 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 206 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 207 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 210 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 211 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 212 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 213 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 214 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 215 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 216 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 217 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 220 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 221 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 222 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 223 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 224 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 225 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 226 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 227 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 230 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 231 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 232 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 233 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 234 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 235 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 236 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 237 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 240 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 241 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 242 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 243 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 244 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 245 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 246 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 247 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 250 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 251 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 252 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 253 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 254 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 255 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 256 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 257 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 260 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 261 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 262 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 263 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 264 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 265 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 266 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 267 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 270 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 271 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 272 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 273 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 274 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 275 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 276 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 277 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 300 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 301 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 302 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 303 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 304 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 305 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 306 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 307 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 310 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 311 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 312 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 313 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 314 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 315 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 316 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 317 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 320 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 321 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 322 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 323 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 324 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 325 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 326 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 327 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 330 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 331 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 332 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 333 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 334 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 335 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 336 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 337 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 340 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 341 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 342 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 343 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 344 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 345 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 346 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 347 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 350 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 351 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 352 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 353 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 354 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 355 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 356 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 357 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 360 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 361 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 362 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 363 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 364 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 365 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 366 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 367 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 370 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 371 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 372 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 373 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 374 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 375 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 376 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 377 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 400 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 401 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 402 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 403 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 404 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 405 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 406 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 407 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 410 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 411 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 412 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 413 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 414 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 415 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 416 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 417 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 420 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 421 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 422 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 423 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 424 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 425 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 426 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 427 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 430 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 431 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 432 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 433 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 434 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 435 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 436 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 437 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 440 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 441 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 442 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 443 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 444 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 445 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 446 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 447 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 450 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 451 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 452 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 453 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 454 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 455 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 456 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 457 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 460 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 461 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 462 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 463 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 464 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 465 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 466 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 467 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 470 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 471 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 472 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 473 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 474 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 475 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 476 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 477 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 500 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 501 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 502 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 503 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 504 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 505 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 506 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 507 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 510 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 511 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 512 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 513 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 514 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 515 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 516 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 517 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 520 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 521 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 522 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 523 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 524 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 525 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 526 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 527 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 530 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 531 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 532 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 533 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 534 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 535 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 536 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 537 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 540 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 541 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 542 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 543 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 544 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 545 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 546 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 547 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 550 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 551 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 552 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 553 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 554 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 555 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 556 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 557 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 560 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 561 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 562 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 563 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 564 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 565 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 566 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 567 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 570 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 571 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 572 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 573 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 574 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 575 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 576 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 577 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 600 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 601 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 602 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 603 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 604 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 605 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 606 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 607 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 610 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 611 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 612 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 613 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 614 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 615 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 616 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 617 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 620 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 621 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 622 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 623 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 624 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 625 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 626 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 627 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 630 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 631 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 632 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 633 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 634 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 635 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 636 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 637 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 640 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 641 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 642 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 643 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 644 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 645 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 646 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 647 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 650 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 651 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 652 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 653 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 654 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 655 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 656 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 657 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 660 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 661 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 662 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 663 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 664 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 665 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 666 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 667 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 670 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 671 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 672 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 673 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 674 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 675 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 676 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 677 -- -%s +tempnamVar4.%s created in temp directory -- dir perms 700 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 701 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 702 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 703 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 704 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 705 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 706 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 707 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 710 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 711 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 712 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 713 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 714 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 715 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 716 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 717 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 720 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 721 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 722 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 723 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 724 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 725 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 726 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 727 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 730 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 731 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 732 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 733 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 734 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 735 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 736 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 737 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 740 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 741 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 742 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 743 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 744 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 745 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 746 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 747 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 750 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 751 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 752 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 753 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 754 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 755 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 756 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 757 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 760 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 761 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 762 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 763 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 764 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 765 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 766 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 767 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 770 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 771 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 772 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 773 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 774 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 775 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 776 -- -%s +tempnamVar4.%s created in requested directory -- dir perms 777 -- -%s -*** Done *** +tempnamVar4.%s created in requested directory +*** Done *** \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_writable_variation1.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/is_writable_variation1.phpt diff -u php-src/ext/standard/tests/file/is_writable_variation1.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/is_writable_variation1.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/is_writable_variation1.phpt:1.1.2.3.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/is_writable_variation1.phpt Wed Nov 26 10:10:19 2008 @@ -2,8 +2,18 @@ Test is_writable() and its alias is_writeable() function: usage variations - diff. path notations --SKIPIF-- <?php -if (substr(PHP_OS, 0, 3) == 'WIN') { - die('skip.. only on LINUX'); +if (substr(PHP_OS, 0, 3) != 'WIN') { + + // Skip if being run by root (files are always readable, writeable and executable) + $filename = dirname(__FILE__)."/is_writable_root_check.tmp"; + $fp = fopen($filename, 'w'); + fclose($fp); + if(fileowner($filename) == 0) { + unlink ($filename); + die('skip cannot be run as root'); + } + + unlink($filename); } ?> --FILE-- @@ -100,4 +110,4 @@ -- Iteration 11 -- bool(true) bool(true) -Done +Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/001-win32.phpt?r1=1.2.8.1&r2=1.2.8.2&diff_format=u Index: php-src/ext/standard/tests/file/001-win32.phpt diff -u php-src/ext/standard/tests/file/001-win32.phpt:1.2.8.1 php-src/ext/standard/tests/file/001-win32.phpt:1.2.8.2 --- php-src/ext/standard/tests/file/001-win32.phpt:1.2.8.1 Wed May 21 18:56:05 2008 +++ php-src/ext/standard/tests/file/001-win32.phpt Wed Nov 26 10:10:19 2008 @@ -1,5 +1,7 @@ --TEST-- File type functions +--CREDITS-- +Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -10,7 +12,6 @@ <?php chdir(dirname(__FILE__)); @unlink('test.file'); -@unlink('test.link'); if (file_exists('test.file')) { echo "test.file exists\n"; } else { @@ -23,22 +24,11 @@ } else { echo "test.file does not exist\n"; } -sleep (2); -if (file_exists('test.link')) { - echo "test.link exists\n"; -} else { - echo "test.link does not exist\n"; -} if (is_link('test.file')) { echo "test.file is a symlink\n"; } else { echo "test.file is not a symlink\n"; } -if (is_link('test.link')) { - echo "test.link is a symlink\n"; -} else { - echo "test.link is not a symlink\n"; -} if (file_exists('test.file')) { echo "test.file exists\n"; } else { @@ -52,7 +42,6 @@ } } echo "test.file is " . filetype('test.file') . "\n"; -echo "test.link is <" . filetype('test.link') . ">\n"; printf ("test.file permissions are 0%o\n", 0777 & fileperms('test.file')); echo "test.file size is " . filesize('test.file') . "\n"; if (is_writeable('test.file')) { @@ -70,16 +59,6 @@ } else { echo "test.file is not a regular file\n"; } -if (is_file('test.link')) { - echo "test.link is a regular file\n"; -} else { - echo "test.link is not a regular file\n"; -} -if (is_dir('test.link')) { - echo "test.link is a directory\n"; -} else { - echo "test.link is not a directory\n"; -} if (is_dir('../file')) { echo "../file is a directory\n"; } else { @@ -103,25 +82,19 @@ echo "test.file does not exist\n"; } ?> ---EXPECTF-- +--EXPECT-- test.file does not exist test.file exists -test.link does not exist test.file is not a symlink -test.link is not a symlink test.file exists test.file is file - -Warning: filetype(): Lstat failed for test.link in %s -test.link is <> test.file permissions are 0666 test.file size is 0 test.file is writeable test.file is readable test.file is a regular file -test.link is not a regular file -test.link is not a directory ../file is a directory test.file is not a directory test.file does not exist test.file does not exist + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/disk_total_space_error.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/disk_total_space_error.phpt diff -u php-src/ext/standard/tests/file/disk_total_space_error.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/disk_total_space_error.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/disk_total_space_error.phpt:1.1.2.1.2.1 Mon Nov 5 17:43:20 2007 +++ php-src/ext/standard/tests/file/disk_total_space_error.phpt Wed Nov 26 10:10:19 2008 @@ -2,14 +2,14 @@ Test disk_total_space() function : error conditions --SKIPIF-- <?php -if(substr(PHP_OS, 0, 3) == 'WIN') - die("skip Not valid on Windows"); +if(substr(PHP_OS, 0, 3) == 'WIN' ) + die("skip Not Valid for Windows"); ?> --FILE-- <?php /* * Prototype: float disk_total_space( string $directory ); - * Description: given a string containing a directory, this function + * Description: given a string containing a directory, this function * will return the total number of bytes on the corresponding * filesystem or disk partition */ @@ -24,7 +24,7 @@ var_dump( disk_total_space( $file_path."/dir1" )); // Invalid directory $fh = fopen( $file_path."/disk_total_space.tmp", "w" ); -fwrite( $fh, (binary)" Garbage data for the temporary file" ); +fwrite( $fh, " Garbage data for the temporary file" ); var_dump( disk_total_space( $file_path."/disk_total_space.tmp" )); // file input instead of directory fclose($fh); @@ -46,7 +46,6 @@ Warning: disk_total_space(): No such file or directory in %s on line %d bool(false) -float(%d) +float(%f) --- Done --- - http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_error.phpt?r1=1.1.2.3.2.2&r2=1.1.2.3.2.3&diff_format=u Index: php-src/ext/standard/tests/file/006_error.phpt diff -u php-src/ext/standard/tests/file/006_error.phpt:1.1.2.3.2.2 php-src/ext/standard/tests/file/006_error.phpt:1.1.2.3.2.3 --- php-src/ext/standard/tests/file/006_error.phpt:1.1.2.3.2.2 Mon Nov 5 17:43:19 2007 +++ php-src/ext/standard/tests/file/006_error.phpt Wed Nov 26 10:10:19 2008 @@ -11,7 +11,7 @@ fclose($fp); if(fileowner($filename) == 0) { unlink ($filename); - die('skip cannot be run as root'); + die('skip...cannot be run as root\n'); } unlink($filename); @@ -68,13 +68,13 @@ --EXPECTF-- *** Testing error conditions for fileperms(), chmod() *** -Warning: chmod(): %s in %s on line %d +Warning: chmod(): Operation not permitted in %s on line %d bool(false) -100%d44 +%d -Warning: chmod(): %s in %s on line %d +Warning: chmod(): Operation not permitted in %s on line %d bool(false) -40755 +%d Warning: chmod(): No such file or directory in %s on line %d bool(false) @@ -105,3 +105,4 @@ NULL *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/glob_basic.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/file/glob_basic.phpt diff -u php-src/ext/standard/tests/file/glob_basic.phpt:1.1.2.1 php-src/ext/standard/tests/file/glob_basic.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/file/glob_basic.phpt:1.1.2.1 Mon Jul 23 05:22:59 2007 +++ php-src/ext/standard/tests/file/glob_basic.phpt Wed Nov 26 10:10:19 2008 @@ -25,14 +25,19 @@ fclose($fp); // glob() with default arguments -var_dump( glob($dirname."/*") ); -var_dump( glob($dirname."/*.txt") ); -var_dump( glob($dirname."/*.t?t") ); -var_dump( glob($dirname."/*.t*t") ); -var_dump( glob($dirname."/*.?") ); -var_dump( glob($dirname."/*.*") ); +sort_var_dump( glob($dirname."/*") ); +sort_var_dump( glob($dirname."/*.txt") ); +sort_var_dump( glob($dirname."/*.t?t") ); +sort_var_dump( glob($dirname."/*.t*t") ); +sort_var_dump( glob($dirname."/*.?") ); +sort_var_dump( glob($dirname."/*.*") ); echo "Done\n"; + +function sort_var_dump($results) { + sort($results); + var_dump($results); +} ?> --CLEAN-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_file_variation3.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/file/is_file_variation3.phpt diff -u php-src/ext/standard/tests/file/is_file_variation3.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/is_file_variation3.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/is_file_variation3.phpt:1.1.2.2.2.1 Mon Nov 5 17:43:21 2007 +++ php-src/ext/standard/tests/file/is_file_variation3.phpt Wed Nov 26 10:10:19 2008 @@ -1,5 +1,5 @@ --TEST-- -Test is_file() function: usage variations - invalid arguments +Test is_file() function: usage variations - invalid filenames --FILE-- <?php /* Prototype: bool is_file ( string $filename ); @@ -16,17 +16,18 @@ $filenames = array( /* Invalid filenames */ -2.34555, + " ", "", TRUE, FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( is_file($filename) ); @@ -48,6 +49,7 @@ bool(false) bool(false) bool(false) +bool(false) Warning: is_file() expects parameter 1 to be string, resource given in %s on line %d NULL @@ -55,3 +57,4 @@ bool(false) *** Done *** + http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation7-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation7-win32.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation7-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation19.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation19.phpt +++ php-src/ext/standard/tests/file/fopen_variation19.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/unlink_variation8.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/unlink_variation8.phpt +++ php-src/ext/standard/tests/file/unlink_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/basename-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/basename-win32.phpt +++ php-src/ext/standard/tests/file/basename-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation7.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation7.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/mkdir_variation4.phpt +++ php-src/ext/standard/tests/file/mkdir_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fpassthru_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fpassthru_variation1.phpt +++ php-src/ext/standard/tests/file/fpassthru_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/feof_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/feof_basic.phpt +++ php-src/ext/standard/tests/file/feof_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation13.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation13.phpt +++ php-src/ext/standard/tests/file/fopen_variation13.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/unlink_variation7.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/unlink_variation7.phpt +++ php-src/ext/standard/tests/file/unlink_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation3.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation6.phpt +++ php-src/ext/standard/tests/file/fopen_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation15-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation15-win32.phpt +++ php-src/ext/standard/tests/file/fopen_variation15-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation2.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pclose_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pclose_variation1.phpt +++ php-src/ext/standard/tests/file/pclose_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_exists_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_exists_error.phpt +++ php-src/ext/standard/tests/file/file_exists_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/chmod_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/chmod_variation4.phpt +++ php-src/ext/standard/tests/file/chmod_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation1.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/unlink_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/unlink_variation6.phpt +++ php-src/ext/standard/tests/file/unlink_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/basename_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/basename_error.phpt +++ php-src/ext/standard/tests/file/basename_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/unlink_variation8-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/unlink_variation8-win32.phpt +++ php-src/ext/standard/tests/file/unlink_variation8-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation6.phpt +++ php-src/ext/standard/tests/file/readfile_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation5.phpt +++ php-src/ext/standard/tests/file/fopen_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_basic.phpt +++ php-src/ext/standard/tests/file/file_get_contents_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/glob_error_002-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/glob_error_002-win32.phpt +++ php-src/ext/standard/tests/file/glob_error_002-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation3-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation3-win32.phpt +++ php-src/ext/standard/tests/file/touch_variation3-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation11-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation11-win32.phpt +++ php-src/ext/standard/tests/file/fopen_variation11-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation5-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/mkdir_variation5-win32.phpt +++ php-src/ext/standard/tests/file/mkdir_variation5-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rmdir_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rmdir_variation2.phpt +++ php-src/ext/standard/tests/file/rmdir_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileowner_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileowner_variation1.phpt +++ php-src/ext/standard/tests/file/fileowner_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileperms_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileperms_variation3.phpt +++ php-src/ext/standard/tests/file/fileperms_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation7.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation7.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/parse_ini_file_variation1.phpt +++ php-src/ext/standard/tests/file/parse_ini_file_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/mkdir_variation3.phpt +++ php-src/ext/standard/tests/file/mkdir_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation16.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation16.phpt +++ php-src/ext/standard/tests/file/fopen_variation16.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/parse_ini_file_variation5.phpt +++ php-src/ext/standard/tests/file/parse_ini_file_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation5.phpt +++ php-src/ext/standard/tests/file/readfile_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation13.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rename_variation13.phpt +++ php-src/ext/standard/tests/file/rename_variation13.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation10-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation10-win32.phpt +++ php-src/ext/standard/tests/file/readfile_variation10-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filegroup_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/filegroup_variation2.phpt +++ php-src/ext/standard/tests/file/filegroup_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation8-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation8-win32.phpt +++ php-src/ext/standard/tests/file/readfile_variation8-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/005_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/005_variation2.phpt +++ php-src/ext/standard/tests/file/005_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_basic1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pathinfo_basic1.phpt +++ php-src/ext/standard/tests/file/pathinfo_basic1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filegroup_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/filegroup_variation1.phpt +++ php-src/ext/standard/tests/file/filegroup_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/unlink_variation9-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/unlink_variation9-win32.phpt +++ php-src/ext/standard/tests/file/unlink_variation9-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation11-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rename_variation11-win32.phpt +++ php-src/ext/standard/tests/file/rename_variation11-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/dirname_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/dirname_basic.phpt +++ php-src/ext/standard/tests/file/dirname_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation1.phpt +++ php-src/ext/standard/tests/file/touch_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation8.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation8.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgets_socket_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fgets_socket_variation2.phpt +++ php-src/ext/standard/tests/file/fgets_socket_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation6.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation12.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation12.phpt +++ php-src/ext/standard/tests/file/fopen_variation12.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/mkdir_variation1.phpt +++ php-src/ext/standard/tests/file/mkdir_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation7.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation7.phpt +++ php-src/ext/standard/tests/file/readfile_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation14.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation14.phpt +++ php-src/ext/standard/tests/file/fopen_variation14.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation4.phpt +++ php-src/ext/standard/tests/file/touch_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rmdir_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rmdir_variation1.phpt +++ php-src/ext/standard/tests/file/rmdir_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation4.phpt +++ php-src/ext/standard/tests/file/readfile_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fwrite_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fwrite_variation5.phpt +++ php-src/ext/standard/tests/file/fwrite_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_uploaded_file_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/is_uploaded_file_basic.phpt +++ php-src/ext/standard/tests/file/is_uploaded_file_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation13-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rename_variation13-win32.phpt +++ php-src/ext/standard/tests/file/rename_variation13-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/mkdir_variation5.phpt +++ php-src/ext/standard/tests/file/mkdir_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileinode_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileinode_variation1.phpt +++ php-src/ext/standard/tests/file/fileinode_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation8-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/tempnam_variation8-win32.phpt +++ php-src/ext/standard/tests/file/tempnam_variation8-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_exists_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_exists_variation1.phpt +++ php-src/ext/standard/tests/file/file_exists_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_basic-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_basic-win32.phpt +++ php-src/ext/standard/tests/file/touch_basic-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/move_uploaded_file_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/move_uploaded_file_basic.phpt +++ php-src/ext/standard/tests/file/move_uploaded_file_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readlink_variation1.phpt +++ php-src/ext/standard/tests/file/readlink_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt +++ php-src/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_error.phpt +++ php-src/ext/standard/tests/file/file_get_contents_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt +++ php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_variation9.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_variation9.phpt +++ php-src/ext/standard/tests/file/file_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileinode_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileinode_variation3.phpt +++ php-src/ext/standard/tests/file/fileinode_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation4.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pathinfo_variation2.phpt +++ php-src/ext/standard/tests/file/pathinfo_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileperms_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileperms_variation1.phpt +++ php-src/ext/standard/tests/file/fileperms_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/flock_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/flock_variation1.phpt +++ php-src/ext/standard/tests/file/flock_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation8.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation8.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/basename.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/basename.phpt +++ php-src/ext/standard/tests/file/basename.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation5.phpt +++ php-src/ext/standard/tests/file/touch_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/005_variation2-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/005_variation2-win32.phpt +++ php-src/ext/standard/tests/file/005_variation2-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileowner_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileowner_variation3.phpt +++ php-src/ext/standard/tests/file/fileowner_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/realpath_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/realpath_variation2.phpt +++ php-src/ext/standard/tests/file/realpath_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation2.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/parse_ini_file_variation2.phpt +++ php-src/ext/standard/tests/file/parse_ini_file_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation12.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rename_variation12.phpt +++ php-src/ext/standard/tests/file/rename_variation12.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation1.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pathinfo_variation1.phpt +++ php-src/ext/standard/tests/file/pathinfo_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rmdir_variation3-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rmdir_variation3-win32.phpt +++ php-src/ext/standard/tests/file/rmdir_variation3-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation5.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation8.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation8.phpt +++ php-src/ext/standard/tests/file/fopen_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filetype_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/filetype_variation2.phpt +++ php-src/ext/standard/tests/file/filetype_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_include_path.inc?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_include_path.inc +++ php-src/ext/standard/tests/file/fopen_include_path.inc http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_variation8-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_variation8-win32.phpt +++ php-src/ext/standard/tests/file/file_variation8-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/mkdir_variation2.phpt +++ php-src/ext/standard/tests/file/mkdir_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation6-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation6-win32.phpt +++ php-src/ext/standard/tests/file/touch_variation6-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/chmod_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/chmod_variation3.phpt +++ php-src/ext/standard/tests/file/chmod_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation9.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation9.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation7.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation7.phpt +++ php-src/ext/standard/tests/file/fopen_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation8-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation8-win32.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation8-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgets_socket_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fgets_socket_variation1.phpt +++ php-src/ext/standard/tests/file/fgets_socket_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation3.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rmdir_variation1-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rmdir_variation1-win32.phpt +++ php-src/ext/standard/tests/file/rmdir_variation1-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation6.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents_variation4.phpt +++ php-src/ext/standard/tests/file/file_put_contents_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation1-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/mkdir_variation1-win32.phpt +++ php-src/ext/standard/tests/file/mkdir_variation1-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_basic.phpt +++ php-src/ext/standard/tests/file/touch_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileowner_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileowner_variation2.phpt +++ php-src/ext/standard/tests/file/fileowner_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileinode_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileinode_variation2.phpt +++ php-src/ext/standard/tests/file/fileinode_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation4.phpt +++ php-src/ext/standard/tests/file/fopen_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation9.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation9.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation15.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation15.phpt +++ php-src/ext/standard/tests/file/fopen_variation15.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/dirname_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/dirname_error.phpt +++ php-src/ext/standard/tests/file/dirname_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_basic1-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pathinfo_basic1-win32.phpt +++ php-src/ext/standard/tests/file/pathinfo_basic1-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation3.phpt +++ php-src/ext/standard/tests/file/touch_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/umask_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/umask_variation3.phpt +++ php-src/ext/standard/tests/file/umask_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fread_fwrite_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fread_fwrite_basic.phpt +++ php-src/ext/standard/tests/file/fread_fwrite_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation10-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation10-win32.phpt +++ php-src/ext/standard/tests/file/fopen_variation10-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fseek_variation2.phpt +++ php-src/ext/standard/tests/file/fseek_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation5-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation5-win32.phpt +++ php-src/ext/standard/tests/file/touch_variation5-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pathinfo_variation3.phpt +++ php-src/ext/standard/tests/file/pathinfo_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation17.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation17.phpt +++ php-src/ext/standard/tests/file/fopen_variation17.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/unlink_variation10.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/unlink_variation10.phpt +++ php-src/ext/standard/tests/file/unlink_variation10.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation9.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation9.phpt +++ php-src/ext/standard/tests/file/fopen_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation14-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation14-win32.phpt +++ php-src/ext/standard/tests/file/fopen_variation14-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fseek_variation1.phpt +++ php-src/ext/standard/tests/file/fseek_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rmdir_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rmdir_variation3.phpt +++ php-src/ext/standard/tests/file/rmdir_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation2.phpt +++ php-src/ext/standard/tests/file/touch_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_error.phpt +++ php-src/ext/standard/tests/file/touch_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filesize_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/filesize_variation5.phpt +++ php-src/ext/standard/tests/file/filesize_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/glob_error_002.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/glob_error_002.phpt +++ php-src/ext/standard/tests/file/glob_error_002.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation5-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/tempnam_variation5-win32.phpt +++ php-src/ext/standard/tests/file/tempnam_variation5-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fseek_variation3.phpt +++ php-src/ext/standard/tests/file/fseek_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/parse_ini_file_variation3.phpt +++ php-src/ext/standard/tests/file/parse_ini_file_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/parse_ini_file_variation6.phpt +++ php-src/ext/standard/tests/file/parse_ini_file_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lstat_stat_variation22.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/lstat_stat_variation22.phpt +++ php-src/ext/standard/tests/file/lstat_stat_variation22.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filegroup_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/filegroup_variation3.phpt +++ php-src/ext/standard/tests/file/filegroup_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_basic2-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pathinfo_basic2-win32.phpt +++ php-src/ext/standard/tests/file/pathinfo_basic2-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/dirname_basic-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/dirname_basic-win32.phpt +++ php-src/ext/standard/tests/file/dirname_basic-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fopen_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fopen_variation3.phpt +++ php-src/ext/standard/tests/file/fopen_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileperms_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fileperms_variation2.phpt +++ php-src/ext/standard/tests/file/fileperms_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/touch_variation4-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/touch_variation4-win32.phpt +++ php-src/ext/standard/tests/file/touch_variation4-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation9.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation9.phpt +++ php-src/ext/standard/tests/file/readfile_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation5.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_basic2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/pathinfo_basic2.phpt +++ php-src/ext/standard/tests/file/pathinfo_basic2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation7-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_variation7-win32.phpt +++ php-src/ext/standard/tests/file/file_get_contents_variation7-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation6-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/tempnam_variation6-win32.phpt +++ php-src/ext/standard/tests/file/tempnam_variation6-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_variation8.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/file_variation8.phpt +++ php-src/ext/standard/tests/file/file_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation10.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rename_variation10.phpt +++ php-src/ext/standard/tests/file/rename_variation10.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/dirname_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/dirname_variation1.phpt +++ php-src/ext/standard/tests/file/dirname_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation10.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/readfile_variation10.phpt +++ php-src/ext/standard/tests/file/readfile_variation10.phpt