--- parser3/src/main/pa_common.C	2001/10/24 16:33:02	1.77
+++ parser3/src/main/pa_common.C	2001/11/05 11:46:27	1.85
@@ -2,9 +2,9 @@
 	Parser: commonly functions.
 
 	Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru>(http://paf.design.ru)
 
-	$Id: pa_common.C,v 1.77 2001/10/24 16:33:02 parser Exp $
+	$Id: pa_common.C,v 1.85 2001/11/05 11:46:27 paf Exp $
 */
 
 #include "pa_common.h"
@@ -16,13 +16,14 @@
 #include "pa_hash.h"
 #include "pa_string.h"
 
-#ifndef WIN32
-#	ifndef _O_TEXT
-#		define _O_TEXT 0
-#	endif
-#	ifndef _O_BINARY
-#		define _O_BINARY 0
-#	endif
+#ifndef _O_TEXT
+#	define _O_TEXT 0
+#endif
+#ifndef _O_BINARY
+#	define _O_BINARY 0
+#endif
+#ifndef O_TRUNC
+#	define O_TRUNC 0
 #endif
 
 #if _MSC_VER
@@ -42,11 +43,11 @@ int __snprintf(char *b, size_t s, const
 
 #endif
 
-void fix_line_breaks(char *src, size_t& size) {
-	char *dest=src;
+void fix_line_breaks(char *cstr, size_t& size) {
+	char *dest=cstr;
 	// fix DOS: \r\n -> \n
 	// fix Macintosh: \r -> \n
-	char *bol=src;
+	char *bol=cstr;
 	while(char *eol=strchr(bol, '\r')) {
 		size_t len=eol-bol;
 		if(dest!=bol)
@@ -93,10 +94,14 @@ bool file_read(Pool& pool, const String&
 			flock(f, LOCK_EX);*/
 		size_t max_size=limit?min(offset+limit, finfo.st_size)-offset:finfo.st_size;
 		if(!max_size) { // eof
-			data=0;
+			if(as_text) {
+				data=pool.malloc(1);
+				*(char*)data=0;
+			} else 
+				data=0;
 			read_size=0;
 		} else {
-			data=pool.malloc(max_size+(as_text?1:0));
+			data=pool.malloc(max_size+(as_text?1:0), 3);
 			if(offset)
 				lseek(f, offset, SEEK_SET);
 			read_size=read(f, data, max_size);
@@ -140,40 +145,33 @@ static void create_dir_for_file(const St
 void file_write(Pool& pool, 
 				const String& file_spec, 
 				const void *data, size_t size, 
-				bool as_text/*, 
+				bool as_text,
+				bool do_append/*, 
 				bool exclusive*/) {
 	const char *fname=file_spec.cstr(String::UL_FILE_SPEC);
 	int f;
-	if(access(fname, W_OK)!=0) {/*no*/
+	if(access(fname, W_OK)!=0) // no
 		create_dir_for_file(file_spec);
 
-		if((f=open(fname, O_WRONLY|O_CREAT|_O_BINARY, 0666))>0)
-			close(f);
-	}
-	if(access(fname, R_OK|W_OK)==0) {
-		int mode=O_RDWR|(as_text?_O_TEXT:_O_BINARY)
-#ifdef WIN32
-			|O_TRUNC
-#endif
-		;
-		if((f=open(fname, mode, 0666))>=0) {
-			/*if(exclusive)
-				flock(f, LOCK_EX);*/
-			
-			if(size) write(f, data, size);
-#ifndef WIN32
-			ftruncate(f, size);
+	if((f=open(fname, 
+		O_CREAT|O_RDWR
+		|(as_text?_O_TEXT:_O_BINARY)
+		|(do_append?O_APPEND:O_TRUNC), 0666))>=0) {
+		/*if(exclusive)
+			flock(f, LOCK_EX);*/
+		
+		if(size) write(f, data, size);
+#if O_TRUNC==0
+		ftruncate(f, size);
 #endif
-			/*if(exclusive)
-				flock(f, LOCK_UN);*/
-			close(f);
-			return;
-		}
-	}
-	throw Exception(0, 0, 
-		&file_spec, 
-		"write failed: %s (%d), actual filename '%s'", 
-			strerror(errno), errno, fname);
+		/*if(exclusive)
+			flock(f, LOCK_UN);*/
+		close(f);
+	} else
+		throw Exception(0, 0, 
+			&file_spec, 
+			"write failed: %s (%d), actual filename '%s'", 
+				strerror(errno), errno, fname);
 }
 
 // throws nothing! [this is required in file_move & file_delete]
@@ -302,7 +300,7 @@ char *rsplit(char *string, char delim) {
 
 /// @todo less stupid type detection
 char *format(Pool& pool, double value, char *fmt) {
-	char *result=(char *)pool.malloc(MAX_NUMBER);
+	char *result=(char *)pool.malloc(MAX_NUMBER, 4);
 	if(fmt)
 		if(strpbrk(fmt, "diouxX"))
 			if(strpbrk(fmt, "ouxX"))
@@ -334,7 +332,7 @@ size_t stdout_write(const void *buf, siz
 }
 
 char *unescape_chars(Pool& pool, const char *cp, int len) {
-	char *s=(char *)pool.malloc(len + 1);
+	char *s=(char *)pool.malloc(len + 1, 5);
 	enum EscapeState {
 		EscapeRest, 
 		EscapeFirst, 
@@ -444,7 +442,7 @@ bool StrEqNc(const char *s1, const char
 	}
 }
 
-static int isLeap(int year) {
+static bool isLeap(int year) {
     return !(
              (year % 4) || ((year % 400) && !(year % 100))
             );