From 08d65680de0e6664ce208bfcea491b936dd5a8df Mon Sep 17 00:00:00 2001
From: dairiki <dairiki@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sat, 18 Aug 2001 02:38:34 +0000
Subject: [PATCH] Attempt to fix SF bug #413446.

I think this bug was due to using PHP's file() function to slurp in the
files (as an array of lines).  The files, being serialized data, consist
of only one (sometimes very long) line.  I think (at least in some PHPs)
this make the file() function unhappy.

Fixed to use fread() rather than file().  Also make sure to open files
in 'binary' mode.


git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/branches/release-1_2-branch@540 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/db_filesystem.php | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/lib/db_filesystem.php b/lib/db_filesystem.php
index 27121c9f5..c904e99d0 100644
--- a/lib/db_filesystem.php
+++ b/lib/db_filesystem.php
@@ -1,4 +1,4 @@
-<?php  rcs_id('$Id: db_filesystem.php,v 1.4.2.2 2001-08-18 02:05:28 dairiki Exp $');
+<?php  rcs_id('$Id: db_filesystem.php,v 1.4.2.3 2001-08-18 02:38:34 dairiki Exp $');
    /*
       Database functions:
 
@@ -45,19 +45,22 @@
    // Return hash of page + attributes or default
    function RetrievePage($dbi, $pagename, $pagestore) {
       $filename = $dbi[$pagestore] . "/" . $pagename;
-      if ($fd = @fopen($filename, "r")) {
+      if ($fd = @fopen($filename, "rb")) {
          $locked = flock($fd, 1); # Read lock
          if (!$locked) { 
             ExitWiki("Timeout while obtaining lock. Please try again"); 
          }
-         if ($data = file($filename)) {
+         if ($data = fread($fd, filesize($filename))) {
             // unserialize $data into a hash
-            $pagehash = unserialize(join("\n", $data));
-		 }	
-		 fclose($fd);
-		 if($data) {
-		    return $pagehash;
-		 }
+            $pagehash = unserialize($data);
+	    if (!is_array($pagehash))
+		ExitWiki(sprintf("'%s': corrupt file",
+				 htmlspecialchars($filename)));
+	 }	
+	 fclose($fd);
+	 if ($data) {
+	    return $pagehash;
+	 }
       } else {
          return -1;
       }
@@ -79,16 +82,21 @@
 	  }
 
       $filename = $dbi . "/" . $pagename;
-      if($fd = fopen($filename, 'a')) { 
+      if($fd = fopen($filename, 'a+b')) { 
          $locked = flock($fd,2); #Exclusive blocking lock 
          if (!$locked) { 
             ExitWiki("Timeout while obtaining lock. Please try again"); 
-         } 
+         }
+	 
 
          #Second (actually used) filehandle 
-         $fdsafe = fopen($filename, 'w'); 
-         fwrite($fdsafe, $pagedata); 
-         fclose($fdsafe); 
+         #$fdsafe = fopen($filename, 'wb'); 
+         #fwrite($fdsafe, $pagedata); 
+         #fclose($fdsafe);
+
+	 rewind($fd);
+	 ftruncate($fd, 0);
+         fwrite($fd, $pagedata); 
          fclose($fd);
       } else {
          ExitWiki("Error while writing page '$pagename'");
-- 
2.45.0