Make prim_file skip invalid filenames in unicode mode

The fix affects list_dir and read_link. Raw filenames are now
never produced, just consumed even if +fnu or +fna is used on
Linux etc.

This also adds the options to get error return or error handler
warning messages with +fn{u|a}{i|w|e} as an option to erl.

This is still not documented and there needs to be other versions
of read_dir and read_link to facilitate reading of all types
of filenames and links.

A check that we will not change to an invalid directory is also needed.

4 files changed, 40 insertions, 4 deletions

diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
index f8c2df3a5a..4a3af265c1 100644
--- a/erts/preloaded/ebin/erl_prim_loader.beam
+++ b/erts/preloaded/ebin/erl_prim_loader.beam
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index ca93edbe25..b1b54ca050 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
index c2fac8c0fc..7490954f2d 100644
--- a/erts/preloaded/src/erl_prim_loader.erl
+++ b/erts/preloaded/src/erl_prim_loader.erl
@@ -150,7 +150,17 @@ start_it("inet", Id, Pid, Hosts) ->
 start_it("efile", Id, Pid, _Hosts) ->
     process_flag(trap_exit, true),
     {ok, Port} = prim_file:start(),
-    init_ack(Pid),
+    %% Check that we started in a valid directory.
+    case prim_file:get_cwd(Port) of
+	{error, _} ->
+	    %% At this point in the startup, we have no error_logger at all.
+	    Report = "Invalid current directory or invalid filename "
+		"mode: loader cannot read current directory\n",
+	    erlang:display(Report),
+	    exit({error, invalid_current_directory});
+	_ ->
+	    init_ack(Pid)
+    end,
     MultiGet = case erlang:system_info(thread_pool_size) of
                    0 -> false;
                    _ -> true
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index af1a6127c9..27e7640b7e 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -155,13 +155,15 @@
          internal_normalize_utf8/1]).
 
 -type prim_file_name() :: string() | unicode:unicode_binary().
+-type prim_file_name_error() :: 'error' | 'ignore' | 'warning'.
 
 -spec internal_name2native(prim_file_name()) -> binary().
 
 internal_name2native(_) ->
     erlang:nif_error(undefined).
 
--spec internal_native2name(binary()) -> prim_file_name().
+-spec internal_native2name(binary()) ->
+        prim_file_name() | {'error',prim_file_name_error()}.
 
 internal_native2name(_) ->
     erlang:nif_error(undefined).
@@ -924,7 +926,21 @@ list_dir_response(Port, Acc0) ->
     end.
 
 list_dir_convert([Name|Names]) ->
-    [prim_file:internal_native2name(Name)|list_dir_convert(Names)];
+    %% If the filename cannot be converted, return error or ignore
+    %% with optional error logger warning, depending on +fn{u|a}{i|e|w}
+    %% emulator switches.
+    case prim_file:internal_native2name(Name) of
+	{error, warning} ->
+	    error_logger:warning_msg("Non-unicode filename ~p ignored\n",
+				     [Name]),
+	    list_dir_convert(Names);
+	{error, ignore} ->
+	    list_dir_convert(Names);
+	{error, error} ->
+	    {error, {no_translation, Name}};
+	Converted when is_list(Converted) ->
+	    [Converted|list_dir_convert(Names)]
+    end;
 list_dir_convert([]) -> [].
 
 %%%-----------------------------------------------------------------
@@ -933,7 +949,17 @@ list_dir_convert([]) -> [].
 handle_fname_response(Port) ->
     case drv_get_response(Port) of
 	{fname, Name} ->
-	    {ok, prim_file:internal_native2name(Name)};
+	    case prim_file:internal_native2name(Name) of
+		{error, warning} ->
+		    error_logger:warning_msg("Non-unicode filename ~p "
+					     "ignored when reading link\n",
+					     [Name]),
+		    {error, einval};
+		{error, _} ->
+		    {error, einval};
+		Converted when is_list(Converted) ->
+		    {ok, Converted}
+	    end;
 	Error ->
 	    Error
     end.