--- parser3/src/targets/cgi/parser3.C 2001/03/14 08:50:05 1.5 +++ parser3/src/targets/cgi/parser3.C 2001/03/14 09:06:28 1.8 @@ -3,7 +3,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: parser3.C,v 1.5 2001/03/14 08:50:05 paf Exp $ + $Id: parser3.C,v 1.8 2001/03/14 09:06:28 paf Exp $ */ #ifdef HAVE_CONFIG_H @@ -27,6 +27,7 @@ Pool pool; // global pool #ifdef WIN32 +# if MSVC // intercept global system errors LONG WINAPI TopLevelExceptionFilter ( struct _EXCEPTION_POINTERS *ExceptionInfo @@ -51,6 +52,7 @@ LONG WINAPI TopLevelExceptionFilter ( return EXCEPTION_EXECUTE_HANDLER; // never reached } +# endif #endif void fill_vform_fields(Pool& pool, bool cgi, Hash& fields) { @@ -75,19 +77,20 @@ int main(int argc, char *argv[]) { PTRY { // global try // must be first in PTRY{}PCATCH #ifdef WIN32 +# if MSVC SetUnhandledExceptionFilter(&TopLevelExceptionFilter); //TODO: initSocks(); +# endif #endif fill_globals(pool); - Pool request_pool; // request pool // TODO: ifdef WIN32 flip \\ to / const char *document_root="Y:/parser3/src/"; const char *page_filespec="Y:/parser3/src/test.p"; // prepare to process request - Request request(request_pool, + Request request(Pool(), cgi ? String::Untaint_lang::HTML_TYPO : String::Untaint_lang::NO, document_root, page_filespec @@ -100,7 +103,7 @@ int main(int argc, char *argv[]) { char *sys_auto_path1; #ifdef WIN32 sys_auto_path1=(char *)pool.malloc(MAX_STRING); - GetWindowsDirectory(sys_auto_path1, MAX_STRING-1/*for \*/); + GetWindowsDirectory(sys_auto_path1, MAX_STRING); strcat(sys_auto_path1, "\\"); #else sys_auto_path1=getenv("HOME"); @@ -108,8 +111,8 @@ int main(int argc, char *argv[]) { // beside by binary char *sys_auto_path2=(char *)pool.malloc(MAX_STRING); - strncpy(sys_auto_path2, argv[0], MAX_STRING-20); // filespec of my binary - rsplit(sys_auto_path2, '\\'); rsplit(sys_auto_path2, '/'); // strip filename + strncpy(sys_auto_path2, argv[0], MAX_STRING); // filespec of my binary + rsplit(sys_auto_path2, PATH_DELIMITER_CHAR); // strip filename // process the request result=request.core( @@ -120,9 +123,11 @@ int main(int argc, char *argv[]) { // must be last in PTRY{}PCATCH #ifdef WIN32 +# if MSVC SetUnhandledExceptionFilter(0); +# endif #endif - } PCATCH(e) { // global problem, such as out of memory when creating Request + } PCATCH(e) { // global problem @globals fill @Request create @prepare to .core() result=0; strcpy(error, e.comment()); }