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 #1136 from Arcterus/realpath-relpath-fix

Browse source 
Fix build on nightly
This commit is contained in:
mpkh 2018-01-17 12:12:02 +04:00 • committed by GitHub
commit 2db220e820
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 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.as_ref()); result.push(&part);
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.as_ref())).last(); absto.components().skip(suffix_pos).map(|x| result.push(&x)).last();
println!("{}", result.display()); println!("{}", result.display());
0 0

2
tests/common/util.rs
View file

@ -211,7 +211,7 @@ impl AtPath {
let mut unprefixed = PathBuf::new(); let mut unprefixed = PathBuf::new();
for component in prefixed.components() for component in prefixed.components()
.skip(self.subdir.components().count()) { .skip(self.subdir.components().count()) {
unprefixed.push(component.as_ref().to_str().unwrap()); unprefixed.push(component.as_os_str().to_str().unwrap());
} }
unprefixed unprefixed
} else { } else {