Author: grothoff
Date: 2006-11-11 14:28:27 -0800 (Sat, 11 Nov 2006)
New Revision: 3703
Modified:
GNUnet/src/util/error/error.c
GNUnet/src/util/os/dso.c
Log:
do not kill existing ld search paths
Modified: GNUnet/src/util/error/error.c
===================================================================
--- GNUnet/src/util/error/error.c 2006-11-11 22:28:18 UTC (rev 3702)
+++ GNUnet/src/util/error/error.c 2006-11-11 22:28:27 UTC (rev 3703)
@@ -238,6 +238,8 @@
return _("DEBUG");
if ( (kind & GE_STATUS) > 0)
return _("STATUS");
+ if ( (kind & GE_INFO) > 0)
+ return _("INFO");
if ( (kind & GE_WARNING) > 0)
return _("WARNING");
if ( (kind & GE_ERROR) > 0)
Modified: GNUnet/src/util/os/dso.c
===================================================================
--- GNUnet/src/util/os/dso.c 2006-11-11 22:28:18 UTC (rev 3702)
+++ GNUnet/src/util/os/dso.c 2006-11-11 22:28:27 UTC (rev 3703)
@@ -44,6 +44,7 @@
int err;
const char * opath;
char * path;
+ char * cpath;
#ifdef MINGW
InitWinEnv(NULL);
@@ -61,8 +62,13 @@
old_dlsearchpath = STRDUP(opath);
path = os_get_installation_path(IPK_LIBDIR);
if (path != NULL) {
- lt_dlsetsearchpath(path);
+ cpath = MALLOC(strlen(path) + strlen(opath) + 4);
+ strcpy(cpath, opath);
+ strcat(cpath, ":");
+ strcat(cpath, path);
+ lt_dlsetsearchpath(cpath);
FREE(path);
+ FREE(cpath);
}
}
_______________________________________________
GNUnet-SVN mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnunet-svn
