Merge pull request #795 from xavierleroy/fix-exe-name

More robust determination of full path to current executable

1 files changed, 3 insertions, 3 deletions

diff --git a/asmrun/startup.c b/asmrun/startup.c
index 5e72453219..8f469aedef 100644
--- a/asmrun/startup.c
+++ b/asmrun/startup.c
@@ -102,8 +102,7 @@ extern void caml_install_invalid_parameter_handler();
 
 void caml_main(char **argv)
 {
-  char * exe_name;
-  static char proc_self_exe[256];
+  char * exe_name, * proc_self_exe;
   value res;
   char tos;
 
@@ -133,7 +132,8 @@ void caml_main(char **argv)
   caml_debugger_init (); /* force debugger.o stub to be linked */
   exe_name = argv[0];
   if (exe_name == NULL) exe_name = "";
-  if (caml_executable_name(proc_self_exe, sizeof(proc_self_exe)) == 0)
+  proc_self_exe = caml_executable_name();
+  if (proc_self_exe != NULL)
     exe_name = proc_self_exe;
   else
     exe_name = caml_search_exe_in_path(exe_name);