Merge branch 'sverk/win-long-filenames/OTP-11813'

* sverk/win-long-filenames/OTP-11813:
  erts: Cleanup debug tracing in win_efile.c
  erts: Fix file:list_dir for windows paths 258 or 259 chars long
  erts: Increase MAXPATHLEN to 4096 for windows
  erts: Fix bug in efile_readlink for long win paths
  kernel: Fix failed tests in prim_file_SUITE for windows
  erts: Fix compiler warning in win_efile.c
  erts: Skip tests of paths longer than 255 characters as atoms
  erts: Skip tests of file:set_cwd for too long path on Windows
  erts: Make file:make_symlink/2 return {error,eperm} on Windows
  erts: Revert file:set_cwd impl for windows
  erts: Ignore reduntant slashes in windows paths
  fix file_SUITE:cur_dir_0 for long windows paths
  erts: Fix file_SUITE:make_del_dir for long paths
  erts: Fix long windows paths for compressed files
  erts: Use GetFullPathNameW to construct abs paths from relative ones
  erts: Fix file driver to handle long paths on windows

Conflicts:
	erts/emulator/drivers/win32/win_efile.c

1 files changed, 64 insertions, 35 deletions

diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 6b52493f46..f6d6cd94ab 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -428,7 +428,13 @@ make_del_dir(Config) when is_list(Config) ->
     % because there are processes having that directory as current.
     ?line ok = ?FILE_MODULE:make_dir(NewDir),
     ?line {ok,CurrentDir} = file:get_cwd(),
-    ?line ok = ?FILE_MODULE:set_cwd(NewDir),
+    case {os:type(), length(NewDir) >= 260 } of
+	{{win32,_}, true} ->
+	    io:format("Skip set_cwd for windows path longer than 260 (MAX_PATH)\n", []),
+	    io:format("\nNewDir = ~p\n", [NewDir]);
+    	_ ->
+	    ?line ok = ?FILE_MODULE:set_cwd(NewDir)
+    end,
     try
 	%% Check that we get an error when trying to create...
 	%% a deep directory
@@ -485,32 +491,39 @@ cur_dir_0(Config) when is_list(Config) ->
 				 atom_to_list(?MODULE)
 				 ++"_curdir"),
     ?line ok = ?FILE_MODULE:make_dir(NewDir),
-    ?line io:format("cd to ~s",[NewDir]),
-    ?line ok = ?FILE_MODULE:set_cwd(NewDir),
-
-    %% Create a file in the new current directory, and check that it
-    %% really is created there
-    ?line UncommonName = "uncommon.fil",
-    ?line {ok,Fd} = ?FILE_MODULE:open(UncommonName,read_write),
-    ?line ok = ?FILE_MODULE:close(Fd),
-    ?line {ok,NewDirFiles} = ?FILE_MODULE:list_dir("."),
-    ?line true = lists:member(UncommonName,NewDirFiles),
-
-    %% Delete the directory and return to the old current directory
-    %% and check that the created file isn't there (too!)
-    ?line expect({error, einval}, {error, eacces}, 
-		 ?FILE_MODULE:del_dir(NewDir)),
-    ?line ?FILE_MODULE:delete(UncommonName),
-    ?line {ok,[]} = ?FILE_MODULE:list_dir("."),
-    ?line ok = ?FILE_MODULE:set_cwd(Dir1),
-    ?line io:format("cd back to ~s",[Dir1]),
-    ?line ok = ?FILE_MODULE:del_dir(NewDir),
-    ?line {error, enoent} = ?FILE_MODULE:set_cwd(NewDir),
-    ?line ok = ?FILE_MODULE:set_cwd(Dir1),
-    ?line io:format("cd back to ~s",[Dir1]),
-    ?line {ok,OldDirFiles} = ?FILE_MODULE:list_dir("."),
-    ?line false = lists:member(UncommonName,OldDirFiles),
-
+    case {os:type(), length(NewDir) >= 260} of
+	{{win32,_}, true} ->
+	    io:format("Skip set_cwd for windows path longer than 260 (MAX_PATH):\n"),
+	    io:format("\nNewDir = ~p\n", [NewDir]);
+	_ ->
+	    io:format("cd to ~s",[NewDir]),
+    	    ok = ?FILE_MODULE:set_cwd(NewDir),
+
+	    %% Create a file in the new current directory, and check that it
+	    %% really is created there
+	    UncommonName = "uncommon.fil",
+	    {ok,Fd} = ?FILE_MODULE:open(UncommonName,read_write),
+	    ok = ?FILE_MODULE:close(Fd),
+	    {ok,NewDirFiles} = ?FILE_MODULE:list_dir("."),
+	    true = lists:member(UncommonName,NewDirFiles),
+
+	    %% Delete the directory and return to the old current directory
+	    %% and check that the created file isn't there (too!)
+	    expect({error, einval}, {error, eacces}, 
+	    	   ?FILE_MODULE:del_dir(NewDir)),
+	    ?FILE_MODULE:delete(UncommonName),
+	    {ok,[]} = ?FILE_MODULE:list_dir("."),
+	    ok = ?FILE_MODULE:set_cwd(Dir1),
+	    io:format("cd back to ~s",[Dir1]),
+
+	    ok = ?FILE_MODULE:del_dir(NewDir),
+	    {error, enoent} = ?FILE_MODULE:set_cwd(NewDir),
+	    ok = ?FILE_MODULE:set_cwd(Dir1),
+	    io:format("cd back to ~s",[Dir1]),
+	    {ok,OldDirFiles} = ?FILE_MODULE:list_dir("."),
+	    false = lists:member(UncommonName,OldDirFiles)
+    end,
+	
     %% Try doing some bad things
     ?line {error, badarg} = ?FILE_MODULE:set_cwd({foo,bar}),
     ?line {error, enoent} = ?FILE_MODULE:set_cwd(""),
@@ -1982,7 +1995,6 @@ names(Config) when is_list(Config) ->
     ?line Name1 = filename:join(RootDir, FileName),
     ?line Name2 = [RootDir,"/","foo1",".","fil"],
     ?line Name3 = [RootDir,"/",foo,$1,[[[],[],'.']],"f",il],
-    ?line Name4 = list_to_atom(Name1),
     ?line {ok,Fd0} = ?FILE_MODULE:open(Name1,write),
     ?line ok = ?FILE_MODULE:close(Fd0),
 
@@ -1995,23 +2007,33 @@ names(Config) when is_list(Config) ->
     ?line ok = ?FILE_MODULE:close(Fd2),
     ?line {ok,Fd3} = ?FILE_MODULE:open(Name3,read),
     ?line ok = ?FILE_MODULE:close(Fd3),
-    ?line {ok,Fd4} = ?FILE_MODULE:open(Name4,read),
-    ?line ok = ?FILE_MODULE:close(Fd4),
+	case length(Name1) > 255 of
+		true ->
+			io:format("Path too long for an atom:\n\n~p\n", [Name1]);
+		false ->
+			Name4 = list_to_atom(Name1),
+			{ok,Fd4} = ?FILE_MODULE:open(Name4,read),
+			ok = ?FILE_MODULE:close(Fd4)
+	end,
 
     %% Try some path names
     ?line Path1 = RootDir,
     ?line Path2 = [RootDir],
     ?line Path3 = ['',[],[RootDir,[[]]]],
-    ?line Path4 = list_to_atom(Path1),
     ?line {ok,Fd11,_} = ?FILE_MODULE:path_open([Path1],FileName,read),
     ?line ok = ?FILE_MODULE:close(Fd11),
     ?line {ok,Fd12,_} = ?FILE_MODULE:path_open([Path2],FileName,read),
     ?line ok = ?FILE_MODULE:close(Fd12),
     ?line {ok,Fd13,_} = ?FILE_MODULE:path_open([Path3],FileName,read),
     ?line ok = ?FILE_MODULE:close(Fd13),
-    ?line {ok,Fd14,_} = ?FILE_MODULE:path_open([Path4],FileName,read),
-    ?line ok = ?FILE_MODULE:close(Fd14),
-
+	case length(Path1) > 255 of
+		true->
+			io:format("Path too long for an atom:\n\n~p\n", [Path1]);
+		false ->
+			Path4 = list_to_atom(Path1),
+			{ok,Fd14,_} = ?FILE_MODULE:path_open([Path4],FileName,read),
+			ok = ?FILE_MODULE:close(Fd14)
+	end,
     ?line [] = flush(),
     ?line test_server:timetrap_cancel(Dog),
     ok.
@@ -2673,6 +2695,9 @@ symlinks(Config) when is_list(Config) ->
 	case ?FILE_MODULE:make_symlink(Name, Alias) of
 	    {error, enotsup} ->
 		{skipped, "Links not supported on this platform"};
+	    {error, eperm} ->
+		{win32,_} = os:type(),
+		{skipped, "Windows user not privileged to create symlinks"};
 	    ok ->
 		?line {ok, Info1} = ?FILE_MODULE:read_file_info(Name),
 		?line {ok, Info1} = ?FILE_MODULE:read_file_info(Alias),
@@ -3599,7 +3624,11 @@ otp_10852(Config) when is_list(Config) ->
     ok = rpc_call(Node, list_dir_all, [B]),
     ok = rpc_call(Node, read_file, [B]),
     ok = rpc_call(Node, make_link, [B,B]),
-    ok = rpc_call(Node, make_symlink, [B,B]),
+    case rpc_call(Node, make_symlink, [B,B]) of
+		ok -> ok;
+		{error, E} when (E =:= enotsup) or (E =:= eperm) ->
+			{win32,_} = os:type()
+	end,
     ok = rpc_call(Node, delete, [B]),
     ok = rpc_call(Node, make_dir, [B]),
     ok = rpc_call(Node, del_dir, [B]),