just predefine stdc inttypes

[m6w6/ext-psi] / src / module.c

diff --git a/src/module.c b/src/module.c
index 1db2adff529377b922a848f262fbf71e6a680449..0c8b3b3315bb0f38b358383fc4ddcc615465d7ef 100644 (file)
--- a/src/module.c
+++ b/src/module.c
@@ -35,6 +35,9 @@
 #include "token.h"
 #include "parser.h"
 
+#define PSI_CPP_SEARCH
+#include "php_psi_cpp.h"
+
 #if HAVE_LIBJIT
 # include "libjit.h"
 # ifndef HAVE_LIBFFI
@@ -127,10 +130,17 @@ ZEND_END_ARG_INFO();
 static PHP_FUNCTION(psi_validate)
 {
        zend_string *file;
+       struct psi_parser_input *I;
        struct psi_parser P;
        struct psi_data D = {0};
        zend_long flags = 0;
 
+#if PHP_DEBUG
+       if (psi_check_env("PSI_DEBUG")) {
+               flags |= PSI_DEBUG;
+       }
+#endif
+
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P|l", &file, &flags)) {
                return;
        }
@@ -138,17 +148,17 @@ static PHP_FUNCTION(psi_validate)
        if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
                RETURN_FALSE;
        }
-       if (!psi_parser_open_file(&P, file->val)) {
+       if (!(I = psi_parser_open_file(&P, file->val, true))) {
                psi_parser_dtor(&P);
                RETURN_FALSE;
        }
 
-       psi_parser_parse(&P);
+       psi_parser_parse(&P, I);
        psi_data_ctor(&D, P.error, P.flags);
        RETVAL_BOOL(psi_data_validate(&D, PSI_DATA(&P)) && !P.errors);
        psi_data_dtor(&D);
-
        psi_parser_dtor(&P);
+       free(I);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate_string, 0, 0, 1)
@@ -157,10 +167,17 @@ ZEND_END_ARG_INFO();
 static PHP_FUNCTION(psi_validate_string)
 {
        zend_string *string;
+       struct psi_parser_input *I;
        struct psi_parser P;
        struct psi_data D = {0};
        zend_long flags = 0;
 
+#if PHP_DEBUG
+       if (psi_check_env("PSI_DEBUG")) {
+               flags |= PSI_DEBUG;
+       }
+#endif
+
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S|l", &string, &flags)) {
                return;
        }
@@ -168,17 +185,17 @@ static PHP_FUNCTION(psi_validate_string)
        if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
                RETURN_FALSE;
        }
-       if (!psi_parser_open_string(&P, string->val, string->len)) {
+       if (!(I = psi_parser_open_string(&P, string->val, string->len))) {
                psi_parser_dtor(&P);
                RETURN_FALSE;
        }
 
-       psi_parser_parse(&P);
+       psi_parser_parse(&P, I);
        psi_data_ctor(&D, P.error, P.flags);
        RETVAL_BOOL(psi_data_validate(&D, PSI_DATA(&P)) && !P.errors);
        psi_data_dtor(&D);
-
        psi_parser_dtor(&P);
+       free(I);
 }
 
 static PHP_MINIT_FUNCTION(psi)
@@ -222,18 +239,21 @@ static PHP_MINIT_FUNCTION(psi)
                flags |= PSI_SILENT;
        }
 
+       PSI_G(search_path) = pemalloc(strlen(PSI_G(directory)) + strlen(psi_cpp_search) + 1 + 1, 1);
+       sprintf(PSI_G(search_path), "%s:%s", PSI_G(directory), psi_cpp_search);
+
        PSI_G(context) = psi_context_init(NULL, ops, psi_error_wrapper, flags);
        psi_context_build(PSI_G(context), PSI_G(directory));
 
-       if (psi_check_env("PSI_DUMP")) {
-               psi_context_dump(PSI_G(context), STDOUT_FILENO);
-       }
-
        return SUCCESS;
 }
 
 static PHP_MSHUTDOWN_FUNCTION(psi)
 {
+       if (psi_check_env("PSI_DUMP")) {
+               psi_context_dump(PSI_G(context), STDOUT_FILENO);
+       }
+
        psi_context_free(&PSI_G(context));
 
        UNREGISTER_INI_ENTRIES();
@@ -254,7 +274,9 @@ static PHP_MINFO_FUNCTION(psi)
        php_info_print_table_start();
        php_info_print_table_header(2, "PSI Support", "enabled");
        php_info_print_table_row(2, "Extension Version", PHP_PSI_VERSION);
+       php_info_print_table_row(2, "Search Path", PSI_G(search_path));
        php_info_print_table_end();
+
        php_info_print_table_start();
        php_info_print_table_header(3, "Used Library", "Compiled", "Linked");
        php_info_print_table_row(3, "libffi",
@@ -278,6 +300,33 @@ static PHP_MINFO_FUNCTION(psi)
        DISPLAY_INI_ENTRIES();
 }
 
+static void ptr_free(void *ptr)
+{
+       free(*(void **) ptr);
+}
+
+static PHP_GINIT_FUNCTION(psi)
+{
+       char *tmp;
+       struct psi_plist **bl_decls = &psi_globals->blacklist.decls;
+
+       *bl_decls = psi_plist_init(ptr_free);
+
+#define BL_DECL_ADD(d) \
+       tmp = strdup(d); \
+       *bl_decls = psi_plist_add(*bl_decls, &tmp)
+
+       BL_DECL_ADD("dlsym");
+       BL_DECL_ADD("alloca");
+       BL_DECL_ADD("atexit");
+       BL_DECL_ADD("_IO_cookie_init");
+}
+
+static PHP_GSHUTDOWN_FUNCTION(psi)
+{
+       psi_plist_free(psi_globals->blacklist.decls);
+}
+
 static const zend_function_entry psi_functions[] = {
        PHP_FE(psi_dump, ai_psi_dump)
        PHP_FE(psi_validate, ai_psi_validate)
@@ -299,7 +348,11 @@ zend_module_entry psi_module_entry = {
        NULL,
        PHP_MINFO(psi),
        PHP_PSI_VERSION,
-       STANDARD_MODULE_PROPERTIES
+       ZEND_MODULE_GLOBALS(psi),
+       PHP_GINIT(psi),
+       PHP_GSHUTDOWN(psi),
+       NULL, /* post-deactivate */
+       STANDARD_MODULE_PROPERTIES_EX
 };
 
 #ifdef COMPILE_DL_PSI