--- parser3/src/include/pa_common.h	2001/11/14 11:26:17	1.63
+++ parser3/src/include/pa_common.h	2002/01/25 12:09:04	1.71
@@ -4,26 +4,24 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_common.h,v 1.63 2001/11/14 11:26:17 paf Exp $
+	$Id: pa_common.h,v 1.71 2002/01/25 12:09:04 paf Exp $
 */
 
 #ifndef PA_COMMON_H
 #define PA_COMMON_H
 
-#include "pa_config_includes.h"
 #include "pa_pool.h"
 #include "pa_string.h"
 
 class Value;
 
-#ifndef vsnprintf
+// replace system s*nprintf with our versions
+#undef vsnprintf 
 int __vsnprintf(char *, size_t, const char *, va_list);
-#	define vsnprintf __vsnprintf 
-#endif
-#ifndef snprintf
+#define vsnprintf __vsnprintf 
+#undef snprintf
 int __snprintf(char *, size_t, const char *, ...);
-#	define snprintf __snprintf
-#endif
+#define snprintf __snprintf
 
 #if _MSC_VER
 /*
@@ -108,26 +106,36 @@ bool file_read(Pool& pool, const String&
 			   size_t offset=0, size_t limit=0);
 
 /**
-	write data to specified file using pool, 
+	lock specified file exclusively, 
+	do actions under lock.
+	throws an exception in case of problems
+*/
+void file_action_under_lock(
+				const String& file_spec, 
+				const char *action_name, void (*action)(int, void *), void *context=0,
+				bool as_text=false,
+				bool do_append=false);
+
+/**
+	write data to specified file, 
 	throws an exception in case of problems
 */
-void file_write(Pool& pool, 
+void file_write(
 				const String& file_spec,
 				const void *data, size_t size, 
 				bool as_text,
-				bool do_append=false/*,
-				bool exclusive=false*/);
+				bool do_append=false);
 
 /**
 	delete specified file 
 	throws an exception in case of problems
 */
-void file_delete(Pool& pool, const String& file_spec);
+bool file_delete(const String& file_spec, bool fail_on_read_problem=true);
 /**
 	move specified file 
 	throws an exception in case of problems
 */
-void file_move(Pool& pool, const String& old_spec, const String& new_spec);
+void file_move(const String& old_spec, const String& new_spec);
 
 bool file_readable(const String& file_spec);
 bool dir_readable(const String& file_spec);