Skip to content

wait for entire buffer to be written before returning when calling sftp_write #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 5, 2018
Merged

wait for entire buffer to be written before returning when calling sftp_write #28

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
139ea07
write the entire sftp buffer block before returning
rasmunk Jun 4, 2018
3a29823
stop on error code = negative number
rasmunk Jun 4, 2018
ba611c3
handle _size is 0 case on sftp_write
rasmunk Jun 4, 2018
4e9e09a
sftp_write, cheaper way to handle size=0
rasmunk Jun 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ dist
build
*~
*.so
.idea/
7 changes: 6 additions & 1 deletion ssh2/sftp_handle.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,12 @@ cdef class SFTPHandle:
cdef char *cbuf = buf
cdef ssize_t rc
with nogil:
rc = c_sftp.libssh2_sftp_write(self._handle, cbuf, _size)
while _size > 0:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this change if _size is 0 rc will be undefined and will cause a crash. Can skip call to write and just return 0 in that case.

rc = c_sftp.libssh2_sftp_write(self._handle, cbuf, _size)
if rc < 0:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not needed anymore.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate on this? why not?
Would think that you would keep writing the content of 'cbuf' until it is empty

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My mistake actually :)

break
cbuf += rc
_size -= rc
return handle_error_codes(rc)

IF EMBEDDED_LIB:
Expand Down