diff options
author | Andreas Schneider <mail@cynapses.org> | 2009-04-23 09:07:18 +0000 |
---|---|---|
committer | Andreas Schneider <mail@cynapses.org> | 2009-04-23 09:07:18 +0000 |
commit | 39f8c7faab2f2d76428ec9cca05380922bbd73aa (patch) | |
tree | b4c6a9f97d2c6f627b4cc1d7aebd0605f7e8aa97 /libssh/sftp.c | |
parent | 8fecf4d74c49823760857609bc7f95b7eed5500e (diff) | |
download | libssh-39f8c7faab2f2d76428ec9cca05380922bbd73aa.tar.gz libssh-39f8c7faab2f2d76428ec9cca05380922bbd73aa.tar.xz libssh-39f8c7faab2f2d76428ec9cca05380922bbd73aa.zip |
Map permission field to type field.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@589 7dcaeef0-15fb-0310-b436-a5af3365683c
Diffstat (limited to 'libssh/sftp.c')
-rw-r--r-- | libssh/sftp.c | 47 |
1 files changed, 46 insertions, 1 deletions
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 <errno.h> +#include <fcntl.h> #include <stdlib.h> #include <string.h> -#include <fcntl.h> +#include <sys/types.h> +#include <sys/stat.h> + #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)) |