shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-10 18:28:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

Improve sftp_unlink().

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@607 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-24 12:57:11 +00:00
parent 4a383ab3cf
commit 50616076c7
1 changed files with 63 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
libssh/sftp.c
View File

@@ -1781,29 +1781,47 @@ int sftp_rm(SFTP_SESSION *sftp, const char *file) {
/* code written by Nick */ /* code written by Nick */
int sftp_unlink(SFTP_SESSION *sftp, const char *file) { int sftp_unlink(SFTP_SESSION *sftp, const char *file) {
u32 id = sftp_get_new_id(sftp);
BUFFER *buffer = buffer_new();
STRING *filename = string_from_char(file);
SFTP_MESSAGE *msg = NULL;
STATUS_MESSAGE *status = NULL; STATUS_MESSAGE *status = NULL;
SFTP_MESSAGE *msg = NULL;
STRING *filename;
BUFFER *buffer;
u32 id;
buffer_add_u32(buffer, id); buffer = buffer_new();
buffer_add_ssh_string(buffer, filename); if (buffer == NULL) {
free(filename); return -1;
sftp_packet_write(sftp, SSH_FXP_REMOVE, buffer); }
filename = string_from_char(file);
if (filename == NULL) {
buffer_free(buffer); buffer_free(buffer);
while (!msg) { return -1;
}
id = sftp_get_new_id(sftp);
if (buffer_add_u32(buffer, id) < 0 ||
buffer_add_ssh_string(buffer, filename) < 0 ||
sftp_packet_write(sftp, SSH_FXP_REMOVE, buffer) < 0) {
buffer_free(buffer);
string_free(filename);
}
string_free(filename);
buffer_free(buffer);
while (msg == NULL) {
if (sftp_read_and_dispatch(sftp)) { if (sftp_read_and_dispatch(sftp)) {
return -1; return -1;
} }
msg = sftp_dequeue(sftp, id); msg = sftp_dequeue(sftp, id);
} }
if (msg->packet_type == SSH_FXP_STATUS) { if (msg->packet_type == SSH_FXP_STATUS) {
/* by specification, this command's only supposed to return SSH_FXP_STATUS */ /* by specification, this command's only supposed to return SSH_FXP_STATUS */
status = parse_status_msg(msg); status = parse_status_msg(msg);
sftp_message_free(msg); sftp_message_free(msg);
if (!status) if (status == NULL) {
return -1; return -1;
}
sftp_set_error(sftp, status->status); sftp_set_error(sftp, status->status);
switch (status->status) { switch (status->status) {
case SSH_FX_OK: case SSH_FX_OK:
@@ -1812,14 +1830,21 @@ int sftp_unlink(SFTP_SESSION *sftp, const char *file) {
default: default:
break; break;
} }
/* status should be SSH_FX_OK if the command was successful, if it didn't, then there was an error */
ssh_set_error(sftp->session,SSH_REQUEST_DENIED, "sftp server: %s", status->errormsg); /*
* The status should be SSH_FX_OK if the command was successful, if it
* didn't, then there was an error
*/
ssh_set_error(sftp->session, SSH_REQUEST_DENIED,
"SFTP server: %s", status->errormsg);
status_msg_free(status); status_msg_free(status);
return -1; return -1;
} else { } else {
ssh_set_error(sftp->session,SSH_FATAL, "Received message %d when attempting to remove file", msg->packet_type); ssh_set_error(sftp->session,SSH_FATAL,
"Received message %d when attempting to remove file", msg->packet_type);
sftp_message_free(msg); sftp_message_free(msg);
} }
return -1; return -1;
} }