X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=4b574879d92842d0eebeeaff324c349d00bbd3dd;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=3167ffad1bb82f27fe33892967998e3a46f0ff2a;hpb=4521c1e7ae5371ab9d639adc617d17fb4e8ded0c;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so.c b/src/afb-api-so.c
index 3167ffad..4b574879 100644
--- a/src/afb-api-so.c
+++ b/src/afb-api-so.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017, 2018 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#if WITH_DYNAMIC_BINDING
+
 #define _GNU_SOURCE
 
 #include <stdio.h>
@@ -25,17 +27,19 @@
 #include <sys/stat.h>
 
 #include "afb-api-so.h"
-#include "afb-api-so-v2.h"
 #include "afb-api-so-v3.h"
 #include "verbose.h"
 #include "sig-monitor.h"
 
-#if defined(WITH_LEGACY_BINDING_V1)
+#if WITH_LEGACY_BINDING_V1
 #   include "afb-api-so-v1.h"
 #endif
-#if defined(WITH_LEGACY_BINDING_VDYN)
+#if WITH_LEGACY_BINDING_VDYN
 #   include "afb-api-so-vdyn.h"
 #endif
+#if WITH_LEGACY_BINDING_V2
+#   include "afb-api-so-v2.h"
+#endif
 
 struct safe_dlopen
 {
@@ -82,15 +86,16 @@ static int load_binding(const char *path, int force, struct afb_apiset *declare_
 		goto error;
 	}
 
-	/* try the version 2 */
+	/* try the version 3 */
 	rc = afb_api_so_v3_add(path, handle, declare_set, call_set);
 	if (rc < 0) {
 		/* error when loading a valid v3 binding */
 		goto error2;
 	}
 	if (rc)
-		return 0; /* yes version 2 */
+		return 0; /* yes version 3 */
 
+#if WITH_LEGACY_BINDING_V2
 	/* try the version 2 */
 	rc = afb_api_so_v2_add(path, handle, declare_set, call_set);
 	if (rc < 0) {
@@ -99,8 +104,14 @@ static int load_binding(const char *path, int force, struct afb_apiset *declare_
 	}
 	if (rc)
 		return 0; /* yes version 2 */
+#else
+	if (dlsym(handle, "afbBindingV2")) {
+		WARNING("binding [%s]: version 2 not supported", path);
+		obsolete = 1;
+	}
+#endif
 
-#if defined(WITH_LEGACY_BINDING_VDYN)
+#if WITH_LEGACY_BINDING_VDYN
 	/* try the version dyn */
 	rc = afb_api_so_vdyn_add(path, handle, declare_set, call_set);
 	if (rc < 0) {
@@ -116,7 +127,7 @@ static int load_binding(const char *path, int force, struct afb_apiset *declare_
 	}
 #endif
 
-#if defined(WITH_LEGACY_BINDING_V1)
+#if WITH_LEGACY_BINDING_V1
 	/* try the version 1 */
 	rc = afb_api_so_v1_add(path, handle, declare_set, call_set);
 	if (rc < 0) {
@@ -152,6 +163,7 @@ static int adddirs(char path[PATH_MAX], size_t end, struct afb_apiset *declare_s
 {
 	DIR *dir;
 	struct dirent *dent;
+	struct stat st;
 	size_t len;
 	int rc = 0;
 
@@ -175,12 +187,19 @@ static int adddirs(char path[PATH_MAX], size_t end, struct afb_apiset *declare_s
 			break;
 		}
 
+		/* get the name and inspect dereferenced link instead of the directory entry */
 		len = strlen(dent->d_name);
 		if (len + end >= PATH_MAX) {
-			ERROR("path too long while scanning bindings for %s", dent->d_name);
+			ERROR("path too long while scanning bindings for %.*s%s", (int)end, path, dent->d_name);
 			continue;
 		}
-		if (dent->d_type == DT_DIR) {
+		memcpy(&path[end], dent->d_name, len+1);
+		rc = stat(path, &st);
+		if (rc < 0) {
+			ERROR("getting status of %s failed: %m", path);
+			continue;
+		}
+		else if (S_ISDIR(st.st_mode)) {
 			/* case of directories */
 			if (dent->d_name[0] == '.') {
 /*
@@ -213,7 +232,7 @@ debug file made dlopen crashing.
 See https://sourceware.org/bugzilla/show_bug.cgi?id=22101
  */
 #if !defined(AFB_API_SO_ACCEPT_DOT_PREFIXED_DIRS) /* not defined by default */
-				continue; /* ignore any directory beginnign with a dot */
+				continue; /* ignore any directory beginning with a dot */
 #else
 				if (len == 1)
 					continue; /* . */
@@ -230,13 +249,11 @@ See https://sourceware.org/bugzilla/show_bug.cgi?id=22101
 #endif
 #endif
 			}
-			memcpy(&path[end], dent->d_name, len+1);
 			rc = adddirs(path, end+len, declare_set, call_set, failstops);
-		} else if (dent->d_type == DT_REG) {
+		} else if (S_ISREG(st.st_mode)) {
 			/* case of files */
 			if (memcmp(&dent->d_name[len - 3], ".so", 4))
 				continue;
-			memcpy(&path[end], dent->d_name, len+1);
 			rc = load_binding(path, 0, declare_set, call_set);
 		}
 		if (rc < 0 && failstops) {
@@ -307,3 +324,4 @@ int afb_api_so_add_pathset_nofails(const char *pathset, struct afb_apiset *decla
 	return afb_api_so_add_pathset(pathset, declare_set, call_set, 0);
 }
 
+#endif