Mercurial > octave
changeset 28034:673fb7081ebe
Supply folder field for dir() on Windows UNC shares (bug #57664).
* dir.m: Don't call canonicalize_file_name() on paths that look like Windows UNC
shares.
| author | Daniel J Sebald <daniel.sebald@ieee.org> |
|---|---|
| date | Sat, 01 Feb 2020 03:24:54 -0500 |
| parents | 367ab44d18c8 |
| children | 0cd5f632a4b0 |
| files | scripts/miscellaneous/dir.m |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/miscellaneous/dir.m Sat Feb 01 10:57:35 2020 +0100 +++ b/scripts/miscellaneous/dir.m Sat Feb 01 03:24:54 2020 -0500 @@ -156,7 +156,12 @@ if (! is_same_file (last_dir, tmpdir)) ## Caching mechanism to speed up function last_dir = tmpdir; - last_absdir = canonicalize_file_name (last_dir); + if (ispc () && strncmp (last_dir, '\\', 2)) + ## Windows UNC network file name is used as is + last_absdir = last_dir; + else + last_absdir = canonicalize_file_name (last_dir); + endif endif info(cnt).folder = last_absdir; lt = localtime (st.mtime);