[GNUnet-SVN] r24203 - in Extractor: . src/main

[gnunet]

Author: grothoff
Date: 2012-10-06 15:25:58 +0200 (Sat, 06 Oct 2012)
New Revision: 24203

Modified:
   Extractor/ChangeLog
   Extractor/configure.ac
   Extractor/src/main/extractor_plugpath.c
Log:
-fixing #2562

Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2012-10-06 13:09:44 UTC (rev 24202)
+++ Extractor/ChangeLog 2012-10-06 13:25:58 UTC (rev 24203)
@@ -1,3 +1,7 @@
+Sat Oct  6 15:24:20 CEST 2012
+       Fixing installation path discovery on Darwin (#2562).
+       Releasing GNU libextractor 1.0.1. -CG
+
 Tue Sep 25 16:25:05 CEST 2012
        Releasing GNU libextractor 1.0.0. -CG
 

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2012-10-06 13:09:44 UTC (rev 24202)
+++ Extractor/configure.ac      2012-10-06 13:25:58 UTC (rev 24203)
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.61)
-AC_INIT([libextractor], [1.0.0], address@hidden)
+AC_INIT([libextractor], [1.0.1], address@hidden)
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AH_TOP([#define _GNU_SOURCE  1])
@@ -9,7 +9,7 @@
 AC_CANONICAL_SYSTEM
 
 LIB_VERSION_CURRENT=4
-LIB_VERSION_REVISION=0
+LIB_VERSION_REVISION=1
 LIB_VERSION_AGE=1
 AC_SUBST(LIB_VERSION_CURRENT)
 AC_SUBST(LIB_VERSION_REVISION)

Modified: Extractor/src/main/extractor_plugpath.c
===================================================================
--- Extractor/src/main/extractor_plugpath.c     2012-10-06 13:09:44 UTC (rev 
24202)
+++ Extractor/src/main/extractor_plugpath.c     2012-10-06 13:25:58 UTC (rev 
24203)
@@ -215,6 +215,7 @@
 {
   static char zero;
   char *path;
+  char *ret;
   size_t len;
   MyNSGetExecutablePathProto func;
 
@@ -243,7 +244,17 @@
   while ((path[len] != '/') && (len > 0))
     len--;
   path[len] = '\0';
-  return path;
+  if (NULL != strstr (path, "/lib"))
+    return path;
+  path = cut_bin (path);
+  if (NULL == (ret = realloc (path, strlen (path) + 5)))
+  {
+     LOG_STRERROR ("realloc");
+     free (path);
+     return NULL;
+  }
+  strcat (ret, "/lib/");
+  return ret;
 }
 
 
@@ -293,7 +304,8 @@
  * @return path to binary, NULL if not found
  */
 static char *
-get_path_from_PATH() {
+get_path_from_PATH() 
+{
   struct stat sbuf;
   char *path;
   char *pos;