lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

sftp: Reformat sftp_readdir()

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2018-08-31 18:26:21 +02:00
parent 87df9cfc5d
commit 576fdbe1e8
1 changed files with 99 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

197
src/sftp.c
View File

@@ -1385,116 +1385,117 @@ int sftp_server_version(sftp_session sftp) {
} }
/* Get a single file attributes structure of a directory. */ /* Get a single file attributes structure of a directory. */
sftp_attributes sftp_readdir(sftp_session sftp, sftp_dir dir) { sftp_attributes sftp_readdir(sftp_session sftp, sftp_dir dir)
sftp_message msg = NULL; {
sftp_status_message status; sftp_message msg = NULL;
sftp_attributes attr; sftp_status_message status;
ssh_buffer payload; sftp_attributes attr;
uint32_t id; ssh_buffer payload;
int rc; uint32_t id;
int rc;
if (dir->buffer == NULL) { if (dir->buffer == NULL) {
payload = ssh_buffer_new(); payload = ssh_buffer_new();
if (payload == NULL) { if (payload == NULL) {
ssh_set_error_oom(sftp->session); ssh_set_error_oom(sftp->session);
return NULL;
}
rc = ssh_buffer_allocate_size(payload,
sizeof(uint32_t) * 2 +
ssh_string_len(dir->handle));
if (rc < 0) {
ssh_set_error_oom(sftp->session);
ssh_buffer_free(payload);
return NULL;
}
id = sftp_get_new_id(sftp);
if (ssh_buffer_add_u32(payload, htonl(id)) < 0 ||
ssh_buffer_add_ssh_string(payload, dir->handle) < 0) {
ssh_set_error_oom(sftp->session);
ssh_buffer_free(payload);
return NULL;
}
if (sftp_packet_write(sftp, SSH_FXP_READDIR, payload) < 0) {
ssh_buffer_free(payload);
return NULL;
}
ssh_buffer_free(payload);
SSH_LOG(SSH_LOG_PACKET,
"Sent a ssh_fxp_readdir with id %d", id);
while (msg == NULL) {
if (sftp_read_and_dispatch(sftp) < 0) {
/* something nasty has happened */
return NULL;
}
msg = sftp_dequeue(sftp, id);
}
switch (msg->packet_type){
case SSH_FXP_STATUS:
status = parse_status_msg(msg);
sftp_message_free(msg);
if (status == NULL) {
return NULL;
}
sftp_set_error(sftp, status->status);
switch (status->status) {
case SSH_FX_EOF:
dir->eof = 1;
status_msg_free(status);
return NULL; return NULL;
default:
break;
} }
ssh_set_error(sftp->session, SSH_FATAL, rc = ssh_buffer_allocate_size(payload,
"Unknown error status: %d", status->status); sizeof(uint32_t) * 2 +
status_msg_free(status); ssh_string_len(dir->handle));
if (rc < 0) {
ssh_set_error_oom(sftp->session);
ssh_buffer_free(payload);
return NULL;
}
id = sftp_get_new_id(sftp);
if (ssh_buffer_add_u32(payload, htonl(id)) < 0 ||
ssh_buffer_add_ssh_string(payload, dir->handle) < 0) {
ssh_set_error_oom(sftp->session);
ssh_buffer_free(payload);
return NULL;
}
return NULL; if (sftp_packet_write(sftp, SSH_FXP_READDIR, payload) < 0) {
case SSH_FXP_NAME: ssh_buffer_free(payload);
ssh_buffer_get_u32(msg->payload, &dir->count); return NULL;
dir->count = ntohl(dir->count); }
dir->buffer = msg->payload; ssh_buffer_free(payload);
msg->payload = NULL;
sftp_message_free(msg);
break;
default:
ssh_set_error(sftp->session, SSH_FATAL,
"Unsupported message back %d", msg->packet_type);
sftp_message_free(msg);
SSH_LOG(SSH_LOG_PACKET,
"Sent a ssh_fxp_readdir with id %d", id);
while (msg == NULL) {
if (sftp_read_and_dispatch(sftp) < 0) {
/* something nasty has happened */
return NULL;
}
msg = sftp_dequeue(sftp, id);
}
switch (msg->packet_type){
case SSH_FXP_STATUS:
status = parse_status_msg(msg);
sftp_message_free(msg);
if (status == NULL) {
return NULL;
}
sftp_set_error(sftp, status->status);
switch (status->status) {
case SSH_FX_EOF:
dir->eof = 1;
status_msg_free(status);
return NULL;
default:
break;
}
ssh_set_error(sftp->session, SSH_FATAL,
"Unknown error status: %d", status->status);
status_msg_free(status);
return NULL;
case SSH_FXP_NAME:
ssh_buffer_get_u32(msg->payload, &dir->count);
dir->count = ntohl(dir->count);
dir->buffer = msg->payload;
msg->payload = NULL;
sftp_message_free(msg);
break;
default:
ssh_set_error(sftp->session, SSH_FATAL,
"Unsupported message back %d", msg->packet_type);
sftp_message_free(msg);
return NULL;
}
}
/* now dir->buffer contains a buffer and dir->count != 0 */
if (dir->count == 0) {
ssh_set_error(sftp->session, SSH_FATAL,
"Count of files sent by the server is zero, which is invalid, or "
"libsftp bug");
return NULL; return NULL;
} }
}
/* now dir->buffer contains a buffer and dir->count != 0 */ SSH_LOG(SSH_LOG_RARE, "Count is %d", dir->count);
if (dir->count == 0) {
ssh_set_error(sftp->session, SSH_FATAL,
"Count of files sent by the server is zero, which is invalid, or "
"libsftp bug");
return NULL;
}
SSH_LOG(SSH_LOG_RARE, "Count is %d", dir->count); attr = sftp_parse_attr(sftp, dir->buffer, 1);
if (attr == NULL) {
ssh_set_error(sftp->session, SSH_FATAL,
"Couldn't parse the SFTP attributes");
return NULL;
}
attr = sftp_parse_attr(sftp, dir->buffer, 1); dir->count--;
if (attr == NULL) { if (dir->count == 0) {
ssh_set_error(sftp->session, SSH_FATAL, ssh_buffer_free(dir->buffer);
"Couldn't parse the SFTP attributes"); dir->buffer = NULL;
return NULL; }
}
dir->count--; return attr;
if (dir->count == 0) {
ssh_buffer_free(dir->buffer);
dir->buffer = NULL;
}
return attr;
} }
/* Tell if the directory has reached EOF (End Of File). */ /* Tell if the directory has reached EOF (End Of File). */