Merge branch 'pan/unicode_home/OTP-10160' into maint

* pan/unicode_home/OTP-10160:
  Teach release_handler_SUITE about file:native_name_encoding/0
  Add documetation about Unicode in environment
  Make get/putenv and erlexec understand Unicode

2 files changed, 65 insertions, 2 deletions

diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
index e94119845a..09c525b376 100644
--- a/lib/kernel/doc/src/os.xml
+++ b/lib/kernel/doc/src/os.xml
@@ -80,6 +80,10 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
           Each environment variable is given as a single string on
           the format <c>"VarName=Value"</c>, where <c>VarName</c> is
           the name of the variable and <c>Value</c> its value.</p>
+	<p>If Unicode file name encoding is in effect (see the <seealso
+	marker="erts:erl#file_name_encoding">erl manual
+	page</seealso>), the strings may contain characters with
+	codepoints > 255.</p>
       </desc>
     </func>
     <func>
@@ -93,6 +97,10 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
         <p>Returns the <c>Value</c> of the environment variable
           <c>VarName</c>, or <c>false</c> if the environment variable
           is undefined.</p>
+	<p>If Unicode file name encoding is in effect (see the <seealso
+	marker="erts:erl#file_name_encoding">erl manual
+	page</seealso>), the strings (both <c>VarName</c> and
+	<c>Value</c>) may contain characters with codepoints > 255.</p>
       </desc>
     </func>
     <func>
@@ -123,6 +131,13 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
       <desc>
         <p>Sets a new <c>Value</c> for the environment variable
           <c>VarName</c>.</p>
+	<p>If Unicode filename encoding is in effect (see the <seealso
+	marker="erts:erl#file_name_encoding">erl manual
+	page</seealso>), the strings (both <c>VarName</c> and
+	<c>Value</c>) may contain characters with codepoints > 255.</p>
+	<p>On Unix platforms, the environment will be set using UTF-8 encoding
+	if Unicode file name translation is in effect. On Windows the 
+	environment is set using wide character interfaces.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl
index 53bcb1162d..be33ec2c06 100644
--- a/lib/kernel/test/file_name_SUITE.erl
+++ b/lib/kernel/test/file_name_SUITE.erl
@@ -74,7 +74,7 @@
 	 init_per_suite/1,end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2, end_per_testcase/2]).
--export([normal/1,icky/1,very_icky/1,normalize/1]).
+-export([normal/1,icky/1,very_icky/1,normalize/1,home_dir/1]).
 
 
 init_per_testcase(_Func, Config) ->
@@ -88,7 +88,7 @@ end_per_testcase(_Func, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [normal, icky, very_icky, normalize].
+    [normal, icky, very_icky, normalize, home_dir].
 
 groups() -> 
     [].
@@ -105,6 +105,54 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
 	Config.
 
+home_dir(suite) ->
+    [];
+home_dir(doc) ->
+    ["Check that Erlang can be started with unicode named home directory"];
+home_dir(Config) when is_list(Config) ->
+    try
+	Name=[960,945,964,961,953,954],
+	Priv = ?config(priv_dir, Config),
+	UniMode = file:native_name_encoding() =/= latin1,
+	if 
+	    not UniMode ->
+		throw(need_unicode_mode);
+	    true ->
+		ok
+	end,
+	NewHome=filename:join(Priv,Name),
+	file:make_dir(NewHome),
+	{SaveOldName,SaveOldValue} = case os:type() of
+					 {win32,nt} ->
+					     HomePath=re:replace(filename:nativename(NewHome),"^[a-zA-Z]:","",[{return,list},unicode]),
+					     Save = os:getenv("HOMEPATH"),
+					     os:putenv("HOMEPATH",HomePath),
+					     {"HOMEPATH",Save};
+					 {unix,_} ->
+					     Save = os:getenv("HOME"),
+					     os:putenv("HOME",NewHome),
+					     {"HOME",Save};
+					 _ ->
+					     rm_rf(prim_file,NewHome),
+					     throw(unsupported_os)
+				     end,
+	try
+	    {ok,Node} = test_server:start_node(test_unicode_homedir,slave,[{args,"-setcookie "++atom_to_list(erlang:get_cookie())}]),
+	    test_server:stop_node(Node),
+	    ok
+	after
+	    os:putenv(SaveOldName,SaveOldValue),
+	    rm_rf(prim_file,NewHome)
+	end
+    catch
+	throw:need_unicode_mode ->
+	    io:format("Sorry, can only run in unicode mode.~n"),
+	    {skipped,"VM needs to be started in Unicode filename mode"};
+	throw:unsupported_os ->
+	    io:format("Sorry, can only run on Unix/Windows.~n"),
+	    {skipped,"Runs only on Unix/Windows"}
+    end.
+
 normalize(suite) ->
     [];
 normalize(doc) ->