From 61138cb31e1f6ad44d3ca54e668de9d2d4adb2ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 9 Apr 2014 12:42:32 +0200
Subject: Support path names with characters outside the US ASCII range

---
 lib/stdlib/src/erl_tar.erl | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'lib/stdlib/src/erl_tar.erl')

diff --git a/lib/stdlib/src/erl_tar.erl b/lib/stdlib/src/erl_tar.erl
index 40b48d7999..89b4ea6c04 100644
--- a/lib/stdlib/src/erl_tar.erl
+++ b/lib/stdlib/src/erl_tar.erl
@@ -381,7 +381,12 @@ to_octal(Int, Count, Result) ->
     to_octal(Int div 8, Count-1, [Int rem 8 + $0|Result]).
 
 to_string(Str0, Count) ->
-    Str = list_to_binary(Str0),
+    Str = case file:native_name_encoding() of
+	      utf8 ->
+		  unicode:characters_to_binary(Str0);
+	      latin1 ->
+		  list_to_binary(Str0)
+	  end,
     case byte_size(Str) of
 	Size when Size < Count ->
 	    [Str|zeroes(Count-Size)];
@@ -608,7 +613,22 @@ typeflag(Bin) ->
 %% Get the name of the file from the prefix and name fields of the
 %% tar header.
 
-get_name(Bin) ->
+get_name(Bin0) ->
+    List0 = get_name_raw(Bin0),
+    case file:native_name_encoding() of
+	utf8 ->
+	    Bin = list_to_binary(List0),
+	    case unicode:characters_to_list(Bin) of
+		{error,_,_} ->
+		    List0;
+		List when is_list(List) ->
+		    List
+	    end;
+	latin1 ->
+	    List0
+    end.
+
+get_name_raw(Bin) ->
     Name = from_string(Bin, ?th_name, ?th_name_len),
     case binary_to_list(Bin, ?th_prefix+1, ?th_prefix+1) of
 	[0] ->
-- 
cgit v1.2.3


From bb2b84c35e75ae80174ef54dad7babf6c6fa9075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 9 Apr 2014 16:30:49 +0200
Subject: Correct end of tape marker

The POSIX standard for tar says that there must be at least
two 512-bytes zero blocks at the end of the tar archive file.

Our implementation would only emit a single 512-byte zero block if the
size of the last file was in the range 18*512 through 19*512-1 (modulo
20*512). GNU tar would correctly unpack such tar archive file, but
would emit a warning:

   tar: A lone zero block at 20
---
 lib/stdlib/src/erl_tar.erl | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'lib/stdlib/src/erl_tar.erl')

diff --git a/lib/stdlib/src/erl_tar.erl b/lib/stdlib/src/erl_tar.erl
index 89b4ea6c04..acf7a5cd40 100644
--- a/lib/stdlib/src/erl_tar.erl
+++ b/lib/stdlib/src/erl_tar.erl
@@ -397,9 +397,17 @@ to_string(Str0, Count) ->
 
 pad_file(File) ->
     {ok,Position} = file:position(File, {cur,0}),
-    %% There must be at least one empty record at the end of the file.
-    Zeros = zeroes(?block_size - (Position rem ?block_size)),
-    file:write(File, Zeros).
+    %% There must be at least two zero records at the end.
+    Fill = case ?block_size - (Position rem ?block_size) of
+	       Fill0 when Fill0 < 2*?record_size ->
+		   %% We need to another block here to ensure that there
+		   %% are at least two zero records at the end.
+		   Fill0 + ?block_size;
+	       Fill0 ->
+		   %% Large enough.
+		   Fill0
+	   end,
+    file:write(File, zeroes(Fill)).
 
 split_filename(Name) when length(Name) =< ?th_name_len ->
     {"", Name};
-- 
cgit v1.2.3