Skip to content
Snippets Groups Projects
Commit ffa281a0 authored by Stéphane Adjemian's avatar Stéphane Adjemian
Browse files

Merge pull request #1043 from JohannesPfeifer/check_matlab_path

Make check_matlab_path.m able to deal with one-letter files
parents ae49cddd 14e2b6ec
No related branches found
No related tags found
No related merge requests found
...@@ -117,34 +117,26 @@ function flist = getallroutinenames(p, excludedsubfolders) ...@@ -117,34 +117,26 @@ function flist = getallroutinenames(p, excludedsubfolders)
if nargin<2 if nargin<2
excludedsubfolders = {}; excludedsubfolders = {};
end end
dd = dir(p);
flist={}; flist={};
for f=1:length(dd) %get m-files in this directory
if ~(isequal(dd(f).name,'.') || isequal(dd(f).name,'..')) dd = dir([p,filesep '*.m']);
if dd(f).isdir temp=struct2cell(dd);
if ~ismember(dd(f).name, excludedsubfolders) flist=[flist temp(1,:)];
r = getallroutinenames([ p filesep dd(f).name]); %deal with subdirectories
flist = { flist{:} r{:} }; dlist=getalldirectories(p,excludedsubfolders); %first call with excluded directories
end for ii=1:length(dlist)
else flist=[flist getallroutinenames([ p filesep dlist{ii}])]; %recursive calls without subfolders
% Filter out files without m extension.
if isequal(dd(f).name(end-1:end),'.m')
flist{length(flist)+1} = [dd(f).name];
end
end
end
end end
function dlist = getalldirectories(p)
dd = dir(p); function dlist = getalldirectories(p,excluded_directories)
dlist = {}; if nargin<2
for f = 1:length(dd) excluded_directories = {};
if ~(isequal(dd(f).name,'.') || isequal(dd(f).name,'..'))
if dd(f).isdir
dlist{length(dlist)+1} = [dd(f).name];
end
end
end end
dd = dir(p);
dir_result=struct2cell(dd);
directory_indicator=cell2mat(dir_result(4,:));
dlist = dir_result(1,directory_indicator==1 & ~strcmp('.',dir_result(1,:)) & ~strcmp('..',dir_result(1,:)) & ~ismember(dir_result(1,:),excluded_directories));
function n = position(i, currentpath) function n = position(i, currentpath)
n = length(strfind(currentpath(1:i), pathsep)); n = length(strfind(currentpath(1:i), pathsep));
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment