X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=338f9451f0104981f6b616898b1d3519cba51cae;hp=1323a9f5b5f616d83ac752a2af17a368a708ebee;hb=e42201d972c98549b7d5edfaf4a89e2aac101afe;hpb=c9384515a81cb64d345b299908b2852f51bb8e6e

diff --git a/src/module.c b/src/module.c
index 1323a9f..338f945 100644
--- a/src/module.c
+++ b/src/module.c
@@ -51,9 +51,69 @@
 
 ZEND_DECLARE_MODULE_GLOBALS(psi);
 
+//#define ZEND_INI_MH(name) int name(zend_ini_entry *entry, zend_string *new_value, void *mh_arg1, void *mh_arg2, void *mh_arg3, int stage)
+
+static void OnUpdateBlacklist(const char *str, void (*cb)(const char*, size_t))
+{
+	const char *end;
+
+	do {
+		size_t len;
+
+		end = strchr(str, ',');
+		if (end) {
+			len = end - str;
+		} else {
+			len = strlen(str);
+		}
+		if (len) {
+			cb(str, len);
+		}
+
+		str = end + 1;
+	} while (end);
+}
+
+static void psi_blacklist_add_decl(const char *pattern, size_t len);
+static ZEND_INI_MH(OnUpdateBlacklistedDecls)
+{
+	OnUpdateBlacklist(new_value->val, psi_blacklist_add_decl);
+	return SUCCESS;
+}
+
+static void psi_blacklist_add_var(const char *pattern, size_t len);
+static ZEND_INI_MH(OnUpdateBlacklistedVars)
+{
+	OnUpdateBlacklist(new_value->val, psi_blacklist_add_var);
+	return SUCCESS;
+}
+
+static void OnDisplayBlacklist(struct psi_plist *bl)
+{
+	size_t i = 0;
+	char *item;
+
+	while (psi_plist_get(bl, i++, &item)) {
+		if (i > 1) {
+			PUTS(",");
+		}
+		PUTS(item);
+	}
+}
+static ZEND_INI_DISP(OnDisplayBlacklistedDecls)
+{
+	OnDisplayBlacklist(PSI_G(blacklist).decls);
+}
+static ZEND_INI_DISP(OnDisplayBlacklistedVars)
+{
+	OnDisplayBlacklist(PSI_G(blacklist).vars);
+}
+
 PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("psi.engine", PSI_ENGINE, PHP_INI_SYSTEM, OnUpdateString, engine, zend_psi_globals, psi_globals)
 	STD_PHP_INI_ENTRY("psi.directory", "psi.d", PHP_INI_SYSTEM, OnUpdateString, directory, zend_psi_globals, psi_globals)
+	PHP_INI_ENTRY_EX("psi.blacklist.decls", "", PHP_INI_SYSTEM, OnUpdateBlacklistedDecls, OnDisplayBlacklistedDecls)
+	PHP_INI_ENTRY_EX("psi.blacklist.vars", "", PHP_INI_SYSTEM, OnUpdateBlacklistedVars, OnDisplayBlacklistedVars)
 PHP_INI_END();
 
 static zend_object_handlers psi_object_handlers;
@@ -126,6 +186,7 @@ static PHP_FUNCTION(psi_dump)
 ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate, 0, 0, 1)
 	ZEND_ARG_INFO(0, file)
 	ZEND_ARG_INFO(0, flags)
+	ZEND_ARG_INFO(1, errcnt)
 ZEND_END_ARG_INFO();
 static PHP_FUNCTION(psi_validate)
 {
@@ -135,6 +196,7 @@ static PHP_FUNCTION(psi_validate)
 	struct psi_data D = {0};
 	struct psi_validate_scope S = {0};
 	zend_long flags = 0;
+	zval *errcnt = NULL;
 
 #if PHP_DEBUG
 	if (psi_check_env("PSI_DEBUG")) {
@@ -142,7 +204,7 @@ static PHP_FUNCTION(psi_validate)
 	}
 #endif
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P|l", &file, &flags)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P|lz", &file, &flags, &errcnt)) {
 		return;
 	}
 
@@ -158,7 +220,15 @@ static PHP_FUNCTION(psi_validate)
 	psi_data_ctor(&D, P.error, P.flags);
 	psi_validate_scope_ctor(&S);
 	S.defs = &P.preproc->defs;
-	RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)) && !P.errors);
+
+	RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
+
+	if (errcnt) {
+		ZVAL_DEREF(errcnt);
+		convert_to_long(errcnt);
+		ZVAL_LONG(errcnt, P.errors);
+	}
+
 	psi_validate_scope_dtor(&S);
 	psi_data_dtor(&D);
 	psi_parser_dtor(&P);
@@ -167,6 +237,8 @@ static PHP_FUNCTION(psi_validate)
 
 ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate_string, 0, 0, 1)
 	ZEND_ARG_INFO(0, string)
+	ZEND_ARG_INFO(0, flags)
+	ZEND_ARG_INFO(1, errcnt)
 ZEND_END_ARG_INFO();
 static PHP_FUNCTION(psi_validate_string)
 {
@@ -176,6 +248,7 @@ static PHP_FUNCTION(psi_validate_string)
 	struct psi_data D = {0};
 	struct psi_validate_scope S = {0};
 	zend_long flags = 0;
+	zval *errcnt = NULL;
 
 #if PHP_DEBUG
 	if (psi_check_env("PSI_DEBUG")) {
@@ -183,7 +256,7 @@ static PHP_FUNCTION(psi_validate_string)
 	}
 #endif
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S|l", &string, &flags)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S|lz", &string, &flags, &errcnt)) {
 		return;
 	}
 
@@ -199,7 +272,15 @@ static PHP_FUNCTION(psi_validate_string)
 	psi_data_ctor(&D, P.error, P.flags);
 	psi_validate_scope_ctor(&S);
 	S.defs = &P.preproc->defs;
-	RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)) && !P.errors);
+
+	RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
+
+	if (errcnt) {
+		ZVAL_DEREF(errcnt);
+		convert_to_long(errcnt);
+		ZVAL_LONG(errcnt, P.errors);
+	}
+
 	psi_validate_scope_dtor(&S);
 	psi_data_dtor(&D);
 	psi_parser_dtor(&P);
@@ -330,6 +411,22 @@ static void ptr_free(void *ptr)
 	free(*(void **) ptr);
 }
 
+static void psi_blacklist_add_decl(const char *pattern, size_t len)
+{
+	char *tmp = strndup(pattern, len);
+	struct psi_plist **decls = &PSI_G(blacklist).decls;
+
+	*decls = psi_plist_add(*decls, &tmp);
+}
+
+static void psi_blacklist_add_var(const char *pattern, size_t len)
+{
+	char *tmp = strndup(pattern, len);
+	struct psi_plist **vars = &PSI_G(blacklist).vars;
+
+	*vars = psi_plist_add(*vars, &tmp);
+}
+
 static PHP_GINIT_FUNCTION(psi)
 {
 	char *tmp;
@@ -381,8 +478,15 @@ static const zend_function_entry psi_functions[] = {
 	PHP_FE_END
 };
 
+static const zend_module_dep psi_deps[] = {
+	ZEND_MOD_REQUIRED("standard")
+	{0}
+};
+
 zend_module_entry psi_module_entry = {
-	STANDARD_MODULE_HEADER,
+	STANDARD_MODULE_HEADER_EX,
+	NULL,
+	psi_deps,
 	"psi",
 	psi_functions,
 	PHP_MINIT(psi),