X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl.c;h=f948b014350ad08028d41098457f537cee43ab32;hp=5872a32504eacc915137c266ba9a9eb08bd017d9;hb=1124354f4666e9d10d9ad3acfa45fdba3b99cfc6;hpb=216e7ac3b97aed5a5d65c511dc061c78be90e79d

diff --git a/src/types/decl.c b/src/types/decl.c
index 5872a32..f948b01 100644
--- a/src/types/decl.c
+++ b/src/types/decl.c
@@ -23,18 +23,21 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *******************************************************************************/
 
-#include "php_psi_stdinc.h"
-#include "php_psi.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
 
-#include <dlfcn.h>
 #include <fnmatch.h>
-
 #include <Zend/zend_smart_str.h>
 
+#include "php_psi.h"
 #include "data.h"
+#include "dl.h"
 
 #define PSI_FUNC_REDIRS
-#include "php_psi_posix.h"
+#include "php_psi_predef.h"
 
 struct psi_decl *psi_decl_init(struct psi_decl_arg *func, struct psi_plist *args)
 {
@@ -61,40 +64,40 @@ void psi_decl_free(struct psi_decl **d_ptr)
 		if (d->redir) {
 			zend_string_release(d->redir);
 		}
-		free(d);
+		pefree(d, 1);
 	}
 }
 
-void psi_decl_dump(int fd, struct psi_decl *decl)
+void psi_decl_dump(struct psi_dump *dump, struct psi_decl *decl)
 {
 	if (decl->abi) {
-		psi_decl_abi_dump(fd, decl->abi);
+		psi_decl_abi_dump(dump, decl->abi);
 	}
-	dprintf(fd, " ");
+	PSI_DUMP(dump, " ");
 	/* FIXME: functions returning arrays */
-	psi_decl_arg_dump(fd, decl->func, 0);
-	dprintf(fd, "(");
+	psi_decl_arg_dump(dump, decl->func, 0);
+	PSI_DUMP(dump, "(");
 	if (decl->args) {
 		size_t i;
 		struct psi_decl_arg *arg;
 
 		for (i = 0; psi_plist_get(decl->args, i, &arg); ++i) {
 			if (i) {
-				dprintf(fd, ", ");
+				PSI_DUMP(dump, ", ");
 			}
-			psi_decl_arg_dump(fd, arg, 0);
+			psi_decl_arg_dump(dump, arg, 0);
 		}
 		if (decl->varargs) {
-			dprintf(fd, ", ...");
+			PSI_DUMP(dump, ", ...");
 		}
 	}
 	if (decl->func->var->array_size) {
-		dprintf(fd, ")[%u]", decl->func->var->array_size);
+		PSI_DUMP(dump, ")[%u]", decl->func->var->array_size);
 	}
 	if (decl->redir) {
-		dprintf(fd, ") __asm__ (\"%s\");", decl->redir->val);
+		PSI_DUMP(dump, ") __asm__ (\"%s\");", decl->redir->val);
 	} else {
-		dprintf(fd, ");");
+		PSI_DUMP(dump, ");");
 	}
 }
 
@@ -111,32 +114,20 @@ static inline bool psi_decl_validate_func(struct psi_data *data,
 	for (redir = &psi_func_redirs[0]; redir->name; ++redir) {
 		if (!strcmp(func->var->name->val, redir->name)) {
 			decl->sym = redir->func;
+			break;
 		}
 	}
 	if (!decl->sym) {
-		size_t i = 0;
-		void *dl;
-
-		while (!decl->sym && psi_plist_get(data->file.dlopened, i++, &dl)) {
-			decl->sym = dlsym(dl, decl->redir ? decl->redir->val : func->var->name->val);
-		}
+		decl->sym = psi_dlsym(data->file.dlopened, func->var->name->val,
+			decl->redir ? decl->redir->val : NULL);
 	}
 	if (!decl->sym) {
-#ifndef RTLD_NEXT
-# define RTLD_NEXT ((void *) -1l)
-#endif
-#ifndef RTLD_DEFAULT
-# define RTLD_DEFAULT ((void *) 0)
-#endif
-		decl->sym = dlsym(RTLD_DEFAULT, decl->redir ? decl->redir->val : func->var->name->val);
-		if (!decl->sym) {
-			data->error(data, func->token, PSI_WARNING,
-					"Failed to locate symbol '%s(%s)': %s",
-					func->var->name->val,
-					decl->redir ? decl->redir->val : "",
-					dlerror() ?: "not found");
-			return false;
-		}
+		data->error(data, func->token, PSI_WARNING,
+				"Failed to locate symbol '%s(%s)': %s",
+				func->var->name->val,
+				decl->redir ? decl->redir->val : "",
+				psi_dlerror() ?: "not found");
+		return false;
 	}
 	return true;
 }
@@ -218,4 +209,3 @@ struct psi_decl_arg *psi_decl_get_arg(struct psi_decl *decl, struct psi_decl_var
 
 	return psi_decl_arg_get_by_var(var, decl->args, decl->func);
 }
-