maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ical: support overriding icaltimezone_get_component() in compat layer

Browse source 
Check for icaltimezone_get_component() before actually loading libical.
That way our own code uses our own copy of that method from the copied
icaltz-util.c instead of always using the one from libical.

For that we must not overwriting already found functions.
This commit is contained in:
Patrick Ohly 2014-03-26 01:23:17 -07:00
parent b0ddae71cc
commit 5d43c5d7e3
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/syncevo/eds_abi_wrapper.cpp
View file

@ -20,6 +20,7 @@
#define EDS_ABI_WRAPPER_NO_REDEFINE 1
#include <syncevo/eds_abi_wrapper.h>
#include <syncevo/SyncContext.h>
#include <syncevo/util.h>
#include <string>
#include <sstream>
@ -115,10 +116,15 @@ void *findSymbols(const char *libname, int minver, int maxver,
const char *symname = NULL;
while (funcptr) {
symname = va_arg(ap, const char *);
*funcptr = dlsym(dlhandle, symname);
// Don't overwrite address already found earlier. Needed
// for icaltimezone_get_component(), which may be
// overridden by ourselves.
if (!*funcptr) {
debug << symname << " not found" << std::endl;
allfound = false;
*funcptr = dlsym(dlhandle, symname);
if (!*funcptr) {
debug << symname << " not found" << std::endl;
allfound = false;
}
}
funcptr = va_arg(ap, void **);
}
@ -179,6 +185,14 @@ extern "C" void EDSAbiWrapperInit()
initialized = true;
}
// Bind icaltimezone_get_component() to the version found (or not found,
// if internal-icaltz not configured) in our own executable.
void *get = dlsym(RTLD_DEFAULT, "icaltimezone_get_component");
getLookupDebug() += SyncEvo::StringPrintf("icaltimezone_get_component = %p", get);
#if defined(ENABLE_ECAL) || defined(ENABLE_ICAL)
EDSAbiWrapperSingleton.icaltimezone_get_component = (icalcomponent *(*)(icaltimezone *))get;
#endif
# ifdef HAVE_EDS
edshandle =
findSymbols("libedataserver-1.2.so", 7, 16,