Mercurial > octave

changeset 28009:e3e26f54bfdc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dir.m: Return correct folder for '.' file (bug #57666) * dir.m: Add special case to check for "fn" (filename) equal to "." when determining "folder" field of return struct.
author Rik <rik@octave.org>
date Sun, 26 Jan 2020 17:56:48 -0800
parents e6482c932d4b
children 4f00900ac621
files scripts/miscellaneous/dir.m
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/miscellaneous/dir.m	Sun Jan 26 17:00:05 2020 +0100
+++ b/scripts/miscellaneous/dir.m	Sun Jan 26 17:56:48 2020 -0800
@@ -144,10 +144,15 @@
         tmpdir = regexprep (fn, re, '$1');
         if (is_same_file (fn, tmpdir))
           ## regexrep failed to match, no directory component.
-          tmpdir = ".";
+          no_dir = true;
+        else
+          no_dir = false;
         endif
         fn = regexprep (fn, re, '$2$3');
         info(++cnt).name = fn;
+        if (no_dir && fn != ".")
+          tmpdir = ".";
+        endif
         if (! is_same_file (last_dir, tmpdir))
           ## Caching mechanism to speed up function
           last_dir = tmpdir;