From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Mon, 25 Jan 1999 15:48:45 +0000 (+0000)
Subject: * libltdl/ltdl.c (objdir): string collation isn't portable; strcat
X-Git-Tag: release-1-2f~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1d990faa4d2a1dc146cdbd69ea12e587e65d356;p=thirdparty%2Flibtool.git

* libltdl/ltdl.c (objdir): string collation isn't portable; strcat
"/" explicitly.  Or should this be moved to configure.in?
---

diff --git a/ChangeLog b/ChangeLog
index 1dc4954b9..5a1c759c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-01-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+	* libltdl/ltdl.c (objdir): string collation isn't portable; strcat 
+	"/" explicitly.  Or should this be moved to configure.in?
+
 1999-01-25  Thomas Tanner  <tanner@gmx.de>
 
 	* libltdl/ltdl.c: allocate the variables in lt_dlopen() dynamically
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index da53c8a0f..97eb8735a 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -75,7 +75,7 @@ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 /* This accounts for the _LTX_ separator */
 #define LTDL_SYMBOL_OVERHEAD	5
 
-static const char *objdir = LTDL_OBJDIR "/";
+static const char *objdir = LTDL_OBJDIR;
 static const char *shlib_ext = LTDL_SHLIB_EXT;
 
 static const char *unknown_error = "unknown error";
@@ -823,10 +823,11 @@ find_module (handle, dir, libdir, dlname, old_name, installed)
 		}
 		/* try to open the not-installed module */
 		if (!installed &&
-		    strlen(dir)+strlen(objdir)+strlen(dlname)
+		    strlen(dir)+strlen(objdir)+1+strlen(dlname)
 		    		< LTDL_FILENAME_MAX) {
 			strcpy(filename, dir);
 			strcat(filename, objdir);
+			strcat(filename, "/");
 			strcat(filename, dlname);
 			if (tryall_dlopen(handle, filename) == 0)
 				return 0;