From 39f8c7faab2f2d76428ec9cca05380922bbd73aa Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 23 Apr 2009 09:07:18 +0000 Subject: Map permission field to type field. git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@589 7dcaeef0-15fb-0310-b436-a5af3365683c --- libssh/sftp.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) (limited to 'libssh') diff --git a/libssh/sftp.c b/libssh/sftp.c index 5e5bfdcd..5953429e 100644 --- a/libssh/sftp.c +++ b/libssh/sftp.c @@ -27,9 +27,12 @@ /* This file contains code written by Nick Zitzmann */ #include +#include #include #include -#include +#include +#include + #include "libssh/priv.h" #include "libssh/ssh2.h" #include "libssh/sftp.h" @@ -761,6 +764,27 @@ static SFTP_ATTRIBUTES *sftp_parse_attr_4(SFTP_SESSION *sftp, BUFFER *buf, if(buffer_get_u32(buf,&attr->permissions)!=4) break; attr->permissions=ntohl(attr->permissions); + + switch (attr->permissions & S_IFMT) { + case S_IFSOCK: + case S_IFBLK: + case S_IFCHR: + case S_IFIFO: + attr->type = SSH_FILEXFER_TYPE_SPECIAL; + break; + case S_IFLNK: + attr->type = SSH_FILEXFER_TYPE_SYMLINK; + break; + case S_IFREG: + attr->type = SSH_FILEXFER_TYPE_REGULAR; + break; + case S_IFDIR: + attr->type = SSH_FILEXFER_TYPE_DIRECTORY; + break; + default: + attr->type = SSH_FILEXFER_TYPE_UNKNOWN; + break; + } } if(flags & SSH_FILEXFER_ATTR_ACCESSTIME){ if(buffer_get_u64(buf,&attr->atime64)!=8) @@ -905,6 +929,27 @@ static SFTP_ATTRIBUTES *sftp_parse_attr_3(SFTP_SESSION *sftp, BUFFER *buf, if(buffer_get_u32(buf,&attr->permissions)!=sizeof(u32)) break; attr->permissions=ntohl(attr->permissions); + + switch (attr->permissions & S_IFMT) { + case S_IFSOCK: + case S_IFBLK: + case S_IFCHR: + case S_IFIFO: + attr->type = SSH_FILEXFER_TYPE_SPECIAL; + break; + case S_IFLNK: + attr->type = SSH_FILEXFER_TYPE_SYMLINK; + break; + case S_IFREG: + attr->type = SSH_FILEXFER_TYPE_REGULAR; + break; + case S_IFDIR: + attr->type = SSH_FILEXFER_TYPE_DIRECTORY; + break; + default: + attr->type = SSH_FILEXFER_TYPE_UNKNOWN; + break; + } } if(flags & SSH_FILEXFER_ATTR_ACMODTIME){ if(buffer_get_u32(buf,&attr->atime)!=sizeof(u32)) -- cgit