IntenseWebs/tuxclocker
3
0
Fork 0
mirror of https://github.com/Lurkki14/tuxclocker.git synced 2024-11-24 09:10:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

make module loader not require full filename

Browse Source
This commit is contained in:
jussi 2019-10-02 16:06:00 +03:00
parent a4cebd6b37
commit 2a5cafcb24
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/tc_module.c
View File

@ -1,27 +1,33 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <tc_module.h>
// Local function for getting the path of the module. Requires freeing.
static char *module_filename(const char *category, const char *mod_name);
static char *module_filename(const char *category, const char *mod_name) {
// TC_MODULE_PATH should be defined as an absolute path
// Posix
char path[128];
snprintf(path, 128, "%s/%s/lib%s.so", TC_MODULE_PATH, category, mod_name);
return strdup(path);
}
tc_module_t *tc_module_find(enum tc_module_category category, const char *name) {
// The library is configured with runpath pointing to module root on posix
char mod_abs_path[128];
char *mod_abs_path = NULL;
// Find the folder where the module should reside
// TC_MODULE_PATH should be defined as an absolute path
switch (category) {
case TC_CATEGORY_ASSIGNABLE:
snprintf(mod_abs_path, 128, "%s/%s/%s", TC_MODULE_PATH, "assignable", name);
mod_abs_path = module_filename("assignable", name);
break;
case TC_CATEGORY_INTERFACE:
snprintf(mod_abs_path, 128, "%s/%s/%s", TC_MODULE_PATH, "interface", name);
// snprintf(mod_abs_path, 128, "/usr/lib/tuxclocker/modules/interface/%s", name);
//snprintf(mod_abs_path, 128, "%s", name);
mod_abs_path = module_filename("interface", name);
break;
default:
return NULL;
}
void *handle = tc_dlopen(mod_abs_path);
if (handle == NULL) {
printf("%s\n", tc_dlerror());

2
src/main/tuxclocker.c
View File

@ -7,7 +7,7 @@
int main(int argc, char **argv) {
// Load an interface here
tc_module_t *mod = tc_module_find(TC_CATEGORY_INTERFACE, "libqt.so");
tc_module_t *mod = tc_module_find(TC_CATEGORY_INTERFACE, "qt");
if (mod != NULL) {
printf("successful load for %s\n", mod->name);