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

sftp: Reformat sftp_statvfs()

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit ae0afec98d)
This commit is contained in:
Andreas Schneider
2018-08-31 18:59:56 +02:00
parent 3cee61a65b
commit 3f376f848d
1 changed files with 93 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

185
src/sftp.c
View File

@@ -2730,110 +2730,111 @@ static sftp_statvfs_t sftp_parse_statvfs(sftp_session sftp, ssh_buffer buf) {
return statvfs; return statvfs;
} }
sftp_statvfs_t sftp_statvfs(sftp_session sftp, const char *path) { sftp_statvfs_t sftp_statvfs(sftp_session sftp, const char *path)
sftp_status_message status = NULL; {
sftp_message msg = NULL; sftp_status_message status = NULL;
ssh_string pathstr; sftp_message msg = NULL;
ssh_string ext; ssh_string pathstr;
ssh_buffer buffer; ssh_string ext;
uint32_t id; ssh_buffer buffer;
int rc; uint32_t id;
int rc;
if (sftp == NULL) if (sftp == NULL)
return NULL; return NULL;
if (path == NULL) { if (path == NULL) {
ssh_set_error_invalid(sftp->session); ssh_set_error_invalid(sftp->session);
return NULL; return NULL;
} }
if (sftp->version < 3){ if (sftp->version < 3){
ssh_set_error(sftp,SSH_REQUEST_DENIED,"sftp version %d does not support sftp_statvfs",sftp->version); ssh_set_error(sftp,SSH_REQUEST_DENIED,"sftp version %d does not support sftp_statvfs",sftp->version);
return NULL; return NULL;
} }
buffer = ssh_buffer_new(); buffer = ssh_buffer_new();
if (buffer == NULL) { if (buffer == NULL) {
ssh_set_error_oom(sftp->session); ssh_set_error_oom(sftp->session);
return NULL; return NULL;
} }
ext = ssh_string_from_char("statvfs@openssh.com"); ext = ssh_string_from_char("statvfs@openssh.com");
if (ext == NULL) { if (ext == NULL) {
ssh_set_error_oom(sftp->session); ssh_set_error_oom(sftp->session);
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
return NULL; return NULL;
} }
pathstr = ssh_string_from_char(path); pathstr = ssh_string_from_char(path);
if (pathstr == NULL) { if (pathstr == NULL) {
ssh_set_error_oom(sftp->session); ssh_set_error_oom(sftp->session);
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
ssh_string_free(ext); ssh_string_free(ext);
return NULL; return NULL;
} }
rc = ssh_buffer_allocate_size(buffer, rc = ssh_buffer_allocate_size(buffer,
sizeof(uint32_t) * 3 + sizeof(uint32_t) * 3 +
ssh_string_len(ext) + ssh_string_len(ext) +
ssh_string_len(pathstr)); ssh_string_len(pathstr));
if (rc < 0) { if (rc < 0) {
ssh_set_error_oom(sftp->session); ssh_set_error_oom(sftp->session);
ssh_buffer_free(buffer);
ssh_string_free(ext);
ssh_string_free(pathstr);
return NULL;
}
id = sftp_get_new_id(sftp);
if (ssh_buffer_add_u32(buffer, htonl(id)) < 0 ||
ssh_buffer_add_ssh_string(buffer, ext) < 0 ||
ssh_buffer_add_ssh_string(buffer, pathstr) < 0) {
ssh_set_error_oom(sftp->session);
ssh_buffer_free(buffer);
ssh_string_free(ext);
ssh_string_free(pathstr);
return NULL;
}
if (sftp_packet_write(sftp, SSH_FXP_EXTENDED, buffer) < 0) {
ssh_buffer_free(buffer);
ssh_string_free(ext);
ssh_string_free(pathstr);
return NULL;
}
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
ssh_string_free(ext); ssh_string_free(ext);
ssh_string_free(pathstr); ssh_string_free(pathstr);
return NULL;
}
id = sftp_get_new_id(sftp); while (msg == NULL) {
if (ssh_buffer_add_u32(buffer, htonl(id)) < 0 || if (sftp_read_and_dispatch(sftp) < 0) {
ssh_buffer_add_ssh_string(buffer, ext) < 0 || return NULL;
ssh_buffer_add_ssh_string(buffer, pathstr) < 0) { }
ssh_set_error_oom(sftp->session); msg = sftp_dequeue(sftp, id);
ssh_buffer_free(buffer);
ssh_string_free(ext);
ssh_string_free(pathstr);
return NULL;
}
if (sftp_packet_write(sftp, SSH_FXP_EXTENDED, buffer) < 0) {
ssh_buffer_free(buffer);
ssh_string_free(ext);
ssh_string_free(pathstr);
return NULL;
}
ssh_buffer_free(buffer);
ssh_string_free(ext);
ssh_string_free(pathstr);
while (msg == NULL) {
if (sftp_read_and_dispatch(sftp) < 0) {
return NULL;
}
msg = sftp_dequeue(sftp, id);
}
if (msg->packet_type == SSH_FXP_EXTENDED_REPLY) {
sftp_statvfs_t buf = sftp_parse_statvfs(sftp, msg->payload);
sftp_message_free(msg);
if (buf == NULL) {
return NULL;
} }
return buf; if (msg->packet_type == SSH_FXP_EXTENDED_REPLY) {
} else if (msg->packet_type == SSH_FXP_STATUS) { /* bad response (error) */ sftp_statvfs_t buf = sftp_parse_statvfs(sftp, msg->payload);
status = parse_status_msg(msg); sftp_message_free(msg);
sftp_message_free(msg); if (buf == NULL) {
if (status == NULL) { return NULL;
return NULL; }
}
ssh_set_error(sftp->session, SSH_REQUEST_DENIED,
"SFTP server: %s", status->errormsg);
status_msg_free(status);
} else { /* this shouldn't happen */
ssh_set_error(sftp->session, SSH_FATAL,
"Received message %d when attempting to get statvfs", msg->packet_type);
sftp_message_free(msg);
}
return NULL; return buf;
} else if (msg->packet_type == SSH_FXP_STATUS) { /* bad response (error) */
status = parse_status_msg(msg);
sftp_message_free(msg);
if (status == NULL) {
return NULL;
}
ssh_set_error(sftp->session, SSH_REQUEST_DENIED,
"SFTP server: %s", status->errormsg);
status_msg_free(status);
} else { /* this shouldn't happen */
ssh_set_error(sftp->session, SSH_FATAL,
"Received message %d when attempting to get statvfs", msg->packet_type);
sftp_message_free(msg);
}
return NULL;
} }
int sftp_fsync(sftp_file file) int sftp_fsync(sftp_file file)