diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2002-09-03 13:56:36 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2002-09-03 13:56:36 +0000 |
| commit | 9adc8529679dc5e7b6426dc0a47469fb0d890fb2 (patch) | |
| tree | 24a87f739d45597c6d00a4f3a31013cbd6b84b6a /asmrun/startup.c | |
| parent | ed82bb65a6f23401fba1196d991197554e748bdb (diff) | |
Blinder la lecture de /proc/self/exe (sur de vieux noyaux Linux, ca ne renvoie pas un nom de fichier, mais un inode)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5113 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'asmrun/startup.c')
| -rw-r--r-- | asmrun/startup.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/asmrun/startup.c b/asmrun/startup.c index 644f48049..c052996e4 100644 --- a/asmrun/startup.c +++ b/asmrun/startup.c @@ -24,6 +24,7 @@ #include "gc_ctrl.h" #include "misc.h" #include "mlvalues.h" +#include "osdeps.h" #include "printexc.h" #include "sys.h" #ifdef HAS_UI @@ -119,7 +120,6 @@ void caml_main(char **argv) char * exe_name; #ifdef __linux__ static char proc_self_exe[256]; - int retcode; #endif value res; @@ -135,12 +135,8 @@ void caml_main(char **argv) init_signals(); exe_name = argv[0]; #ifdef __linux__ - /* Recover executable name from /proc/self/exe, much more reliable */ - retcode = readlink("/proc/self/exe", proc_self_exe, sizeof(proc_self_exe)); - if (retcode != -1 && retcode < sizeof(proc_self_exe)) { - proc_self_exe[retcode] = 0; + if (executable_name(proc_self_exe, sizeof(proc_self_exe)) == 0) exe_name = proc_self_exe; - } #endif sys_init(exe_name, argv); res = caml_start_program(); |