From 26d609d3193c0adb371e27317fa0de7cda203061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kan=20Mattsson?= <hakan@erlang.org>
Date: Fri, 5 Mar 2010 14:33:00 +0100
Subject: Make reltool independent of the function escript:foldl/3

The function is undocumented and is removed. The new implementation
uses the newly introduced functions escript:extract/2 and
zip:foldl/3. These new functions are documented (which implies that
they are a part of the public API).
---
 lib/reltool/src/reltool_mod_win.erl |  2 +-
 lib/reltool/src/reltool_server.erl  | 27 +++++++++++++++------------
 lib/reltool/src/reltool_utils.erl   | 21 +++++++++++++++++++++
 3 files changed, 37 insertions(+), 13 deletions(-)

(limited to 'lib')

diff --git a/lib/reltool/src/reltool_mod_win.erl b/lib/reltool/src/reltool_mod_win.erl
index c05f73cde8..754f6a0e8a 100644
--- a/lib/reltool/src/reltool_mod_win.erl
+++ b/lib/reltool/src/reltool_mod_win.erl
@@ -379,7 +379,7 @@ find_escript_bin(#app{active_dir = ActiveDir}, Mod) ->
 		 filename:dirname(ActiveDir)}
 	end,
     try
-	case escript:foldl(Fun, NotFound, Escript) of
+	case reltool_utils:escript_foldl(Fun, NotFound, Escript) of
 	    {ok, {text, Bin}} ->
 		Bin;
 	    {ok, {obj, Bin}} ->
diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl
index 8d4530131f..11839e6a0e 100644
--- a/lib/reltool/src/reltool_server.erl
+++ b/lib/reltool/src/reltool_server.erl
@@ -1412,18 +1412,21 @@ escripts_to_apps([Escript | Escripts], Apps, OldApps, Status) ->
                           {FileAcc, StatusAcc}
                   end
           end,
-    try
-        case escript:foldl(Fun, {[], Status}, Escript) of
-            {ok, {Files, Status2}} ->
-                {Apps2, Status3} = files_to_apps(Escript, lists:sort(Files), Apps, Apps, OldApps, Status2),
-                escripts_to_apps(Escripts, Apps2, OldApps, Status3);
-            {error, Reason} ->
-                Text = lists:flatten(io_lib:format("~p", [Reason])),
-                {[], reltool_utils:return_first_error(Status, "Illegal escript " ++ Escript ++ ": " ++ Text)}
-        end
-    catch 
-        throw:Reason2 when is_list(Reason2) ->
-            {[], reltool_utils:return_first_error(Status, "Illegal escript " ++ Escript ++ ": " ++ Reason2)}
+    case reltool_utils:escript_foldl(Fun, {[], Status}, Escript) of
+	{ok, {Files, Status2}} ->
+	    {Apps2, Status3} =
+		files_to_apps(Escript,
+			      lists:sort(Files),
+			      Apps,
+			      Apps,
+			      OldApps,
+			      Status2),
+	    escripts_to_apps(Escripts, Apps2, OldApps, Status3);
+	{error, Reason} ->
+	    Text = lists:flatten(io_lib:format("~p", [Reason])),
+	    {[], reltool_utils:return_first_error(Status,
+						  "Illegal escript " ++
+						  Escript ++ ": " ++ Text)}
     end;
 escripts_to_apps([], Apps, _OldApps, Status) ->
     {Apps, Status}.
diff --git a/lib/reltool/src/reltool_utils.erl b/lib/reltool/src/reltool_utils.erl
index 8d52ade9be..4de98317b5 100644
--- a/lib/reltool/src/reltool_utils.erl
+++ b/lib/reltool/src/reltool_utils.erl
@@ -532,6 +532,27 @@ default_val(Val, Default) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+escript_foldl(Fun, Acc, File) ->
+    case escript:extract(File, [compile_source]) of
+	{ok, [_Shebang, _Comment, _EmuArgs, Body]} ->
+	    case Body of
+		{source, BeamCode} ->
+		    GetInfo = fun() -> file:read_file_info(File) end,
+		    GetBin = fun() -> BeamCode end,
+		    {ok, Fun(".", GetInfo, GetBin, Acc)};
+		{beam, BeamCode} ->
+		    GetInfo = fun() -> file:read_file_info(File) end,
+		    GetBin = fun() -> BeamCode end,
+		    {ok, Fun(".", GetInfo, GetBin, Acc)};
+		{archive, ArchiveBin} ->
+		    zip:foldl(Fun, Acc, {File, ArchiveBin})
+	    end;
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 call(Name, Msg) when is_atom(Name) ->
     call(whereis(Name), Msg);
 call(Pid, Msg) when is_pid(Pid) ->
-- 
cgit v1.2.3