aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-09-11 10:17:08 +0200
committerMarcus Arendt <[email protected]>2014-09-11 10:17:08 +0200
commit159d2a13c8cbdecc736a327906b85dc69a4cb0c1 (patch)
tree3344a92655ee2af731761882515af82d27b26b94 /erts/preloaded
parent832625e71879f83e1f3f391cd65e42b8b7da5750 (diff)
parent81c2cd3755b4adb60d498b2763ee32279f3cfc0b (diff)
downloadotp-159d2a13c8cbdecc736a327906b85dc69a4cb0c1.tar.gz
otp-159d2a13c8cbdecc736a327906b85dc69a4cb0c1.tar.bz2
otp-159d2a13c8cbdecc736a327906b85dc69a4cb0c1.zip
Merge branch 'lrascao/fix_bug_windows_directory_symlinks' into maint
* lrascao/fix_bug_windows_directory_symlinks: fix indentation, add comment describing windows symlink creation assumption fix escript archive symlinked across drives OTP-12155 OTP-12154 OTP-12153
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/src/erl_prim_loader.erl9
1 files changed, 8 insertions, 1 deletions
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
index 466e0b0020..6b86a427ba 100644
--- a/erts/preloaded/src/erl_prim_loader.erl
+++ b/erts/preloaded/src/erl_prim_loader.erl
@@ -1507,7 +1507,14 @@ real_path(Name,[Path|Paths],Acc,Links) ->
[""|_] = LinkPaths ->
real_path(Name,LinkPaths++Paths,[],[ThisFile|Links]);
LinkPaths ->
- real_path(Name,LinkPaths++Paths,Acc,[ThisFile|Links])
+ % windows currently does not allow creation of relative symlinks
+ % across different drives
+ case erlang:system_info(os_type) of
+ {win32, _} ->
+ real_path(Name,LinkPaths++Paths,[],[ThisFile|Links]);
+ _ ->
+ real_path(Name,LinkPaths++Paths,Acc,[ThisFile|Links])
+ end
end;
_ ->
real_path(Name,Paths,This,Links)