danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2024-11-27 04:34:45 +01:00
Code Issues Projects Releases Wiki Activity

SFTP: Add $offset and $length get() function

Browse Source
This commit is contained in:
terrafrost 2012-12-11 19:54:48 -06:00
parent 7401d148f8
commit 65193d9a25
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
phpseclib/Net/SFTP.php
View File

@ -698,7 +698,12 @@ class Net_SFTP extends Net_SSH2 {
/** /**
* Reads a list, be it detailed or not, of files in the given directory * Reads a list, be it detailed or not, of files in the given directory
* *
* @param optional String $dir * $realpath exists because, in the case of the recursive deletes and recursive chmod's $realpath has already
* been calculated.
*
* @param String $dir
* @param optional Boolean $raw
* @param optional Boolean $realpath
* @return Mixed * @return Mixed
* @access private * @access private
*/ */
@ -1479,7 +1484,7 @@ class Net_SFTP extends Net_SSH2 {
* @return Mixed * @return Mixed
* @access public * @access public
*/ */
function get($remote_file, $local_file = false) function get($remote_file, $local_file = false, $offset = 0, $length = -1)
{ {
if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) { if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) {
return false; return false;
@ -1517,9 +1522,10 @@ class Net_SFTP extends Net_SSH2 {
$content = ''; $content = '';
} }
$read = 0; $size = (1 << 20) < $length || $length < 0 ? 1 << 20 : $length;
$start = $offset;
while (true) { while (true) {
$packet = pack('Na*N3', strlen($handle), $handle, 0, $read, 1 << 20); $packet = pack('Na*N3', strlen($handle), $handle, 0, $offset, $size);
if (!$this->_send_sftp_packet(NET_SFTP_READ, $packet)) { if (!$this->_send_sftp_packet(NET_SFTP_READ, $packet)) {
if ($local_file !== false) { if ($local_file !== false) {
fclose($fp); fclose($fp);
@ -1531,7 +1537,7 @@ class Net_SFTP extends Net_SSH2 {
switch ($this->packet_type) { switch ($this->packet_type) {
case NET_SFTP_DATA: case NET_SFTP_DATA:
$temp = substr($response, 4); $temp = substr($response, 4);
$read+= strlen($temp); $offset+= strlen($temp);
if ($local_file === false) { if ($local_file === false) {
$content.= $temp; $content.= $temp;
} else { } else {
@ -1548,6 +1554,11 @@ class Net_SFTP extends Net_SSH2 {
} }
return false; return false;
} }
if ($length > 0 && $length <= $offset - $size) {
$content = substr($content, 0, $length);
break;
}
} }
if ($local_file !== false) { if ($local_file !== false) {
@ -1781,7 +1792,7 @@ class Net_SFTP extends Net_SSH2 {
extract(unpack('Nlength', $this->_string_shift($response, 4))); extract(unpack('Nlength', $this->_string_shift($response, 4)));
$key = $this->_string_shift($response, $length); $key = $this->_string_shift($response, $length);
extract(unpack('Nlength', $this->_string_shift($response, 4))); extract(unpack('Nlength', $this->_string_shift($response, 4)));
$attr[$key] = $this->_string_shift($response, $length); $attr[$key] = $this->_string_shift($response, $length);
} }
} }
} }