From: Greg Beaver <cellog@php.net>
Date: Sun, 13 Apr 2008 23:46:15 +0000 (+0000)
Subject: 100% code coverage for dir handle seeking, remove error log (not used in dir seeking... 
X-Git-Tag: RELEASE_2_0_0b1~434
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f6a6dcb0e893c4060d7966f9f798801bd888a56;p=php

100% code coverage for dir handle seeking, remove error log (not used in dir seeking, causes leak), update 027 test to have seeking test
---

diff --git a/ext/phar/dirstream.c b/ext/phar/dirstream.c
index ce398d0bc8..0143fa9684 100644
--- a/ext/phar/dirstream.c
+++ b/ext/phar/dirstream.c
@@ -74,7 +74,6 @@ static int phar_dir_seek(php_stream *stream, off_t offset, int whence, off_t *ne
 		}
 
 		if (offset < 0) {
-			php_stream_wrapper_log_error(stream->wrapper, stream->flags TSRMLS_CC, "phar error: cannot seek because the resulting seek is negative");
 			return -1;
 		} else {
 			*newoffset = 0;
diff --git a/ext/phar/tests/027.phpt b/ext/phar/tests/027.phpt
index 28174c8e76..83d66b0f08 100755
--- a/ext/phar/tests/027.phpt
+++ b/ext/phar/tests/027.phpt
@@ -40,6 +40,12 @@ function dump($phar, $base)
 
 dump($pname, '/');
 
+$a = opendir($pname);
+// this may stop working in future versions, but is here for code coverage purposes
+echo "fseek on dir handle\n";
+var_dump(fseek($a, 0, SEEK_END), ftell($a));
+var_dump(fseek($a, -1), ftell($a));
+var_dump(fseek($a, 1), ftell($a));
 ?>
 ===DONE===
 --CLEAN--
@@ -59,4 +65,11 @@ string(6) "/b.php"
 bool(false)
 string(6) "/e.php"
 bool(false)
+fseek on dir handle
+int(0)
+int(4)
+int(-1)
+int(4)
+int(0)
+int(1)
 ===DONE===