lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-12-02 01:17:52 +03:00
Code Activity

Improve sftp_xstat().

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@615 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-27 10:37:54 +00:00
parent 2b4efa171e
commit c1cd3b2974
1 changed files with 54 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
libssh/sftp.c
View File

@@ -2273,41 +2273,61 @@ char *sftp_canonicalize_path(SFTP_SESSION *sftp, const char *path) {
return NULL; return NULL;
} }
static SFTP_ATTRIBUTES *sftp_xstat(SFTP_SESSION *sftp, const char *path, int param){ static SFTP_ATTRIBUTES *sftp_xstat(SFTP_SESSION *sftp, const char *path,
u32 id=sftp_get_new_id(sftp); int param) {
BUFFER *buffer=buffer_new(); STATUS_MESSAGE *status = NULL;
STRING *pathstr= string_from_char(path); SFTP_MESSAGE *msg = NULL;
SFTP_MESSAGE *msg=NULL; STRING *pathstr;
STATUS_MESSAGE *status=NULL; BUFFER *buffer;
SFTP_ATTRIBUTES *pattr=NULL; u32 id;
buffer_add_u32(buffer,id); buffer = buffer_new();
buffer_add_ssh_string(buffer,pathstr); if (buffer == NULL) {
free(pathstr); return NULL;
sftp_packet_write(sftp,param,buffer); }
pathstr = string_from_char(path);
if (pathstr == NULL) {
buffer_free(buffer); buffer_free(buffer);
while(!msg){
if(sftp_read_and_dispatch(sftp))
return NULL; return NULL;
msg=sftp_dequeue(sftp,id);
} }
if(msg->packet_type==SSH_FXP_ATTRS){
pattr=sftp_parse_attr(sftp,msg->payload,0); id = sftp_get_new_id(sftp);
return pattr; if (buffer_add_u32(buffer, id) < 0 ||
buffer_add_ssh_string(buffer, pathstr) < 0 ||
sftp_packet_write(sftp, param, buffer) < 0) {
buffer_free(buffer);
string_free(pathstr);
return NULL;
} }
if(msg->packet_type== SSH_FXP_STATUS){ buffer_free(buffer);
status=parse_status_msg(msg); 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_ATTRS) {
return sftp_parse_attr(sftp, msg->payload, 0);
} else if (msg->packet_type == SSH_FXP_STATUS) {
status = parse_status_msg(msg);
sftp_message_free(msg); sftp_message_free(msg);
if(!status) if (status == NULL) {
return NULL; return NULL;
}
sftp_set_error(sftp, status->status); sftp_set_error(sftp, status->status);
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 NULL; return NULL;
} }
ssh_set_error(sftp->session, SSH_FATAL, ssh_set_error(sftp->session, SSH_FATAL,
"Received mesg %d during stat()", msg->packet_type); "Received mesg %d during stat()", msg->packet_type);
sftp_message_free(msg); sftp_message_free(msg);
return NULL; return NULL;
} }