aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src
diff options
context:
space:
mode:
authorRichard Carlsson <[email protected]>2016-11-22 15:17:04 +0100
committerRichard Carlsson <[email protected]>2016-11-22 15:30:25 +0100
commitc7e5cf8e259956120c07206c4e7df235b129cb56 (patch)
tree93383784261dc655afa51ab0520beba7577136ef /lib/kernel/src
parent65c4401c1cd1094da5d8f35137532a22054a8517 (diff)
downloadotp-c7e5cf8e259956120c07206c4e7df235b129cb56.tar.gz
otp-c7e5cf8e259956120c07206c4e7df235b129cb56.tar.bz2
otp-c7e5cf8e259956120c07206c4e7df235b129cb56.zip
Restructure code:which() and where_is_file()
Diffstat (limited to 'lib/kernel/src')
-rw-r--r--lib/kernel/src/code.erl44
1 files changed, 22 insertions, 22 deletions
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index 1b149bbb4e..bb19d6716d 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -719,29 +719,14 @@ start_get_mode() ->
which(Module) when is_atom(Module) ->
case is_loaded(Module) of
false ->
- File = atom_to_list(Module) ++ objfile_extension(),
- which(File, get_path());
+ which(Module, get_path());
{file, File} ->
File
end.
--spec which(file:filename(), [file:filename()]) ->
- 'non_existing' | file:filename().
-
-which(_, []) ->
- non_existing;
-which(File, [Path|Tail]) ->
- case erl_prim_loader:list_dir(Path) of
- {ok,Files} ->
- case lists:member(File,Files) of
- true ->
- filename:append(Path, File);
- false ->
- which(File, Tail)
- end;
- _Error ->
- which(File, Tail)
- end.
+which(Module, Path) when is_atom(Module) ->
+ File = atom_to_list(Module) ++ objfile_extension(),
+ where_is_file(Path, File).
%% Search the code path for a specific file. Try to locate
%% it in the code path cache if possible.
@@ -751,13 +736,28 @@ which(File, [Path|Tail]) ->
Absname :: file:filename().
where_is_file(File) when is_list(File) ->
Path = get_path(),
- which(File, Path).
+ where_is_file(Path, File).
-spec where_is_file(Path :: file:filename(), Filename :: file:filename()) ->
file:filename() | 'non_existing'.
-where_is_file(Path, File) when is_list(Path), is_list(File) ->
- which(File, Path).
+where_is_file([], _) ->
+ non_existing;
+where_is_file([Path|Tail], File) ->
+ case erl_prim_loader:list_dir(Path) of
+ {ok,Files} ->
+ where_is_file(Tail, File, Path, Files);
+ _Error ->
+ where_is_file(Tail, File)
+ end.
+
+where_is_file(Tail, File, Path, Files) ->
+ case lists:member(File, Files) of
+ true ->
+ filename:append(Path, File);
+ false ->
+ where_is_file(Tail, File)
+ end.
-spec set_primary_archive(ArchiveFile :: file:filename(),
ArchiveBin :: binary(),