From 06e679b3652f6757c7d033d97ec9fb4dfc3f532c Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Fri, 9 Jun 2017 12:15:00 +0200
Subject: kernel: Improve handling of Unicode filenames

---
 lib/kernel/src/group_history.erl | 4 ++--
 lib/kernel/src/inet_tcp_dist.erl | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/kernel/src/group_history.erl b/lib/kernel/src/group_history.erl
index 5ca5e2d1dd..91f3663cc5 100644
--- a/lib/kernel/src/group_history.erl
+++ b/lib/kernel/src/group_history.erl
@@ -218,7 +218,7 @@ handle_open_error({invalid_header, Term}) ->
          [Term]);
 handle_open_error({file_error, FileName, Reason}) ->
     show('$#erlang-history-file-error',
-         "Error handling File ~s. Reason: ~p~n"
+         "Error handling File ~ts. Reason: ~p~n"
          "History logging will be disabled.~n",
          [FileName, Reason]);
 handle_open_error(Err) ->
@@ -309,7 +309,7 @@ show_rename_warning() ->
 
 show_invalid_file_warning(FileName) ->
     show('$#erlang-history-invalid-file',
-         "Shell history expects to be able to use the file ~s "
+         "Shell history expects to be able to use the file ~ts "
          "which currently exists and is not a file usable for "
          "history logging purposes. History logging will be "
          "disabled.~n", [FileName]).
diff --git a/lib/kernel/src/inet_tcp_dist.erl b/lib/kernel/src/inet_tcp_dist.erl
index 8c8fe86811..e3fdb1bb22 100644
--- a/lib/kernel/src/inet_tcp_dist.erl
+++ b/lib/kernel/src/inet_tcp_dist.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -390,14 +390,14 @@ splitnode(Driver, Node, LongOrShortNames) ->
                             error_msg("** System running to use "
                                       "fully qualified "
                                       "hostnames **~n"
-                                      "** Hostname ~s is illegal **~n",
+                                      "** Hostname ~ts is illegal **~n",
                                       [Host]),
                             ?shutdown(Node)
                     end;
 		L when length(L) > 1, LongOrShortNames =:= shortnames ->
 		    error_msg("** System NOT running to use fully qualified "
 			      "hostnames **~n"
-			      "** Hostname ~s is illegal **~n",
+			      "** Hostname ~ts is illegal **~n",
 			      [Host]),
 		    ?shutdown(Node);
 		_ ->
-- 
cgit v1.2.3