- Sync fix binary safe

pierrejoye · pierrejoye · commit 4259d77a97fb · 2003-06-26T14:47:11.000Z
diff --git a/pear/PEAR/Installer.php b/pear/PEAR/Installer.php
@@ -261,7 +261,7 @@ function _installFile($file, $atts, $tmp_path)
             if (sizeof($subst_from)) {
                 $contents = str_replace($subst_from, $subst_to, $contents);
             }
-            $wp = @fopen($dest_file, "w");
+            $wp = @fopen($dest_file, "wb");
             if (!is_resource($wp)) {
                 return $this->raiseError("failed to create $dest_file: $php_errormsg",
                                          PEAR_INSTALLER_FAILED);
diff --git a/pear/PEAR/Packager.php b/pear/PEAR/Packager.php
@@ -121,7 +121,7 @@ function package($pkgfile = null, $compress = true)
             return $this->raiseError("PEAR_Packager: mktemp failed");
         }
         $newpkgfile = $tmpdir . DIRECTORY_SEPARATOR . 'package.xml';
-        $np = @fopen($newpkgfile, "w");
+        $np = @fopen($newpkgfile, "wb");
         if (!$np) {
             chdir($oldcwd);
             return $this->raiseError("PEAR_Packager: unable to rewrite $pkgfile as $newpkgfile");
@@ -173,4 +173,4 @@ function md5_file($file) {
     }
 }
 
-?>
+?>
diff --git a/pear/PEAR/Registry.php b/pear/PEAR/Registry.php
@@ -219,7 +219,7 @@ function rebuildFileMap()
             }
         }
         $this->_assertStateDir();
-        $fp = @fopen($this->filemap, 'w');
+        $fp = @fopen($this->filemap, 'wb');
         if (!$fp) {
             return false;
         }
@@ -568,7 +568,7 @@ function _depWriteDepDB(&$deps)
         if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
             return $e;
         }
-        if (!$fp = fopen($this->depfile, 'w')) {
+        if (!$fp = fopen($this->depfile, 'wb')) {
             $this->_unlock();
             return $this->raiseError("Could not open dependencies file `".$this->depfile."' for writting");
         }

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ function _installFile($file, $atts, $tmp_path)`
`261`	`261`	`if (sizeof($subst_from)) {`
`262`	`262`	`$contents = str_replace($subst_from, $subst_to, $contents);`
`263`	`263`	`}`
`264`		`- $wp = @fopen($dest_file, "w");`
	`264`	`+ $wp = @fopen($dest_file, "wb");`
`265`	`265`	`if (!is_resource($wp)) {`
`266`	`266`	`return $this->raiseError("failed to create $dest_file: $php_errormsg",`
`267`	`267`	`PEAR_INSTALLER_FAILED);`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ function package($pkgfile = null, $compress = true)`
`121`	`121`	`return $this->raiseError("PEAR_Packager: mktemp failed");`
`122`	`122`	`}`
`123`	`123`	`$newpkgfile = $tmpdir . DIRECTORY_SEPARATOR . 'package.xml';`
`124`		`- $np = @fopen($newpkgfile, "w");`
	`124`	`+ $np = @fopen($newpkgfile, "wb");`
`125`	`125`	`if (!$np) {`
`126`	`126`	`chdir($oldcwd);`
`127`	`127`	`return $this->raiseError("PEAR_Packager: unable to rewrite $pkgfile as $newpkgfile");`
`@@ -173,4 +173,4 @@ function md5_file($file) {`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
`176`		`-?>`
	`176`	`+?>`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ function rebuildFileMap()`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`	`$this->_assertStateDir();`
`222`		`- $fp = @fopen($this->filemap, 'w');`
	`222`	`+ $fp = @fopen($this->filemap, 'wb');`
`223`	`223`	`if (!$fp) {`
`224`	`224`	`return false;`
`225`	`225`	`}`
`@@ -568,7 +568,7 @@ function _depWriteDepDB(&$deps)`
`568`	`568`	`if (PEAR::isError($e = $this->_lock(LOCK_EX))) {`
`569`	`569`	`return $e;`
`570`	`570`	`}`
`571`		`- if (!$fp = fopen($this->depfile, 'w')) {`
	`571`	`+ if (!$fp = fopen($this->depfile, 'wb')) {`
`572`	`572`	`$this->_unlock();`
`573`	`573`	return $this->raiseError("Could not open dependencies file `".$this->depfile."' for writting");
`574`	`574`	`}`