Skip to content

Remove CWD reads. #10317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: maint
Choose a base branch
from
Open

Remove CWD reads. #10317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
868d75c
kernel: don't look for a '..ez' archive
frazze-jobb Oct 22, 2025
d003544
erts: escript and tools should not read boot file from CWD
frazze-jobb Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion erts/etc/common/dialyzer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
2 changes: 1 addition & 1 deletion erts/etc/common/erlc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,7 @@ start_compile_server(char* node_name, char** argv)
while (strcmp(argv[0], "-mode") != 0) {
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");
Expand Down
2 changes: 1 addition & 1 deletion erts/etc/common/escript.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion erts/etc/common/typer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
Binary file modified erts/preloaded/ebin/init.beam
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion erts/preloaded/src/init.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} ->
Expand Down
2 changes: 2 additions & 0 deletions lib/kernel/src/code_server.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,8 @@ insert_name(Name, Dir, Db) ->
AppDir = del_ebin(Dir),
do_insert_name(Name, AppDir, Db).

do_insert_name(".", _, _) ->
true;
do_insert_name(Name, AppDir, Db) ->
{Base, SubDirs} = archive_subdirs(AppDir),
ets:insert(Db, {Name, AppDir, Base, SubDirs}),
Expand Down
Loading