*/
#define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
#include <stdio.h>
#include <dlfcn.h>
#include "afb-api-so-v2.h"
#include "verbose.h"
-static int load_binding(const char *path, int force)
+static int load_binding(const char *path, int force, struct afb_apiset *apiset)
{
int rc;
void *handle;
goto error;
}
- /* retrieves the register function */
- rc = afb_api_so_v2_add(path, handle);
+ /* try the version 2 */
+ rc = afb_api_so_v2_add(path, handle, apiset);
if (rc < 0) {
/* error when loading a valid v2 binding */
goto error2;
}
- rc = afb_api_so_v1_add(path, handle);
+ if (rc)
+ return 0; /* yes version 2 */
+
+ /* try the version 1 */
+ rc = afb_api_so_v1_add(path, handle, apiset);
if (rc < 0) {
/* error when loading a valid v1 binding */
goto error2;
}
- if (rc == 0) {
- /* not a v1 binding */
- if (force)
- ERROR("binding [%s] is not an AFB binding", path);
- else
- INFO("binding [%s] is not an AFB binding", path);
- goto error2;
- }
- return 0;
+ if (rc)
+ return 0; /* yes version 1 */
+
+ /* not a valid binding */
+ if (force)
+ ERROR("binding [%s] is not an AFB binding", path);
+ else
+ INFO("binding [%s] is not an AFB binding", path);
error2:
dlclose(handle);
}
-int afb_api_so_add_binding(const char *path)
+int afb_api_so_add_binding(const char *path, struct afb_apiset *apiset)
{
- return load_binding(path, 1);
+ return load_binding(path, 1, apiset);
}
-static int adddirs(char path[PATH_MAX], size_t end)
+static int adddirs(char path[PATH_MAX], size_t end, struct afb_apiset *apiset)
{
DIR *dir;
struct dirent *dent;
continue;
}
memcpy(&path[end], dent->d_name, len+1);
- adddirs(path, end+len);;
+ adddirs(path, end+len, apiset);
} else if (dent->d_type == DT_REG) {
/* case of files */
if (memcmp(&dent->d_name[len - 3], ".so", 4))
continue;
memcpy(&path[end], dent->d_name, len+1);
- if (load_binding(path, 0) < 0)
+ if (load_binding(path, 0, apiset) < 0)
return -1;
}
}
return 0;
}
-int afb_api_so_add_directory(const char *path)
+int afb_api_so_add_directory(const char *path, struct afb_apiset *apiset)
{
size_t length;
char buffer[PATH_MAX];
}
memcpy(buffer, path, length + 1);
- return adddirs(buffer, length);
+ return adddirs(buffer, length, apiset);
}
-int afb_api_so_add_path(const char *path)
+int afb_api_so_add_path(const char *path, struct afb_apiset *apiset)
{
struct stat st;
int rc;
if (rc < 0)
ERROR("Invalid binding path [%s]: %m", path);
else if (S_ISDIR(st.st_mode))
- rc = afb_api_so_add_directory(path);
+ rc = afb_api_so_add_directory(path, apiset);
else if (strstr(path, ".so"))
- rc = load_binding(path, 0);
+ rc = load_binding(path, 0, apiset);
else
INFO("not a binding [%s], skipped", path);
return rc;
}
-int afb_api_so_add_pathset(const char *pathset)
+int afb_api_so_add_pathset(const char *pathset, struct afb_apiset *apiset)
{
static char sep[] = ":";
char *ps, *p;
p = strsep(&ps, sep);
if (!p)
return 0;
- if (afb_api_so_add_path(p) < 0)
+ if (afb_api_so_add_path(p, apiset) < 0)
return -1;
}
}