--- parser3/src/targets/cgi/parser3.C	2007/08/17 08:16:11	1.243
+++ parser3/src/targets/cgi/parser3.C	2009/08/30 05:29:46	1.253
@@ -1,11 +1,11 @@
 /** @file
 	Parser: scripting and CGI main.
 
-	Copyright(c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_PARSER3_C="$Date: 2007/08/17 08:16:11 $";
+static const char * const IDENT_PARSER3_C="$Date: 2009/08/30 05:29:46 $";
 
 #include "pa_config_includes.h"
 
@@ -22,9 +22,6 @@ static const char * const IDENT_PARSER3_
 
 #ifdef WIN32
 #	include <windows.h>
-#	include "getopt.h"
-#else
-#	include <getopt.h>
 #endif
 
 // defines
@@ -51,6 +48,9 @@ static const char* argv0;
 static const char* config_filespec_cstr=0;
 static bool fail_on_config_read_problem=true;
 
+static int args_skip=1;
+static char** argv_all = NULL;
+
 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]
 
@@ -112,9 +112,9 @@ static void log(const char* fmt, va_list
 	}
 	// message
 
-	char buf[MAX_STRING];
-	size_t size=vsnprintf(buf, MAX_STRING, fmt, args);
-	remove_crlf(buf, buf+size);
+	char buf[MAX_LOG_STRING];
+	size_t size=vsnprintf(buf, MAX_LOG_STRING, fmt, args);
+	size=remove_crlf(buf, buf+size);
 	fwrite(buf, size, 1, f);
 
 	if(request_info)
@@ -165,11 +165,9 @@ static void die_or_abort(const char* fmt
 
 	// prepare header
 	// let's be honest, that's bad we couldn't produce valid output
-	SAPI::add_header_attribute(SAPI_info, "status", "500");
-	SAPI::add_header_attribute(SAPI_info, "content-type", "text/plain");
-	char content_length_cstr[MAX_NUMBER];
-	snprintf(content_length_cstr, sizeof(content_length_cstr), "%u", content_length);
-	SAPI::add_header_attribute(SAPI_info, "content-length", content_length_cstr);
+	SAPI::add_header_attribute(SAPI_info, HTTP_STATUS, "500");
+	SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_TYPE, "text/plain");
+	SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_LENGTH, format(content_length, "%u"));
 
 	// send header
 	SAPI::send_header(SAPI_info);
@@ -302,9 +300,9 @@ static const String sigpipe_name(SIGPIPE
 static void SIGPIPE_handler(int /*sig*/){
 	Value* sigpipe=0;
 	if(request)
-		sigpipe=request->main_class.get_element(sigpipe_name, request->main_class, false);
+		sigpipe=request->main_class.get_element(sigpipe_name);
 	if(sigpipe && sigpipe->as_bool())
-	log_signal("SIGPIPE");
+		log_signal(SIGPIPE_NAME);
 
 	execution_canceled=true;
 	if(request)
@@ -475,6 +473,9 @@ static void real_parser_handler(const ch
 	request_info.cookie=getenv("HTTP_COOKIE");
 	request_info.mail_received=mail_received;
 
+	request_info.argv=argv_all;
+	request_info.args_skip=args_skip;
+
 	// get request_info ptr for signal handlers
 	::request_info=&request_info;
 	if(execution_canceled)
@@ -595,7 +596,7 @@ static void call_real_parser_handler__su
 static void usage(const char* program) {
 	printf(
 		"Parser/%s\n"
-		"Copyright(c) 2001-2007 ArtLebedev Group (http://www.artlebedev.com)\n"
+		"Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)\n"
 		"Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)\n"
 		"\n"
 		"Usage: %s [options] file\n"
@@ -654,6 +655,7 @@ int main(int argc, char *argv[]) {
 #ifdef _DEBUG
 	//_crtBreakAlloc=46;
 #endif
+	argv_all=argv;
 	argv0=argv[0];
 
 	umask(2);
@@ -671,38 +673,44 @@ int main(int argc, char *argv[]) {
 		if(raw_filespec_to_process && !*raw_filespec_to_process)
 			raw_filespec_to_process=0;
 	} else {
-		optind = 1;
-		opterr = 0;
-		int c;
-		while((c = getopt(argc, argv, "hf:"
-#ifdef WITH_MAILRECEIVE
-			"m"
-#endif
-			)) > 0) {
-			switch (c) {
-			case 'h':
-				usage(argv[0]);
-				break;
-			case 'f':
-				config_filespec_cstr=optarg;
+		int optind=1;
+		while(optind < argc){
+			char *carg = argv[optind];
+			if(carg[0] != '-')
 				break;
+
+			for(size_t k = 1; k < strlen(carg); k++){
+				char c = carg[k];
+				switch (c) {
+					case 'h':
+						usage(argv[0]);
+						break;
+					case 'f':
+						if(optind < argc - 1){
+							optind++;
+							config_filespec_cstr=argv[optind];
+						}
+						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;
+					case 'm':
+						mail_received=true;
+						break;
+#endif
+					default:
+						fprintf(stderr, "%s: invalid option '%c'\n", argv[0], c);
+						usage(argv[0]);
+						break;
+				}
 			}
+			optind++;
 		}
-		if (optind != argc - 1) {
+		
+		if (optind > argc - 1) {
 			fprintf(stderr, "%s: file not specified\n", argv[0]);
 			usage(argv[0]);
 		}
-		
-		raw_filespec_to_process=argv[optind++];
+		raw_filespec_to_process=argv[optind];
+		args_skip=optind;
 	}
 
 #ifdef WIN32
@@ -754,10 +762,8 @@ int main(int argc, char *argv[]) {
 		int content_length=strlen(buf);
 
 		// prepare header
-		SAPI::add_header_attribute(SAPI_info, "content-type", "text/plain");
-		char content_length_cstr[MAX_NUMBER];
-		snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length);
-		SAPI::add_header_attribute(SAPI_info, "content-length", content_length_cstr);
+		SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_TYPE, "text/plain");
+		SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_LENGTH, format(content_length, "%u"));
 
 		// send header
 		SAPI::send_header(SAPI_info);