andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 01:16:18 +04:00
Code Issues Projects Releases Wiki Activity

Implement check before adding path to files

Browse Source
This commit is contained in:
Alice 2024-05-11 16:14:51 -04:00
parent 00e9e5eade
commit c123944d9b
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
helix-term/src/args.rs
View File

@ -95,13 +95,23 @@ pub fn parse_args() -> Result<Args> {
_ => args.files.push(parse_file(arg)), _ => args.files.push(parse_file(arg)),
}; };
} }
arg => args.files.push(parse_file(arg)), arg => {
let file = parse_file(arg);
if is_proper_file(&file) {
args.files.push(file)
}
}
} }
} }
// push the remaining args, if any to the files // push the remaining args, if any to the files
for arg in argv { for arg in argv {
args.files.push(parse_file(&arg)); let file = parse_file(&arg);
if is_proper_file(&file) {
args.files.push(file);
}
} }
if let Some(file) = args.files.first_mut() { if let Some(file) = args.files.first_mut() {
@ -125,6 +135,11 @@ pub(crate) fn parse_file(s: &str) -> (PathBuf, Position) {
.unwrap_or_else(def) .unwrap_or_else(def)
} }
/// Ensure file is not a pipe or random
fn is_proper_file(f: &(PathBuf, Position)) -> bool {
f.0.is_file() || f.0.is_symlink()
}
/// Split file.rs:10:2 into [`PathBuf`], row and col. /// Split file.rs:10:2 into [`PathBuf`], row and col.
/// ///
/// Does not validate if file.rs is a file or directory. /// Does not validate if file.rs is a file or directory.