--- parser3/src/targets/cgi/parser3.C	2010/11/22 22:24:23	1.259
+++ parser3/src/targets/cgi/parser3.C	2013/07/22 15:33:31	1.263
@@ -1,16 +1,16 @@
 /** @file
 	Parser: scripting and CGI main.
 
-	Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_PARSER3_C="$Date: 2010/11/22 22:24:23 $";
+volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.263 2013/07/22 15:33:31 moko Exp $";
 
 #include "pa_config_includes.h"
 
-#if _MSC_VER
-#	include <crtdbg.h>
+#ifdef _MSC_VER
+#include <crtdbg.h>
 #endif
 
 #include "pa_sapi.h"
@@ -20,8 +20,9 @@ static const char * const IDENT_PARSER3_
 #include "pa_socks.h"
 #include "pa_version.h"
 
-#ifdef WIN32
-#	include <windows.h>
+#ifdef _MSC_VER
+#include <windows.h>
+#include <direct.h>
 #endif
 
 // defines
@@ -106,7 +107,7 @@ static void log(const char* fmt, va_list
 	time_t t=time(0);
 	if(const char* stamp=ctime(&t)) { // never saw that
 		if(size_t len=strlen(stamp)) // saw once stamp being =""
-			fprintf(f, "[%.*s] [%u] ", len-1, stamp,
+			fprintf(f, "[%.*s] [%u] ", (int)len-1, stamp,
 			(unsigned int)getpid()
 			);
 	}
@@ -118,7 +119,7 @@ static void log(const char* fmt, va_list
 	fwrite(buf, size, 1, f);
 
 	if(request_info)
-		fprintf(f, " [uri=%s, method=%s, cl=%u]",
+		fprintf(f, " [uri=%s, method=%s, cl=%lu]",
 			request_info->uri? request_info->uri: "<unknown>",
 			request_info->method? request_info->method: "<unknown>",
 			request_info->content_length);
@@ -274,8 +275,8 @@ static void full_file_spec(const char* f
 			)
 				strncpy(buf, file_name, buf_size);
 		else {
-			char cwd[MAX_STRING];  getcwd(cwd, MAX_STRING);
-			snprintf(buf, buf_size, "%s/%s", cwd, file_name);
+			char cwd[MAX_STRING];
+			snprintf(buf, buf_size, "%s/%s", getcwd(cwd, MAX_STRING) ? cwd : "", file_name);
 		}
 	else
 		buf[0]=0;
@@ -617,7 +618,7 @@ static void call_real_parser_handler__su
 static void usage(const char* program) {
 	printf(
 		"Parser/%s\n"
-		"Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)\n"
+		"Copyright (c) 2001-2013 Art. Lebedev Studio (http://www.artlebedev.com)\n"
 		"Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)\n"
 		"\n"
 		"Usage: %s [options] file\n"