File 1410-erts-Remove-unused-CERL_DETACHED_PROG-code... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1410-erts-Remove-unused-CERL_DETACHED_PROG-code.patch of Package erlang (Revision 2f34adf177443e3dcd9a51828e33970d)

Currently displaying revision 2f34adf177443e3dcd9a51828e33970d , Show latest

From b792a91c9bfff8945f90aa6253b1b53ef11bff03 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Wed, 6 Apr 2022 09:31:40 +0200
Subject: [PATCH] erts: Remove unused CERL_DETACHED_PROG code

The CERL_DETACHED_PROG code seems to be a relic that is no
longer used. So we delete it doesn't work anyway.

Closes #4323
---
 erts/etc/common/erlexec.c                     | 19 -------------------
 lib/runtime_tools/src/system_information.erl  |  1 -
 .../information_test_report.dat               |  1 -
 3 files changed, 21 deletions(-)

diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 7c3c91224c..d892a2847d 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -456,21 +456,6 @@ int main(int argc, char **argv)
 	goto skip_arg_massage;
     }
     free_env_val(s);
-#else
-    int reset_cerl_detached = 0;
-
-    s = get_env("CERL_DETACHED_PROG");
-    if (s && strcmp(s, "") != 0) {
-	emu = s;
-	start_detached = 1;
-	reset_cerl_detached = 1;
-	ensure_EargsSz(argc + 1);
-	memcpy((void *) Eargsp, (void *) argv, argc * sizeof(char *));
-	Eargsp[argc] = emu;
-	Eargsp[argc] = NULL;
-	goto skip_arg_massage;
-    }
-    free_env_val(s);
 #endif
 
     initial_argv_massage(&argc, &argv); /* Merge with env; expand -args_file */
@@ -1142,15 +1127,11 @@ int main(int argc, char **argv)
 
 #else
 
- skip_arg_massage:
     if (start_detached) {
 	int status = fork();
 	if (status != 0)	/* Parent */
 	    return 0;
 
-	if (reset_cerl_detached)
-	    putenv("CERL_DETACHED_PROG=");
-
 	/* Detach from controlling terminal */
 #ifdef HAVE_SETSID
 	setsid();
diff --git a/lib/runtime_tools/src/system_information.erl b/lib/runtime_tools/src/system_information.erl
index 73b4e24847..507071fa2f 100644
--- a/lib/runtime_tools/src/system_information.erl
+++ b/lib/runtime_tools/src/system_information.erl
@@ -387,7 +387,6 @@ os_getenv_erts_specific() ->
     os_getenv_erts_specific([
 	    "BINDIR",
 	    "DIALYZER_EMULATOR",
-	    "CERL_DETACHED_PROG",
 	    "EMU",
 	    "ERL_CONSOLE_MODE",
 	    "ERL_CRASH_DUMP",
diff --git a/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat b/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat
index 94120c0dc7..3c8f582086 100644
--- a/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat
+++ b/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat
@@ -9729,7 +9729,6 @@
                 [{"BINDIR",
                   "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/erts-5.10.3/bin"},
                  {"DIALYZER_EMULATOR",false},
-                 {"CERL_DETACHED_PROG",false},
                  {"EMU","beam"},
                  {"ERL_CONSOLE_MODE",false},
                  {"ERL_CRASH_DUMP",false},
-- 
2.34.1

Places

File 1410-erts-Remove-unused-CERL_DETACHED_PROG-code.patch of Package erlang (Revision 2f34adf177443e3dcd9a51828e33970d)

Places