--- parser3/src/targets/cgi/parser3.C 2002/06/12 14:09:50 1.181 +++ parser3/src/targets/cgi/parser3.C 2002/08/14 09:20:53 1.192 @@ -3,17 +3,15 @@ Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: parser3.C,v 1.181 2002/06/12 14:09:50 paf Exp $ */ +static const char* IDENT_PARSER3_C="$Date: 2002/08/14 09:20:53 $"; + #include "pa_config_includes.h" #if _MSC_VER # include # include -#else -# include "pa_config_paths.h" #endif #include "pa_sapi.h" @@ -26,10 +24,14 @@ #ifdef WIN32 # include +# include "getopt.h" +#else +# include #endif //#define DEBUG_POOL_MALLOC //#define DEBUG_STRING_APPENDS_VS_EXPANDS +//#define DEBUG_MAILRECEIVE "test.eml" #ifdef DEBUG_STRING_APPENDS_VS_EXPANDS extern ulong @@ -41,37 +43,18 @@ extern ulong // consts -#ifndef _PROFILE -extern const char *main_RCSIds[]; -#ifdef USE_SMTP -extern const char *smtp_RCSIds[]; -#endif -extern const char *gd_RCSIds[]; -extern const char *classes_RCSIds[]; -extern const char *types_RCSIds[]; -extern const char *parser3_RCSIds[]; -const char **RCSIds[]={ - main_RCSIds, -#ifdef USE_SMTP - smtp_RCSIds, -#endif - gd_RCSIds, - classes_RCSIds, - types_RCSIds, - parser3_RCSIds, - 0 -}; -#endif - #define REDIRECT_PREFIX "REDIRECT_" #define PARSER_CONFIG_ENV_NAME "CGI_PARSER_CONFIG" /// IIS refuses to read bigger chunks const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M -const char *argv0; -Pool *pool; // global pool [dont describe to doxygen: it confuses it with param names] -bool cgi; ///< we were started as CGI? +static const char *argv0; +static char beside_binary_path[MAX_STRING]; + +static Pool *pool; // global pool [dont describe to doxygen: it confuses it with param names] +static bool cgi; ///< we were started as CGI? +static bool mail_received=false; ///< we were started with -m option? [asked to parse incoming message to $mail:received] // SAPI @@ -79,15 +62,13 @@ static void log(const char *fmt, va_list bool opened; FILE *f=0; - if(argv0) { - // beside by binary - char file_spec[MAX_STRING]; - strncpy(file_spec, argv0, MAX_STRING-1); file_spec[MAX_STRING-1]=0; // filespec of my binary - rsplit(file_spec, '/'); rsplit(file_spec, '\\');// strip filename - strcat(file_spec, "/parser3.log"); - f=fopen(file_spec, "at"); - } + // try beside by binary first + char file_spec[MAX_STRING]; + snprintf(file_spec, MAX_STRING, + "%s/parser3.log", beside_binary_path); + f=fopen(file_spec, "at"); opened=f!=0; + // fallback to stderr if(!opened) f=stderr; @@ -208,7 +189,7 @@ void SAPI::send_body(Pool& , const void // -void full_file_spec(const char *file_name, char *buf, size_t buf_size) { +static void full_file_spec(const char *file_name, char *buf, size_t buf_size) { if(file_name) if(file_name[0]=='/' #ifdef WIN32 @@ -236,7 +217,7 @@ main workhorse wich is tested but seems slow. IIS5 todo find out proper 'illegal call' check */ -void real_parser_handler( +static void real_parser_handler( const char *filespec_to_process, const char *request_method, bool header_only) { // init socks @@ -247,7 +228,7 @@ void real_parser_handler( // init global variables pa_globals_init(*pool); - if(!filespec_to_process) + if(!filespec_to_process || !*filespec_to_process) SAPI::die("Parser/%s", PARSER_VERSION); // Request info @@ -309,15 +290,16 @@ void real_parser_handler( const char *content_length=SAPI::get_env(*pool, "CONTENT_LENGTH"); request_info.content_length=(content_length?atoi(content_length):0); request_info.cookie=SAPI::get_env(*pool, "HTTP_COOKIE"); - + request_info.mail_received=mail_received; + // prepare to process request Request request(*pool, request_info, -#ifdef _DEBUG +/*#ifdef _DEBUG String::UL_HTML|String::UL_OPTIMIZE_BIT -#else +#else*/ cgi ? String::UL_HTML|String::UL_OPTIMIZE_BIT : String::UL_AS_IS -#endif +/*#endif*/ , true /* status_allowed */); @@ -329,19 +311,9 @@ void real_parser_handler( if(config_by_env) config_filespec_cstr=config_by_env; else { - // beside by binary - // @todo full path, not ./! - char beside_binary_path[MAX_STRING]; - strncpy(beside_binary_path, argv0, MAX_STRING-1); beside_binary_path[MAX_STRING-1]=0; // filespec of my binary - if(!( - rsplit(beside_binary_path, '/') || - rsplit(beside_binary_path, '\\'))) { // strip filename - // no path, just filename - beside_binary_path[0]='.'; beside_binary_path[1]=0; - } snprintf(config_filespec_buf, MAX_STRING, "%s/%s", - beside_binary_path, CONFIG_FILE_NAME); + beside_binary_path, AUTO_FILE_NAME); config_filespec_cstr=config_filespec_buf; } @@ -369,7 +341,7 @@ void real_parser_handler( } -void call_real_parser_handler__do_SEH( +static void call_real_parser_handler__do_SEH( const char *filespec_to_process, const char *request_method, bool header_only) { #if _MSC_VER && !defined(_DEBUG) @@ -406,21 +378,54 @@ int failed_new(size_t size) { #endif #ifdef HAVE_SET_NEW_HANDLER -void failed_new() { +static void failed_new() { SAPI::die("out of memory in 'new'"); } #endif +static void usage(const char *program) { + printf( + "Parser/%s Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)\n" + "Author: Alexandr Petrosian (http://paf.design.ru)\n" + "\n" + "Usage: %s [options] file\n" + "Options are:\n" +#ifdef WITH_MAILRECEIVE + " -m Parse mail, put received letter to $mail:received\n" +#endif + " -h Display usage information (this message)\n" + , PARSER_VERSION, + program); + exit(EINVAL); +} + int main(int argc, char *argv[]) { Pool_storage global_pool_storage; Pool global_pool(&global_pool_storage); pool=&global_pool; +#ifdef DEBUG_MAILRECEIVE + if(FILE *fake_in=fopen(DEBUG_MAILRECEIVE, "rt")) { + dup2(fake_in->_file, 0/*STDIN_FILENO*/); + } +#endif + #ifdef _DEBUG // _crtBreakAlloc=33112; #endif // _asm int 3; - argv0=argv[0]; + { + argv0=argv[0]; + // beside by binary + // @todo full path, not ./! + strncpy(beside_binary_path, argv0, MAX_STRING-1); beside_binary_path[MAX_STRING-1]=0; // filespec of my binary + if(!( + rsplit(beside_binary_path, '/') || + rsplit(beside_binary_path, '\\'))) { // strip filename + // no path, just filename + beside_binary_path[0]='.'; beside_binary_path[1]=0; + } + } umask(2); @@ -431,17 +436,39 @@ int main(int argc, char *argv[]) { getenv("GATEWAY_INTERFACE") || getenv("REQUEST_METHOD"); - if(!cgi) { - if(argc<2) { - printf( - "Parser/%s Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)\n" - "Author: Alexandr Petrosian (http://paf.design.ru)\n" - "\n" - "Usage: %s \n", - PARSER_VERSION, - argv0?argv0:"parser3"); - return 1; + char *raw_filespec_to_process; + if(cgi) + raw_filespec_to_process=getenv("PATH_TRANSLATED"); + else { + optind = 1; + opterr = 0; + int c; + while((c = getopt(argc, argv, "h" +#ifdef WITH_MAILRECEIVE + "m" +#endif + )) > 0) { + switch (c) { + case 'h': + usage(argv[0]); + break; +#ifdef WITH_MAILRECEIVE + case 'm': + mail_received=true; + break; +#endif + default: + fprintf(stderr, "%s: invalid option '%c'\n", argv[0], optopt); + usage(argv[0]); + break; + } } + if (optind != argc - 1) { + fprintf(stderr, "%s: file not specified\n", argv[0]); + usage(argv[0]); + } + + raw_filespec_to_process=argv[optind++]; } #ifdef WIN32 @@ -472,7 +499,6 @@ int main(int argc, char *argv[]) { std::set_new_handler(failed_new); #endif - char *raw_filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1]; char filespec_to_process[MAX_STRING]; full_file_spec(raw_filespec_to_process, filespec_to_process, sizeof(filespec_to_process));