Merge branch 'maint'

Author: frazze-jobb

erts/etc/common/dialyzer.c

@@ -252,7 +252,7 @@ int main(int argc, char** argv)
     }
 
     PUSH("+B");
-    PUSH2("-boot", "no_dot_erlang");
+    PUSH2("-boot", "$ROOT/no_dot_erlang");
     PUSH3("-run", "dialyzer", "plain_cl");
     PUSH("-extra");
 

erts/etc/common/erlc.c

@@ -974,7 +974,7 @@ start_compile_server(char* node_name, char** argv)
             eargv[eargc++] = *argv++;
         }
     }
-    PUSH2("-boot", "no_dot_erlang");
+    PUSH2("-boot", "$ROOT/no_dot_erlang");
     PUSH2("-sname", node_name);
     PUSH2("-setcookie", "erlc_compile_server_cookie");
     PUSH("-hidden");

erts/etc/common/escript.c

@@ -513,7 +513,7 @@ main(int argc, char** argv)
 
     PUSH("+B");
     PUSH("-noshell");
-    PUSH2("-boot", "no_dot_erlang");
+    PUSH2("-boot", "$ROOT/no_dot_erlang");
 
     /*
      * Read options from the %%! row in the script and add them as args

erts/etc/common/typer.c

@@ -179,7 +179,7 @@ main(int argc, char** argv)
     }
 
     PUSH("+B");
-    PUSH2("-boot", "no_dot_erlang");
+    PUSH2("-boot", "$ROOT/no_dot_erlang");
     PUSH3("-run", "typer", "start");
     PUSH("-extra");
 

erts/preloaded/ebin/init.beam

@@ -1259,7 +1259,10 @@ path_flags(Flags) ->
     {bs2ss(Pa),bs2ss(Pz)}.
 
 get_boot(BootFile0,Root) ->
-    BootFile = BootFile0 ++ ".boot",
+    BootFile = case BootFile0 of
+        "$ROOT/" ++ BootFile1 -> Root ++ "/bin/" ++ BootFile1 ++ ".boot";
+        _ -> BootFile0 ++ ".boot"
+    end,
 
     case get_boot(BootFile) of
 	{ok, CmdList} ->

erts/preloaded/ebin/prim_socket.beam

@@ -843,6 +843,9 @@ insert_name(Name, Dir, Db) ->
     AppDir = del_ebin(Dir),
     do_insert_name(Name, AppDir, Db).
 
+do_insert_name(".", _, _) ->
+    %% "." is most likely not an archive, avoid looking for subdirs
+    true;
 do_insert_name(Name, AppDir, Db) ->
     {Base, SubDirs} = archive_subdirs(AppDir),
     ets:insert(Db, {Name, AppDir, Base, SubDirs}),

erts/preloaded/ebin/prim_zip.beam

@@ -831,7 +831,8 @@ handle_request(State = #state{ unicode = U }, {putc, Binary}) ->
                     end,
                     Moves = move_cursor(State, State#state.cols, ToCol)
             end,
-            Binary1 = if PutcBufferState#state.putc_buffer =:= <<>> ->
+            BinaryNoAnsi = remove_ansi_sequences(PutcBufferState#state.putc_buffer),
+            Binary1 = if BinaryNoAnsi =:= <<>> ->
                     %% Binary has a real new line at the end
                     Binary;
                 true ->
@@ -1014,6 +1015,19 @@ handle_request(State, Req) ->
     erlang:display({unhandled_request, Req}),
     {"", State}.
 
+remove_ansi_sequences(<<27,Bin/binary>>) ->
+    Bins = binary:split(Bin, <<27>>, [global]),
+    remove_ansi_sequences1([<<27,B/binary>> || B <- Bins],[]);
+remove_ansi_sequences(Bin) ->
+    [Acc|Bins] = binary:split(Bin, <<27>>, [global]),
+    remove_ansi_sequences1([<<27,B/binary>> || B <- Bins],[Acc]).
+remove_ansi_sequences1([Bin|Bins], Acc) ->
+    {match, [{0, N}]} = re:run(Bin, ansi_regexp()),
+    <<_:N/binary, AnsiRest/binary>> = Bin,
+    remove_ansi_sequences1(Bins, [AnsiRest|Acc]);
+remove_ansi_sequences1([], Acc) ->
+    list_to_binary(lists:reverse(Acc)).
+
 last_or_empty([]) -> [];
 last_or_empty([H]) -> H;
 last_or_empty(L) -> [H|_] = lists:reverse(L), H.