generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sftp_read: a short read is not end of file

Browse Source 
A returned READ packet that is short will now only reduce the
offset.

This is a temporary fix as it is slightly better than the previous
approach but still not very good.
This commit is contained in:
Daniel Stenberg 2011-09-06 22:43:26 +02:00
parent 9e79031ad7
commit 296d57bb2c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sftp.c
View File

@ -1242,9 +1242,12 @@ static ssize_t sftp_read(LIBSSH2_SFTP_HANDLE * handle, char *buffer,
return _libssh2_error(session, LIBSSH2_ERROR_SFTP_PROTOCOL, return _libssh2_error(session, LIBSSH2_ERROR_SFTP_PROTOCOL,
"SFTP Protocol badness"); "SFTP Protocol badness");
if(rc32 != chunk->len) if(rc32 != chunk->len) {
/* a short read means this is the last read in the file */ /* a short read does not imply end of file, but we must adjust
filep->eof = TRUE; the offset_sent since it was advanced with a full
chunk->len before */
filep->offset_sent -= (chunk->len - rc32);
}
if(total_read + rc32 > buffer_size) { if(total_read + rc32 > buffer_size) {
/* figure out the overlap amount */ /* figure out the overlap amount */