File 2119-Fix-erlang-system-lookup-from-escript-bug-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2119-Fix-erlang-system-lookup-from-escript-bug-introduced.patch of Package erlang (Revision b921e8aed3aceafaa8c09c18784302db)

Currently displaying revision b921e8aed3aceafaa8c09c18784302db , Show latest

From 68de330d763fb450a763a2d56e63dbe009e12703 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Mon, 22 May 2017 15:49:15 +0200
Subject: [PATCH] Fix erlang system lookup from escript bug introduced in PR
 #1293

Erlang system found in PATH was used even when explicitly pointing out
the escript binary in another Erlang system.
---
 erts/etc/common/escript.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/erts/etc/common/escript.c b/erts/etc/common/escript.c
index 630e24188..80cc25b04 100644
--- a/erts/etc/common/escript.c
+++ b/erts/etc/common/escript.c
@@ -433,7 +433,7 @@ main(int argc, char** argv)
     char* emulator;
     char* env;
     char* basename;
-    char* absname;
+    char* def_emu_lookup_path;
     char scriptname[PMAX];
     char** last_opt;
     char** first_opt;
@@ -480,6 +480,7 @@ main(int argc, char** argv)
 #else
     if (strcmp(basename, "escript") == 0) {
 #endif
+        def_emu_lookup_path = argv[0];
 	/*
 	 * Locate all options before the script name.
 	 */
@@ -498,27 +499,24 @@ main(int argc, char** argv)
 	argc--;
 	argv++;
     } else {
+        char *absname = find_prog(argv[0]);
 #ifdef __WIN32__
-	int len;
-#endif
-	absname = find_prog(argv[0]);
-#ifdef __WIN32__
-	len = strlen(absname);
+	int len = strlen(absname);
 	if (len >= 4 && _stricmp(absname+len-4, ".exe") == 0) {
 	    absname[len-4] = '\0';
 	}
 #endif
-
 	erts_snprintf(scriptname, sizeof(scriptname), "%s.escript",
 		      absname);
-	efree(absname);
+        efree(absname);
+        def_emu_lookup_path = scriptname;
     }
 
     /* Determine path to emulator */
     emulator = env = get_env("ESCRIPT_EMULATOR");
 
     if (emulator == NULL) {
-	emulator = get_default_emulator(scriptname);
+	emulator = get_default_emulator(def_emu_lookup_path);
     }
 
     if (strlen(emulator) >= PMAX)
-- 
2.13.0

Places

File 2119-Fix-erlang-system-lookup-from-escript-bug-introduced.patch of Package erlang (Revision b921e8aed3aceafaa8c09c18784302db)

Places