--- parser3/src/main/pa_globals.C 2001/04/03 07:02:43 1.38 +++ parser3/src/main/pa_globals.C 2001/04/09 10:08:31 1.50 @@ -5,9 +5,11 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_globals.C,v 1.38 2001/04/03 07:02:43 paf Exp $ + $Id: pa_globals.C,v 1.50 2001/04/09 10:08:31 paf Exp $ */ +#include "pcre.h" + #include "pa_globals.h" #include "pa_string.h" #include "pa_hash.h" @@ -20,6 +22,9 @@ #include "_response.h" #include "_file.h" #include "_random.h" +#include "pa_sql_driver_manager.h" +#include "_mail.h" +#include "_exec.h" String *html_typo_name; String *content_type_name; @@ -34,13 +39,16 @@ String *text_name; String *exception_method_name; String *post_process_method_name; +String *content_disposition_name; +String *content_disposition_filename_name; + String *unnamed_name; String *empty_string; String *auto_method_name; String *main_method_name; -String *root_class_name; +String *op_class_name; String *main_class_name; String *env_class_name; String *table_class_name; @@ -50,20 +58,33 @@ String *request_class_name; String *response_class_name; String *cookie_class_name; String *random_class_name; +String *mail_class_name; +String *exec_class_name; String *result_var_name; +String *string_pre_match_name; +String *string_match_name; +String *string_post_match_name; String *limits_name; String *post_max_size_name; String *defaults_name; +String *locale_name; +String *locale_ctype_name; String *mime_types_name; String *vfile_mime_type_name; +String *mail_name; + +String *main_sql_name; +String *main_sql_drivers_name; Hash *untaint_lang_name2enum; Table *default_typo_table; +const unsigned char *pcre_tables; + short hex_value[0x100]; static void setup_hex_value() { @@ -95,6 +116,7 @@ static void setup_hex_value() { hex_value['f'] = 15; } +/// @test problems with $t[^table:set{}] ^t.menu{^if(){}} if not a field! void pa_globals_init(Pool& pool) { #undef NEW #define NEW new(pool) @@ -116,13 +138,16 @@ void pa_globals_init(Pool& pool) { exception_method_name=NEW String(pool, EXCEPTION_METHOD_NAME); post_process_method_name=NEW String(pool, POST_PROCESS_METHOD_NAME); + content_disposition_name=NEW String(pool, CONTENT_DISPOSITION_NAME); + content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME); + unnamed_name=NEW String(pool, UNNAMED_NAME); empty_string=NEW String(pool); auto_method_name=NEW String(pool, AUTO_METHOD_NAME); main_method_name=NEW String(pool, MAIN_METHOD_NAME); - root_class_name=NEW String(pool, ROOT_CLASS_NAME); + op_class_name=NEW String(pool, OP_CLASS_NAME); main_class_name=NEW String(pool, MAIN_CLASS_NAME); table_class_name=NEW String(pool, TABLE_CLASS_NAME); file_class_name=NEW String(pool, FILE_CLASS_NAME); @@ -132,16 +157,27 @@ void pa_globals_init(Pool& pool) { response_class_name=NEW String(pool, RESPONSE_CLASS_NAME); cookie_class_name=NEW String(pool, COOKIE_CLASS_NAME); random_class_name=NEW String(pool, RANDOM_CLASS_NAME); + mail_class_name=NEW String(pool, MAIL_CLASS_NAME); + exec_class_name=NEW String(pool, EXEC_CLASS_NAME); result_var_name=NEW String(pool, RESULT_VAR_NAME); + string_pre_match_name=NEW String(pool, STRING_PRE_MATCH_NAME); + string_match_name=NEW String(pool, STRING_MATCH_NAME); + string_post_match_name=NEW String(pool, STRING_POST_MATCH_NAME); limits_name=NEW String(pool, LIMITS_NAME); post_max_size_name=NEW String(pool, POST_MAX_SIZE_NAME); defaults_name=NEW String(pool, DEFAULTS_NAME); + locale_name=NEW String(pool, LOCALE_NAME); + locale_ctype_name=NEW String(pool, LOCALE_CTYPE_NAME); mime_types_name=NEW String(pool, MIME_TYPES_NAME); vfile_mime_type_name=NEW String(pool, VFILE_MIME_TYPE_NAME); + mail_name=NEW String(pool, MAIL_NAME); + + main_sql_name=NEW String(pool, MAIN_SQL_NAME); + main_sql_drivers_name=NEW String(pool, MAIN_SQL_DRIVERS_NAME); // hashes untaint_lang_name2enum=NEW Hash(pool); @@ -149,8 +185,10 @@ void pa_globals_init(Pool& pool) { untaint_lang_name2enum->put(as_is, (int)String::UL_AS_IS); String file_name(pool, "file-name"); untaint_lang_name2enum->put(file_name, (int)String::UL_FILE_NAME); - String header(pool, "header"); - untaint_lang_name2enum->put(header, (int)String::UL_HEADER); + String http_header(pool, "http-header"); + untaint_lang_name2enum->put(http_header, (int)String::UL_HTTP_HEADER); + String mail_header(pool, "mail-header"); + untaint_lang_name2enum->put(mail_header, (int)String::UL_MAIL_HEADER); String uri(pool, "uri"); untaint_lang_name2enum->put(uri, (int)String::UL_URI); String table(pool, "table"); @@ -211,6 +249,10 @@ void pa_globals_init(Pool& pool) { } } + + // pcre tables + pcre_tables=pcre_maketables(); + // stateless classes initialize_string_class(pool, *(string_class=NEW VStateless_class(pool))); initialize_double_class(pool, *(double_class=NEW VStateless_class(pool))); @@ -219,7 +261,12 @@ void pa_globals_init(Pool& pool) { initialize_file_class(pool, *(file_class=NEW VStateless_class(pool))); initialize_response_class(pool, *(response_class=NEW VStateless_class(pool))); initialize_random_class(pool, *(random_class=NEW VStateless_class(pool))); + initialize_mail_class(pool, *(mail_class=NEW VStateless_class(pool))); + initialize_exec_class(pool, *(exec_class=NEW VStateless_class(pool))); // stateless base classes initialize_form_base_class(pool, *(form_base_class=NEW VStateless_class(pool))); form_base_class->set_name(*form_class_name); + + // SQL_Driver_manager + SQL_driver_manager=NEW SQL_Driver_manager(pool); }