RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Merge pull request #1137 from Arcterus/realpath-relpath-fix

Browse source 
realpath, relpath: fix on stable and beta (whoops)
This commit is contained in:
mpkh 2018-01-18 10:36:41 +04:00 • committed by GitHub
commit 37f3e3a151
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/realpath/realpath.rs
View file

@ -77,7 +77,7 @@ fn resolve_path(path: &str, strip: bool, zero: bool, quiet: bool) -> bool {
let mut links_left = 256; let mut links_left = 256;
for part in abs.components() { for part in abs.components() {
result.push(&part); result.push(part.as_os_str());
loop { loop {
if links_left == 0 { if links_left == 0 {
if !quiet { show_error!("Too many symbolic links: {}", path) }; if !quiet { show_error!("Too many symbolic links: {}", path) };

2
src/relpath/relpath.rs
View file

@ -75,7 +75,7 @@ pub fn uumain(args: Vec<String>) -> i32 {
let mut result = PathBuf::new(); let mut result = PathBuf::new();
absfrom.components().skip(suffix_pos).map(|_| result.push("..")).last(); absfrom.components().skip(suffix_pos).map(|_| result.push("..")).last();
absto.components().skip(suffix_pos).map(|x| result.push(&x)).last(); absto.components().skip(suffix_pos).map(|x| result.push(x.as_os_str())).last();
println!("{}", result.display()); println!("{}", result.display());
0 0