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

Merge pull request #853 from jbcrail/fix-pwd-test

tests/pwd: fix broken Windows test
This commit is contained in:
Heather 2016-03-28 08:59:46 +04:00
commit b17adf1320

View file

@ -252,7 +252,21 @@ impl AtPath {
pub fn root_dir_resolved(&self) -> String { pub fn root_dir_resolved(&self) -> String {
log_info("current_directory_resolved", ""); log_info("current_directory_resolved", "");
self.subdir.canonicalize().unwrap().to_str().unwrap().to_owned() let s = self.subdir.canonicalize().unwrap().to_str().unwrap().to_owned();
// Due to canonicalize()'s use of GetFinalPathNameByHandleW() on Windows, the resolved path
// starts with '\\?\' to extend the limit of a given path to 32,767 wide characters.
//
// To address this issue, we remove this prepended string if available.
//
// Source:
// http://stackoverflow.com/questions/31439011/getfinalpathnamebyhandle-without-prepended
let prefix = "\\\\?\\";
if s.starts_with(prefix) {
String::from(&s[prefix.len()..])
} else {
s
}
} }
} }