Mercurial > octave
changeset 23256:99ee4dd83ceb
dir.m: Fix regression in 529c6d0c6684.
* dir.m: Correct regular expression to separate directory from file.ext part of
name. Change regular expression to use all file separators, as may be necessary
on Windows.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 08 Mar 2017 21:11:54 -0800 |
| parents | aaf91b4f48e4 |
| children | 218a49aea031 |
| files | scripts/miscellaneous/dir.m |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/miscellaneous/dir.m Wed Mar 08 15:00:35 2017 -0800 +++ b/scripts/miscellaneous/dir.m Wed Mar 08 21:11:54 2017 -0800 @@ -111,8 +111,8 @@ if (numel (flst) > 0) - fs = regexptranslate ("escape", filesep); - re = sprintf ('(?:^|^.+[%s])([^%s.]*.[^%s]*)?$', fs, fs, fs); + fs = regexptranslate ("escape", filesep ("all")); + re = sprintf ('(?:^.+[%s])([^%s.]*)([.][^%s]*)?$', fs, fs, fs); ## Collect results. for i = nf:-1:1 fn = flst{i}; @@ -129,7 +129,7 @@ st = xst; endif endif - fn = regexprep (fn, re, '$1'); + fn = regexprep (fn, re, '$1$2'); info(i,1).name = fn; lt = localtime (st.mtime); info(i,1).date = strftime ("%d-%b-%Y %T", lt);