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

Improve sftp_rmdir().

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@609 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-27 10:06:18 +00:00
parent fd79249df6
commit 4d80a1559a
1 changed files with 61 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
libssh/sftp.c
View File

@@ -1851,29 +1851,46 @@ int sftp_unlink(SFTP_SESSION *sftp, const char *file) {
/* code written by Nick */ /* code written by Nick */
int sftp_rmdir(SFTP_SESSION *sftp, const char *directory) { int sftp_rmdir(SFTP_SESSION *sftp, const char *directory) {
u32 id = sftp_get_new_id(sftp);
BUFFER *buffer = buffer_new();
STRING *filename = string_from_char(directory);
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_RMDIR, buffer); }
filename = string_from_char(directory);
if (filename == NULL) {
buffer_free(buffer); buffer_free(buffer);
while (!msg) { return -1;
if (sftp_read_and_dispatch(sftp)) }
{
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_RMDIR, buffer) < 0) {
buffer_free(buffer);
string_free(filname);
return -1;
}
buffer_free(buffer);
string_free(filname);
while (msg == NULL) {
if (sftp_read_and_dispatch(sftp) < 0) {
return -1; return -1;
} }
msg = sftp_dequeue(sftp, id); msg = sftp_dequeue(sftp, id);
} }
if (msg->packet_type == SSH_FXP_STATUS) /* by specification, this command's only supposed to return SSH_FXP_STATUS */
{ /* By specification, this command returns SSH_FXP_STATUS */
if (msg->packet_type == 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);
@@ -1885,15 +1902,17 @@ int sftp_rmdir(SFTP_SESSION *sftp, const char *directory) {
default: default:
break; break;
} }
ssh_set_error(sftp->session,SSH_REQUEST_DENIED, "sftp server: %s", status->errormsg); 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 directory",
ssh_set_error(sftp->session,SSH_FATAL, "Received message %d when attempting to remove directory", msg->packet_type); msg->packet_type);
sftp_message_free(msg); sftp_message_free(msg);
} }
return -1; return -1;
} }