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

Reformat sftp_dir_eof().

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@596 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-23 12:21:30 +00:00
parent 75da135324
commit 441929f8b8
1 changed files with 98 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
libssh/sftp.c
View File

@@ -1130,76 +1130,110 @@ 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) {
BUFFER *payload; SFTP_MESSAGE *msg = NULL;
u32 id; STATUS_MESSAGE *status;
SFTP_MESSAGE *msg=NULL; SFTP_ATTRIBUTES *attr;
STATUS_MESSAGE *status; BUFFER *payload;
SFTP_ATTRIBUTES *attr; u32 id;
if(!dir->buffer){
payload=buffer_new(); if (dir->buffer == NULL) {
id=sftp_get_new_id(sftp); payload = buffer_new();
buffer_add_u32(payload,id); if (payload == NULL) {
buffer_add_ssh_string(payload,dir->handle); return NULL;
sftp_packet_write(sftp,SSH_FXP_READDIR,payload);
buffer_free(payload);
ssh_log(sftp->session, SSH_LOG_PACKET,
"Sent a ssh_fxp_readdir with id %d", id);
while(!msg){
if(sftp_read_and_dispatch(sftp))
/* 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)
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:
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){ id = sftp_get_new_id(sftp);
ssh_set_error(sftp->session,SSH_FATAL,"Count of files sent by the server is zero, which is invalid, or libsftp bug"); if (buffer_add_u32(payload, id) < 0 ||
buffer_add_ssh_string(payload, dir->handle) < 0) {
buffer_free(payload);
return NULL;
}
if (sftp_packet_write(sftp, SSH_FXP_READDIR, payload) < 0) {
buffer_free(payload);
return NULL;
}
buffer_free(payload);
ssh_log(sftp->session, 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:
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; return NULL;
} }
ssh_log(sftp->session, SSH_LOG_RARE, "Count is %d", dir->count); }
attr=sftp_parse_attr(sftp,dir->buffer,1);
dir->count--; /* now dir->buffer contains a buffer and dir->count != 0 */
if(dir->count==0){ if (dir->count == 0) {
buffer_free(dir->buffer); ssh_set_error(sftp->session, SSH_FATAL,
dir->buffer=NULL; "Count of files sent by the server is zero, which is invalid, or "
} "libsftp bug");
return attr; return NULL;
}
ssh_log(sftp->session, 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;
}
dir->count--;
if (dir->count == 0) {
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). */
int sftp_dir_eof(SFTP_DIR *dir){ int sftp_dir_eof(SFTP_DIR *dir) {
return (dir->eof); return dir->eof;
} }
/* Free a SFTP_ATTRIBUTE handle */ /* Free a SFTP_ATTRIBUTE handle */