suppaftp 4.1.2

veeso · Aug 23, 2021 · 7713c6c · 7713c6c
1 parent c49184d
commit 7713c6c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,7 +35,7 @@ Released on ??
   - Updated `crossterm` to `0.20`
   - Updated `open` to `2.0.1`
   - Added `tui-realm-stdlib 0.6.0`
-  - Replaced `ftp4` with `suppaftp 4.1.1`
+  - Replaced `ftp4` with `suppaftp 4.1.2`
   - Updated `tui-realm` to `0.6.0`
 
 ## 0.6.0

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,7 +47,7 @@ rpassword = "5.0.1"
 serde = { version = "^1.0.0", features = [ "derive" ] }
 simplelog = "0.10.0"
 ssh2 = "0.9.0"
-suppaftp = { version = "4.1.1", features = [ "secure" ] }
+suppaftp = { version = "4.1.2", features = [ "secure" ] }
 tempfile = "3.1.0"
 textwrap = "0.14.2"
 thiserror = "^1.0.0"

diff --git a/src/filetransfer/ftp_transfer.rs b/src/filetransfer/ftp_transfer.rs
@@ -36,7 +36,7 @@ use std::path::{Path, PathBuf};
 use std::time::UNIX_EPOCH;
 use suppaftp::native_tls::TlsConnector;
 use suppaftp::{
-    list::{File, UnixPexQuery},
+    list::{File, PosixPexQuery},
     status::FILE_UNAVAILABLE,
     types::{FileType, Response},
     FtpError, FtpStream,
@@ -164,19 +164,19 @@ impl FtpFileTransfer {
     fn query_unix_pex(f: &File) -> (u8, u8, u8) {
         (
             Self::pex_to_byte(
-                f.can_read(UnixPexQuery::Owner),
-                f.can_write(UnixPexQuery::Owner),
-                f.can_execute(UnixPexQuery::Owner),
+                f.can_read(PosixPexQuery::Owner),
+                f.can_write(PosixPexQuery::Owner),
+                f.can_execute(PosixPexQuery::Owner),
             ),
             Self::pex_to_byte(
-                f.can_read(UnixPexQuery::Group),
-                f.can_write(UnixPexQuery::Group),
-                f.can_execute(UnixPexQuery::Group),
+                f.can_read(PosixPexQuery::Group),
+                f.can_write(PosixPexQuery::Group),
+                f.can_execute(PosixPexQuery::Group),
             ),
             Self::pex_to_byte(
-                f.can_read(UnixPexQuery::Others),
-                f.can_write(UnixPexQuery::Others),
-                f.can_execute(UnixPexQuery::Others),
+                f.can_read(PosixPexQuery::Others),
+                f.can_write(PosixPexQuery::Others),
+                f.can_execute(PosixPexQuery::Others),
             ),
         )
     }
@@ -399,7 +399,7 @@ impl FileTransfer for FtpFileTransfer {
         match &mut self.stream {
             Some(stream) => match stream.mkdir(&dir.as_path().to_string_lossy()) {
                 Ok(_) => Ok(()),
-                Err(FtpError::InvalidResponse(Response {
+                Err(FtpError::UnexpectedResponse(Response {
                     // Directory already exists
                     code: FILE_UNAVAILABLE,
                     body: _,