aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrothoff <grothoff@140774ce-b5e7-0310-ab8b-a85725594a96>2012-12-08 21:38:04 +0000
committergrothoff <grothoff@140774ce-b5e7-0310-ab8b-a85725594a96>2012-12-08 21:38:04 +0000
commit6837b3c28e207d6ed0211755801bff0e2647021c (patch)
tree160b8d84c9f35c6a9f986e99447df60dbf7cd244
parentfd78b751c971f7c63676e6cd0ee75a926934336f (diff)
look in /opt/jdk1.6.0_22/bin:/usr/lib/jvm/java-6-sun//bin:.:/home/grothoff/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games for gnunet-arm before trying /proc/exe
git-svn-id: https://gnunet.org/svn/gnunet@25329 140774ce-b5e7-0310-ab8b-a85725594a96
-rw-r--r--src/util/os_installation.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 674e47a5fe..e35f86c3ee 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -396,6 +396,9 @@ os_get_gnunet_path ()
#if LINUX
if (NULL != (ret = get_path_from_proc_maps ()))
return ret;
+ /* try path *first*, before /proc/exe, as /proc/exe can be wrong */
+ if (NULL != (ret = get_path_from_PATH ("gnunet-arm")))
+ return ret;
if (NULL != (ret = get_path_from_proc_exe ()))
return ret;
#endif