| 1 | 1 |
===================================================================
|
| 2 | 2 |
--- uucore.orig/Cargo.toml
|
| 3 | 3 |
+++ uucore/Cargo.toml
|
| 4 | |
@@ -28,9 +28,6 @@ version = ">= 0.3.3, <= 0.3.30"
|
|
4 |
@@ -32,9 +32,6 @@ version = ">= 0.3.3, <= 0.3.30"
|
| 5 | 5 |
version = "~2.1"
|
| 6 | 6 |
optional = true
|
| 7 | 7 |
|
|
| 11 | 11 |
[dependencies.failure]
|
| 12 | 12 |
version = "<= 0.1.1"
|
| 13 | 13 |
optional = true
|
| 14 | |
Index: uucore/src/fs.rs
|
|
14 |
Index: uucore/src/lib/features/fs.rs
|
| 15 | 15 |
===================================================================
|
| 16 | |
--- uucore.orig/src/fs.rs
|
| 17 | |
+++ uucore/src/fs.rs
|
|
16 |
--- uucore.orig/src/lib/features/fs.rs
|
|
17 |
+++ uucore/src/lib/features/fs.rs
|
| 18 | 18 |
@@ -6,8 +6,6 @@
|
| 19 | 19 |
// For the full copyright and license information, please view the LICENSE
|
| 20 | 20 |
// file that was distributed with this source code.
|
|
| 24 | 24 |
#[cfg(target_os = "redox")]
|
| 25 | 25 |
extern crate termion;
|
| 26 | 26 |
|
| 27 | |
@@ -102,9 +100,10 @@ pub fn canonicalize<P: AsRef<Path>>(orig
|
|
27 |
@@ -102,11 +100,11 @@ pub fn canonicalize<P: AsRef<Path>>(orig
|
| 28 | 28 |
let original = original.as_ref();
|
| 29 | 29 |
let original = if original.is_absolute() {
|
| 30 | 30 |
original.to_path_buf()
|
| 31 | 31 |
- } else {
|
| 32 | |
- dunce::canonicalize(env::current_dir().unwrap()).unwrap().join(original)
|
|
32 |
+ }; /*else {
|
|
33 |
dunce::canonicalize(env::current_dir().unwrap())
|
|
34 |
.unwrap()
|
|
35 |
.join(original)
|
| 33 | 36 |
- };
|
| 34 | |
+ } // windows specific
|
| 35 | |
+ // else {
|
| 36 | |
+ // dunce::canonicalize(env::current_dir().unwrap()).unwrap().join(original)
|
| 37 | |
+ //};
|
|
37 |
+ };*/
|
| 38 | 38 |
|
| 39 | 39 |
let mut result = PathBuf::new();
|
| 40 | 40 |
let mut parts = vec![];
|