--- parser3/src/include/pa_common.h	2001/03/20 07:34:31	1.19
+++ parser3/src/include/pa_common.h	2001/03/26 10:36:53	1.26
@@ -5,44 +5,46 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_common.h,v 1.19 2001/03/20 07:34:31 paf Exp $
+	$Id: pa_common.h,v 1.26 2001/03/26 10:36:53 paf Exp $
 */
 
 #ifndef PA_COMMON_H
 #define PA_COMMON_H
 
-#ifdef HAVE_CONFIG_H
-#	include "pa_config.h"
-#endif
-
-#ifdef WIN32
-#	include <sys/locking.h>
-#endif
-
+#include "pa_config_includes.h"
 #include <stdio.h>
-#include <stdarg.h>
+
 #include "pa_pool.h"
 
 class String;
 class Value;
 
-#ifdef WIN32
-
-#define open _open
-#define close _close
-#define read _read
-#define stat _stat
+#if _MSC_VER
 
-#define vsnprintf __vsnprintf 
-#define snprintf __snprintf
+#ifndef open
+#	define open _open
+#endif
+#ifndef close
+#	define close _close
+#endif
+#ifndef read
+#	define read _read
+#endif
+#ifndef write
+#	define write _write
+#endif
+#ifndef stat
+#	define stat _stat
+#endif
 
+#ifndef vsnprintf
+#	define vsnprintf __vsnprintf 
 int __vsnprintf(char *, size_t, const char *, va_list);
+#endif
+#ifndef snprintf
+#	define snprintf __snprintf
 int __snprintf(char *, size_t, const char *, ...);
-
-//flock
-#define LOCK_EX _LK_NBLCK
-#define LOCK_UN _LK_UNLCK
-void flock(int fd, int operation);
+#endif
 
 //access
 #define F_OK 0
@@ -50,33 +52,28 @@ void flock(int fd, int operation);
 #define W_OK 2
 #define R_OK 4
 
-#define strcasecmp _stricmp
-#define strncasecmp _strnicmp
-#define mkdir(path, mode) _mkdir(path)
-
-#define putenv _putenv
-
+#ifndef strcasecmp
+#	define strcasecmp _stricmp
+#endif
+#ifndef strncasecmp
+#	define strncasecmp _strnicmp
+#endif
+#ifndef mkdir
+#	define mkdir(path, mode) _mkdir(path)
 #endif
 
-/// @todo define it
-#ifdef SUN
-//flock
-#define LOCK_EX F_LOCK
-#define LOCK_UN F_ULOCK
-void flock(int fd, int operation);
+#ifndef putenv
+#	define putenv _putenv
 #endif
 
-/// @todo use somewhere
-void lock(FILE *f, long position);
-/// @todo use somewhere
-void unlock(FILE *f);
+#endif
 
 /**
 	read specified text file using pool, 
 	if fail_on_read_problem is true[default] throws an exception
 */
 char *file_read_text(Pool& pool, 
-					 const char *fname, 
+					 const String& file_spec, 
 					 bool fail_on_read_problem=true);
 
 /**
@@ -84,10 +81,16 @@ char *file_read_text(Pool& pool,
 	throws an exception in case of problems
 */
 void file_write(Pool& pool, 
-				const char *fname,
+				const String& file_spec,
 				const char *data, size_t size, 
-				bool as_text,
-				bool exclusive=false);
+				bool as_text/*,
+				bool exclusive=false*/);
+
+/**
+	delete specified file 
+	throws an exception in case of problems
+*/
+void file_delete(Pool& pool, const String& file_spec);
 
 /**
 	scans for @a delim[default \n] in @a *row_ref, 
@@ -96,7 +99,7 @@ void file_write(Pool& pool,
 	or to zero if no @a delim were found.
 */
 char *getrow(char **row_ref,char delim='\n');
-//char *lsplit(char *,char);
+//char *lsplit(char *string, char delim);
 char *lsplit(char **string_ref,char delim);
 char *rsplit(char *string, char delim);
 char *format(Pool& pool, double value, char *fmt);
@@ -110,6 +113,18 @@ size_t stdout_write(const char *buf, siz
 
 const char *unescape_chars(Pool& pool, const char *cp, int len);
 
-const String& attributed_meaning_string(Value *meaning);
+/**
+	$content-type[text/html] -> 
+		content-type: text/html
+	$content-type[$value[text/html] charset[windows-1251]] -> 
+		content-type: text/html; charset=windows-1251
+*/
+const String& attributed_meaning_to_string(Value& meaning);
+
+
+#ifdef WIN32
+void back_slashes_to_slashes(char *s);
+#endif
+
 
 #endif