Added sftp attributes and stats properties.

Added helper function to convert ssh string to bytes.

Author: Pan

ssh/sftp_attributes.pyx

@@ -17,8 +17,10 @@
 from libc.stdlib cimport malloc, free
 
 from sftp cimport SFTP
+from utils cimport ssh_string_to_bytes
 
 cimport c_sftp
+from c_ssh cimport ssh_string
 
 
 cdef class SFTPAttributes:
@@ -134,18 +136,24 @@ cdef class SFTPAttributes:
     def mtime_nseconds(self):
         return self._attrs.mtime_nseconds if self._attrs is not NULL else None
 
-    # @property
-    # def acl(self):
-    #     return self._attrs.acl if self._attrs is not NULL else None
+    @property
+    def acl(self):
+        if self._attrs is NULL:
+            return
+        return ssh_string_to_bytes(self._attrs.acl)
 
     @property
     def extended_count(self):
         return self._attrs.extended_count if self._attrs is not NULL else None
 
-    # @property
-    # def extended_type(self):
-    #     return self._attrs.extended_type if self._attrs is not NULL else None
+    @property
+    def extended_type(self):
+        if self._attrs is NULL:
+            return
+        return ssh_string_to_bytes(self._attrs.extended_type)
 
-    # @property
-    # def extended_data(self):
-    #     return self._attrs.extended_data if self._attrs is not NULL else None
+    @property
+    def extended_data(self):
+        if self._attrs is NULL:
+            return
+        return ssh_string_to_bytes(self._attrs.extended_data)

ssh/sftp_statvfs.pyx

@@ -34,3 +34,47 @@ cdef class SFTPStatVFS:
         cdef SFTPStatVFS _vfs = SFTPStatVFS.__new__(SFTPStatVFS, sftp)
         _vfs._stats = stats
         return _vfs
+
+    @property
+    def f_bsize(self):
+        return self._stats.f_bsize if self._stats is not NULL else None
+
+    @property
+    def f_frsize(self):
+        return self._stats.f_frsize if self._stats is not NULL else None
+
+    @property
+    def f_blocks(self):
+        return self._stats.f_blocks if self._stats is not NULL else None
+
+    @property
+    def f_bfree(self):
+        return self._stats.f_bfree if self._stats is not NULL else None
+
+    @property
+    def f_bavail(self):
+        return self._stats.f_bavail if self._stats is not NULL else None
+
+    @property
+    def f_files(self):
+        return self._stats.f_files if self._stats is not NULL else None
+
+    @property
+    def f_ffree(self):
+        return self._stats.f_ffree if self._stats is not NULL else None
+
+    @property
+    def f_favail(self):
+        return self._stats.f_favail if self._stats is not NULL else None
+
+    @property
+    def f_fsid(self):
+        return self._stats.f_fsid if self._stats is not NULL else None
+
+    @property
+    def f_flag(self):
+        return self._stats.f_flag if self._stats is not NULL else None
+
+    @property
+    def f_namemax(self):
+        return self._stats.f_namemax if self._stats is not NULL else None

ssh/utils.pxd

@@ -14,11 +14,12 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-from c_ssh cimport ssh_session
+from c_ssh cimport ssh_session, ssh_string
 
 cdef bytes to_bytes(_str)
 cdef object to_str(char *c_str)
 cdef object to_str_len(char *c_str, int length)
 cdef int handle_ok_error_codes(int errcode) except -1
 cdef int handle_ssh_error_codes(int errcode, ssh_session) except -1
 cdef int handle_auth_error_codes(int errcode, ssh_session) except -1
+cdef bytes ssh_string_to_bytes(ssh_string _str)

ssh/utils.pyx

@@ -17,7 +17,8 @@
 from cpython.version cimport PY_MAJOR_VERSION
 
 from c_ssh cimport ssh_error_types_e, ssh_get_error, ssh_auth_e, \
-    SSH_OK, SSH_ERROR, SSH_AGAIN, SSH_EOF, ssh_session
+    SSH_OK, SSH_ERROR, SSH_AGAIN, SSH_EOF, ssh_session, ssh_string, \
+    ssh_string_get_char, ssh_string_free, ssh_string_len
 
 from exceptions import RequestDenied, FatalError, OtherError, \
     AuthenticationPartial, AuthenticationDenied, AuthenticationError, \
@@ -48,6 +49,24 @@ cdef object to_str_len(char *c_str, int length):
     return c_str[:length].decode(ENCODING)
 
 
+cdef bytes ssh_string_to_bytes(ssh_string _str):
+    if _str is NULL:
+        return
+    cdef const char *c_str
+    cdef size_t str_len
+    cdef bytes b_str = None
+    with nogil:
+        str_len = ssh_string_len(_str)
+        c_str = ssh_string_get_char(_str)
+    if c_str is NULL:
+        raise MemoryError
+    try:
+        b_str = c_str[:str_len]
+        return b_str
+    finally:
+        ssh_string_free(_str)
+
+
 cdef int handle_ok_error_codes(int errcode) except -1:
     if errcode == SSH_OK:
         return SSH_OK