vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2025-12-07 09:36:00 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SCP File transfer: when listing directory entries, check if a symlink points to a directory or to a file

Browse Source
This commit is contained in:
veeso
2021-01-23 12:20:34 +01:00
parent 0c9ed38eb7
commit d99efb9de4
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/filetransfer/scp_transfer.rs
View File

@@ -83,7 +83,8 @@ impl ScpFileTransfer {
}
// Collect metadata
// Get if is directory and if is symlink
let (is_dir, is_symlink): (bool, bool) = match metadata.get(1).unwrap().as_str() {
let (mut is_dir, is_symlink): (bool, bool) = match metadata.get(1).unwrap().as_str()
{
"-" => (false, false),
"l" => (false, true),
"d" => (true, false),
@@ -135,12 +136,21 @@ impl ScpFileTransfer {
Err(_) => None,
};
// Get filesize
let filesize: usize = metadata.get(6).unwrap().as_str().parse::<usize>().unwrap_or(0);
let filesize: usize = metadata
.get(6)
.unwrap()
.as_str()
.parse::<usize>()
.unwrap_or(0);
// Get link and name
let (file_name, symlink_path): (String, Option<PathBuf>) = match is_symlink {
true => self.get_name_and_link(metadata.get(8).unwrap().as_str()),
false => (String::from(metadata.get(8).unwrap().as_str()), None),
};
// Check if symlink points to a directory
if let Some(symlink_path) = symlink_path.as_ref() {
is_dir = symlink_path.is_dir();
}
// Get symlink
let symlink: Option<Box<FsEntry>> = match symlink_path {
None => None,