lin-epics-modules/require
0
0
Fork 0
forked from epics_driver_modules/require
Code Pull Requests Activity

make sure the dbd matches the library version

Browse Source
This commit is contained in:
zimoch
2015-04-09 13:18:13 +00:00
parent 04741d14b5
commit 80c116e001
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
require.c
+8 -4
View File
@@ -3,7 +3,7 @@
*
* $Author: zimoch $
* $ID$
* $Date: 2015/02/16 16:19:51 $
* $Date: 2015/04/09 13:18:13 $
*
* DISCLAIMER: Use at your own risc and so on. No warranty, no refund.
*/
@@ -448,19 +448,16 @@ static int require_priv(const char* module, const char* vers)
{
sprintf(libname, PREFIX "%s" INFIX "-%s" EXT, module, version);
sprintf(depname, "%s-%s.dep", module, version);
sprintf(dbdname, "%s-%s.dbd", module, version);
}
else
{
sprintf(libname, PREFIX "%s" INFIX EXT, module);
sprintf(depname, "%s.dep", module);
sprintf(dbdname, "%s.dbd", module);
}
if (requireDebug)
{
printf("require: libname is %s\n", libname);
printf("require: depname is %s\n", depname);
printf("require: dbdname is %s\n", dbdname);
}
/* search for library in driverpath */
@@ -587,6 +584,13 @@ static int require_priv(const char* module, const char* vers)
return -1;
}
/* make sure we get the dbd that matches the library version */
sprintf(dbdname, "%s-%s.dbd", module, loaded);
if (requireDebug)
{
printf("require: dbdname is %s\n", dbdname);
}
/* look for dbd in . ./dbd ../dbd ../../dbd (relative to lib dir) */
p = PATHSEP DIRSEP "dbd"
PATHSEP DIRSEP ".." DIRSEP "dbd"