Refactor working with a locked file

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index d0475f0eaebaff6f04b5186c27a88db4e306f698..1e9755ae242e31583dc22670fd90cd327b59761b 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -799,15 +799,15 @@ function get_temp_dir() {
 * @return resource or null for error
 */
 function file_open_lock($filename) {
-       $fp = @fopen($filename, "r+"); // @ - may not exist
-       if (!$fp) { // c+ is available since PHP 5.2.6
-               $fp = @fopen($filename, "w"); // @ - may not be writable
-               if (!$fp) {
-                       return;
-               }
-               chmod($filename, 0660);
+       $fp = @fopen($filename, "c+"); // @ - may not be writable
+       if (!$fp) {
+               return;
+       }
+       chmod($filename, 0660);
+       if (!flock($fp, LOCK_EX)) {
+               fclose($fp);
+               return;
        }
-       flock($fp, LOCK_EX);
        return $fp;
 }