From f1d990faa4d2a1dc146cdbd69ea12e587e65d356 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Mon, 25 Jan 1999 15:48:45 +0000 Subject: [PATCH] * libltdl/ltdl.c (objdir): string collation isn't portable; strcat "/" explicitly. Or should this be moved to configure.in? --- ChangeLog | 5 +++++ libltdl/ltdl.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1dc4954b..5a1c759c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-01-25 Alexandre Oliva + + * libltdl/ltdl.c (objdir): string collation isn't portable; strcat + "/" explicitly. Or should this be moved to configure.in? + 1999-01-25 Thomas Tanner * libltdl/ltdl.c: allocate the variables in lt_dlopen() dynamically diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c index da53c8a0..97eb8735 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;