--- parser3/src/targets/cgi/parser3.C 2001/03/14 08:50:05 1.5 +++ parser3/src/targets/cgi/parser3.C 2001/03/14 09:02:53 1.7 @@ -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.7 2001/03/14 09:02:53 paf Exp $ */ #ifdef HAVE_CONFIG_H @@ -81,13 +81,12 @@ int main(int argc, char *argv[]) { 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 +99,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 +107,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( @@ -122,7 +121,7 @@ int main(int argc, char *argv[]) { #ifdef WIN32 SetUnhandledExceptionFilter(0); #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()); }