--- parser3/src/classes/file.C	2006/11/13 13:45:57	1.146
+++ parser3/src/classes/file.C	2006/12/01 17:59:13	1.149
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_FILE_C="$Date: 2006/11/13 13:45:57 $";
+static const char * const IDENT_FILE_C="$Date: 2006/12/01 17:59:13 $";
 
 #include "pa_config_includes.h"
 
@@ -25,6 +25,7 @@ static const char * const IDENT_FILE_C="
 #include "pa_charset.h"
 #include "pa_charsets.h"
 #include "pa_sql_connection.h"
+#include "pa_md5.h"
 
 // defines
 
@@ -149,6 +150,47 @@ static void _move(Request& r, MethodPara
 		r.absolute(vto_file_name.as_string()));
 }
 
+static void copy_process_source(
+			     struct stat& , 
+			     int from_file, 
+			     const String& , const char* /*fname*/, bool, 
+				 void *context) {
+	int& to_file=*static_cast<int *>(context);
+
+	int nCount=0;
+	do {
+		unsigned char buffer[FILE_BUFFER_SIZE];
+		nCount = read(from_file, buffer, sizeof(buffer));
+		int written=write(to_file, buffer, nCount); 
+		if( written < 0 )
+			throw Exception(0, 
+				0, 
+				"write failed: %s (%d)",  strerror(errno), errno); 
+		
+	} while(nCount > 0);
+}
+
+static void copy_open_target(int f, void *from_spec) {
+	String& file_spec=*static_cast<String *>(from_spec);
+	file_read_action_under_lock(file_spec, "copy", copy_process_source, &f);
+};
+
+static void _copy(Request& r, MethodParams& params) {
+	Value& vfrom_file_name=params.as_no_junction(0, "from file name must not be code");
+	Value& vto_file_name=params.as_no_junction(1, "to file name must not be code");
+
+	String from_spec = r.absolute(vfrom_file_name.as_string());
+	const String& to_spec = r.absolute(vto_file_name.as_string());
+	
+	create_dir_for_file(to_spec); 
+	
+	file_write_action_under_lock(
+			to_spec,
+			"copy",
+			copy_open_target,
+			&from_spec);
+}
+
 static void _load_pass_param(
 			     HashStringValue::key_type key, 
 			     HashStringValue::value_type value, 
@@ -832,6 +874,68 @@ static void _crc32(Request& r, MethodPar
 }
 
 
+static void file_md5_file_action(
+			     struct stat& finfo, 
+			     int f, 
+			     const String& , const char* /*fname*/, bool, 
+			     void *context)
+{
+	PA_MD5_CTX& md5context=*static_cast<PA_MD5_CTX *>(context);
+	if(finfo.st_size) {
+		int nCount=0;
+		do {
+			unsigned char buffer[FILE_BUFFER_SIZE];
+			nCount = read(f, buffer, sizeof(buffer));
+			if ( nCount ){
+				pa_MD5Update(&md5context, (const unsigned char*)buffer, nCount);
+			}
+		} while(nCount > 0);
+	}
+}
+
+const char* pa_md5(const String& file_spec)
+{
+	PA_MD5_CTX context;
+	unsigned char digest[16];
+	pa_MD5Init(&context);
+	file_read_action_under_lock(file_spec, "md5", file_md5_file_action, &context);
+	pa_MD5Final(digest, &context);
+	
+	return hex_string(digest, sizeof(digest), false);
+}
+
+const char* pa_md5(const char *in, size_t in_size)
+{
+	PA_MD5_CTX context;
+	unsigned char digest[16];
+	pa_MD5Init(&context);
+	pa_MD5Update(&context, (const unsigned char*)in, in_size);
+	pa_MD5Final(digest, &context);
+	
+	return hex_string(digest, sizeof(digest), false);
+}
+
+static void _md5(Request& r, MethodParams& params) {
+	const char* md5;
+	if(&r.get_self() == file_class) {
+		// ^file:md5[file-name]
+		if(params.count()) {
+			const String& file_spec=params.as_string(0, "file name must be string");
+			md5=pa_md5(r.absolute(file_spec));
+		} else {
+			throw Exception("parser.runtime",
+				0,
+				"file name must be defined");
+		}
+	} else {
+		// ^file.md5[]
+		VFile& self=GET_SELF(r, VFile);
+		md5=pa_md5(self.value_ptr(), self.value_size());
+
+	}
+	r.write_no_lang(*new String(md5));
+}
+
 // constructor
 
 MFile::MFile(): Methoded("file") {
@@ -901,4 +1005,11 @@ MFile::MFile(): Methoded("file") {
 	// ^file.crc32[]
 	// ^file:crc32[file-name]
 	add_native_method("crc32", Method::CT_ANY, _crc32, 0, 1);
+
+	// ^file.md5[]
+	// ^file:md5[file-name]
+	add_native_method("md5", Method::CT_ANY, _md5, 0, 1);
+
+	// ^file:copy[from-file-name;to-file-name]
+	add_native_method("copy", Method::CT_STATIC, _copy, 2, 2);
 }