diff options
| author | Anthony Ramine <[email protected]> | 2014-07-01 00:58:26 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-07-09 14:57:11 +0200 |
| commit | de2fb97f15ac98aa1d1c5533aacca378334f4778 (patch) | |
| tree | da2c0c88479b4bbcdbfe04b1de8632627831bf3e /lib/stdlib/src/filelib.erl | |
| parent | c9e36ab16034bb7fe71f772df6bba22070976bbf (diff) | |
| download | otp-de2fb97f15ac98aa1d1c5533aacca378334f4778.tar.gz otp-de2fb97f15ac98aa1d1c5533aacca378334f4778.tar.bz2 otp-de2fb97f15ac98aa1d1c5533aacca378334f4778.zip | |
Fix handling of broken symlinks in filelib
This fixes a bug introduced in f11aabdc9fec593c31e6c4f3fa25c1707e9c35df where
filelib:eval_read_file_info/2 was made to use file:read_link_info/1 to never
follow symlinks. This fixed wildcard/1 but broke every other function using
eval_read_file_info/2.
Reported-by: Louis-Philippe Gauthier
Reported-by: Danil Zagoskin
Diffstat (limited to 'lib/stdlib/src/filelib.erl')
| -rw-r--r-- | lib/stdlib/src/filelib.erl | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/stdlib/src/filelib.erl b/lib/stdlib/src/filelib.erl index c0921e4cf1..9efbe8da20 100644 --- a/lib/stdlib/src/filelib.erl +++ b/lib/stdlib/src/filelib.erl @@ -265,7 +265,7 @@ do_wildcard(Pattern, Cwd, Mod) -> lists:sort(Files). do_wildcard_1({exists,File}, Mod) -> - case eval_read_file_info(File, Mod) of + case eval_read_link_info(File, Mod) of {ok,_} -> [File]; _ -> [] end; @@ -488,7 +488,7 @@ badpattern(Reason) -> error({badpattern,Reason}). eval_read_file_info(File, file) -> - file:read_link_info(File); + file:read_file_info(File); eval_read_file_info(File, erl_prim_loader) -> case erl_prim_loader:read_file_info(File) of error -> {error, erl_prim_loader}; @@ -497,6 +497,16 @@ eval_read_file_info(File, erl_prim_loader) -> eval_read_file_info(File, Mod) -> Mod:read_file_info(File). +eval_read_link_info(File, file) -> + file:read_link_info(File); +eval_read_link_info(File, erl_prim_loader) -> + case erl_prim_loader:read_link_info(File) of + error -> {error, erl_prim_loader}; + Res-> Res + end; +eval_read_link_info(File, Mod) -> + Mod:read_link_info(File). + eval_list_dir(Dir, file) -> file:list_dir(Dir); eval_list_dir(Dir, erl_prim_loader) -> |