[GNUnet-SVN] r25329 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2012-12-08 22:38:04 +0100 (Sat, 08 Dec 2012)
New Revision: 25329

Modified:
   gnunet/src/util/os_installation.c
Log:
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

Modified: gnunet/src/util/os_installation.c
===================================================================
--- gnunet/src/util/os_installation.c   2012-12-08 20:19:08 UTC (rev 25328)
+++ gnunet/src/util/os_installation.c   2012-12-08 21:38:04 UTC (rev 25329)
@@ -396,6 +396,9 @@
 #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