Remove temporary files generated during scripts parsing when job is done

When .yaws scripts are parsed, each "<erl>" block produces a temporary erlang
module (i.e a .erl file). These modules are compiled and used during page
rendering.

Instead of keeping these files til the next parsing, we remove them just after
the compilation.

src/yaws_compile.erl

@@ -471,24 +471,17 @@ skip_space(<<C,Bin/binary>>, Lines, NumChars) when ?IS_SPACE(C) ->
 skip_space(Bin, Lines, NumChars) ->
     {ok, Lines, NumChars, Bin}.
 
-
 handle_erlang_block(Comp) ->
     {Line, _, ModName, _} = Comp#comp.erlcode,
     case check_module_name(ModName, Comp) of
         ok ->
             {Module, File} = get_module_info(ModName, Comp),
             ?Debug("Writting module ~s in file ~s~n", [Module,File]),
-            case file:open(File, [write]) of
-                {ok, Fd} ->
-                    dump_erlang_block(Fd, Module, Comp),
-                    file:close(Fd),
-                    case compile_erlang_block(File, Comp) of
-                        {ok, Mod, Binary, Warnings} ->
-                            report_compile_warnings(Comp, Warnings),
-                            load_erlang_block(Mod, Binary, Comp);
-                        {error, Errors, Warnings} ->
-                            {error, format_compile_error(Comp, Errors, Warnings)}
-                    end;
+            case dump_erlang_block(File, Module, Comp) of
+                ok ->
+                    Res = compile_and_load_erlang_block(File, Comp),
+                    file:delete(File),
+                    Res;
                 {error, Reason} ->
                     S = io_lib:format("Error in File ~s at line ~p~n"
                                       "    Failed to create file '~s': ~s~n",
@@ -518,7 +511,7 @@ get_module_info(undefined, Comp) ->
         true  ->
             YFile   = filename:rootname(Comp#comp.script),
             ModName = lists:flatten([YFile, "_yaws_", N]),
-            {ModName, ModName++".erl"};
+            {filename:basename(ModName), ModName++".erl"};
         false ->
             Dir     = yaws:id_dir((Comp#comp.gc)#gconf.id),
             ModName = lists:flatten(["m_", Comp#comp.hash, $_, N]),
@@ -556,23 +549,44 @@ check_module_name(ModName, Comp) ->
             ok
     end.
 
-dump_erlang_block(Fd, Module, Comp) ->
-    GC = Comp#comp.gc,
-    {SLine, ELine, _, Code} = Comp#comp.erlcode,
-    io:format(Fd, "-module(\'~s\').~n~n", [Module]),
-    io:format(Fd, "-export([out/1]).~n~n", []),
-
-    io:format(Fd, "-yawsfile(\"~s\").~n~n",[Comp#comp.script]),
-    io:format(Fd, "%%~n%% code between lines ~p and ~p from file ~s~n%%~n~n",
-              [SLine, ELine, Comp#comp.script]),
-
-    io:format(Fd, "-import(yaws_api, [f/2, fl/1, postvar/2, queryvar/2]).~n~n",
-              []),
-    io:format(Fd, "-include(\"~s/include/yaws_api.hrl\").~n",
-              [GC#gconf.yaws_dir]),
+dump_erlang_block(File, Module, Comp) ->
+    case file:open(File, [write]) of
+        {ok, Fd} ->
+            GC = Comp#comp.gc,
+            {SLine, ELine, _, Code} = Comp#comp.erlcode,
+            Data = [
+                    "-module('",Module,"').\n",
+                    "\n",
+                    "-export([out/1]).\n",
+                    "\n",
+                    "-yawsfile(\"",Comp#comp.script,"\").\n",
+                    "\n",
+                    "%%\n",
+                    "%% code between lines ",integer_to_list(SLine)," and ",
+                    integer_to_list(ELine),"\n",
+                    "%%\n",
+                    "\n",
+                    "-import(yaws_api, [f/2, fl/1, postvar/2, queryvar/2]).\n",
+                    "\n",
+                    "-include(\"",GC#gconf.yaws_dir,"/include/yaws_api.hrl\").\n",
+                    "\n",
+                    lists:reverse(Code)
+                   ],
+            file:write(Fd, Data),
+            file:close(Fd),
+            ok;
+        Else ->
+            Else
+    end.
 
-    io:format(Fd, "~n~s~n", [lists:reverse(Code)]),
-    ok.
+compile_and_load_erlang_block(File, Comp) ->
+    case compile_erlang_block(File, Comp) of
+        {ok, Mod, Bin, Ws} ->
+            report_compile_warnings(Comp, Ws),
+            load_erlang_block(Mod, Bin, Comp);
+        {error, Es, Ws} ->
+            {error, format_compile_error(Comp, Es, Ws)}
+    end.
 
 compile_erlang_block(File, Comp) ->
     case compile:file(File, Comp#comp.comp_opts) of

src/yaws_server.erl

@@ -2779,24 +2779,21 @@ do_yaws(CliSock, ARG, UT, N) ->
                                               Es == 0 ->
             deliver_dyn_file(CliSock, Spec, ARG, UT, N);
         Other  ->
-            del_old_files(get(gc),Other),
+            purge_old_mods(get(gc),Other),
             {ok, NbErrs, Spec} = yaws_compile:compile_file(UT#urltype.fullpath),
             ?Debug("Spec for file ~s is:~n~p~n",[UT#urltype.fullpath, Spec]),
             ets:insert(SC#sconf.ets, {Key, spec, Mtime, Spec, NbErrs}),
             deliver_dyn_file(CliSock, Spec, ARG, UT, N)
     end.
 
 
-del_old_files(_, []) ->
+purge_old_mods(_, []) ->
     ok;
-del_old_files(_GC, [{_FileAtom, spec, _Mtime1, Spec, _}]) ->
+purge_old_mods(_GC, [{_FileAtom, spec, _Mtime1, Spec, _}]) ->
     foreach(
       fun({mod, _, _, _,  Mod, _Func}) ->
-              F=filename:join([yaws:tmpdir(), "yaws",
-                               yaws:to_list(Mod) ++ ".erl"]),
               code:purge(Mod),
-              code:purge(Mod),
-              file:delete(F);
+              code:purge(Mod);
          (_) ->
               ok
       end, Spec).
@@ -3197,7 +3194,7 @@ handle_out_reply({yssi, Yfile}, LineNo, YawsFile, UT, ARG) ->
                                                       Es == 0 ->
                     deliver_dyn_file(CliSock, Spec ++ [yssi], ARG, UT2, N);
                 Other  ->
-                    del_old_files(get(gc), Other),
+                    purge_old_mods(get(gc), Other),
                     {ok, NbErrs, Spec} =
                         yaws_compile:compile_file(UT2#urltype.fullpath),
                     ?Debug("Spec for file ~s is:~n~p~n",