Fix file:pread and :pwrite to use character encoding

1 files changed, 39 insertions, 7 deletions

diff --git a/lib/kernel/src/file_io_server.erl b/lib/kernel/src/file_io_server.erl
index 5b2cae6b02..9c425d2175 100644
--- a/lib/kernel/src/file_io_server.erl
+++ b/lib/kernel/src/file_io_server.erl
@@ -214,26 +214,58 @@ file_request({allocate, Offset, Length},
          #state{handle = Handle} = State) ->
     Reply = ?PRIM_FILE:allocate(Handle, Offset, Length),
     {reply, Reply, State};
+file_request({pread,At,Sz}, State)
+  when At =:= cur;
+       At =:= {cur,0} ->
+    case get_chars(Sz, latin1, State) of
+	{reply,Reply,NewState}
+	  when is_list(Reply);
+	       is_binary(Reply) ->
+	    {reply,{ok,Reply},NewState};
+	{stop,_,Reply,NewState} ->
+	    {error,Reply,NewState};
+	Other ->
+	    Other
+    end;
 file_request({pread,At,Sz}, 
-	     #state{handle=Handle,buf=Buf,read_mode=ReadMode}=State) ->
+	     #state{handle=Handle,buf=Buf}=State) ->
     case position(Handle, At, Buf) of
 	{error,_} = Reply ->
 	    {error,Reply,State};
 	_ ->
-	    case ?PRIM_FILE:read(Handle, Sz) of
-		{ok,Bin} when ReadMode =:= list ->
-		    std_reply({ok,binary_to_list(Bin)}, State);
-		Reply ->
-		    std_reply(Reply, State)
+	    case get_chars(Sz, latin1, State#state{buf= <<>>}) of
+		{reply,Reply,NewState}
+		  when is_list(Reply);
+		       is_binary(Reply) ->
+		    {reply,{ok,Reply},NewState};
+		{stop,_,Reply,NewState} ->
+		    {error,Reply,NewState};
+		Other ->
+		    Other
 	    end
     end;
+file_request({pwrite,At,Data},
+	     #state{buf= <<>>}=State)
+  when At =:= cur;
+       At =:= {cur,0} ->
+    case put_chars(Data, latin1, State) of
+	{stop,_,Reply,NewState} ->
+	    {error,Reply,NewState};
+	Other ->
+	    Other
+    end;
 file_request({pwrite,At,Data}, 
 	     #state{handle=Handle,buf=Buf}=State) ->
     case position(Handle, At, Buf) of
 	{error,_} = Reply ->
 	    {error,Reply,State};
 	_ ->
-	    std_reply(?PRIM_FILE:write(Handle, Data), State)
+	    case put_chars(Data, latin1, State) of
+		{stop,_,Reply,NewState} ->
+		    {error,Reply,NewState};
+		Other ->
+		    Other
+	    end
     end;
 file_request(datasync,
 	     #state{handle=Handle}=State) ->