NobuNobu
nobun****@users*****
2006年 12月 26日 (火) 23:26:51 JST
Index: xoops2jp/html/class/smarty/core/core.write_file.php
diff -u xoops2jp/html/class/smarty/core/core.write_file.php:1.1.8.1 xoops2jp/html/class/smarty/core/core.write_file.php:1.1.8.1.2.1
--- xoops2jp/html/class/smarty/core/core.write_file.php:1.1.8.1 Sun Nov 20 17:05:53 2005
+++ xoops2jp/html/class/smarty/core/core.write_file.php Tue Dec 26 23:26:50 2006
@@ -23,8 +23,7 @@
smarty_core_create_dir_structure($_params, $smarty);
}
- // write to tmp file, then rename it to avoid
- // file locking race condition
+ // write to tmp file, then rename it to avoid file locking race condition
$_tmp_file = tempnam($_dirname, 'wrt');
if (!($fd = @fopen($_tmp_file, 'wb'))) {
@@ -38,12 +37,13 @@
fwrite($fd, $params['contents']);
fclose($fd);
- // Delete the file if it allready exists (this is needed on Win,
- // because it cannot overwrite files with rename()
- if (file_exists($params['filename'])) {
+ if (PHP_OS == 'Windows' || !@rename($_tmp_file, $params['filename'])) {
+ // On platforms and filesystems that cannot overwrite with rename()
+ // delete the file before renaming it -- because windows always suffers
+ // this, it is short-circuited to avoid the initial rename() attempt
@unlink($params['filename']);
+ @rename($_tmp_file, $params['filename']);
}
- @rename($_tmp_file, $params['filename']);
@chmod($params['filename'], $smarty->_file_perms);
return true;
@@ -51,4 +51,4 @@
/* vim: set expandtab: */
-?>
+?>
\ No newline at end of file