--- parser3/src/main/pa_common.C	2001/10/29 13:04:46	1.78
+++ parser3/src/main/pa_common.C	2001/11/09 11:47:55	1.87
@@ -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.78 2001/10/29 13:04:46 paf Exp $
+	$Id: pa_common.C,v 1.87 2001/11/09 11:47:55 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,19 +43,30 @@ int __snprintf(char *b, size_t s, const
 
 #endif
 
-void fix_line_breaks(char *src, size_t& size) {
-	char *dest=src;
+static char *strnchr(char *buf, size_t size, char c) {
+	for(; size-->0; buf++) {
+		if(*buf==c)
+			return buf;
+	}
+
+	return 0;
+}
+
+void fix_line_breaks(char *buf, size_t& size) {
+	//_asm int 3;
+	const char * const eob=buf+size;
+	char *dest=buf;
 	// fix DOS: \r\n -> \n
 	// fix Macintosh: \r -> \n
-	char *bol=src;
-	while(char *eol=strchr(bol, '\r')) {
+	char *bol=buf;
+	while(char *eol=strnchr(bol, eob -bol, '\r')) {
 		size_t len=eol-bol;
 		if(dest!=bol)
 			memcpy(dest, bol, len);
 		dest+=len;
 		*dest++='\n';
 
-		if(eol[1]=='\n') { // \r,\n = DOS
+		if(&eol[1]<eob && eol[1]=='\n') { // \r,\n = DOS
 			bol=eol+2;
 			size--;
 		} else // \r,not \n = Macintosh
@@ -62,7 +74,7 @@ void fix_line_breaks(char *src, size_t&
 	}
 	// last piece without \r, including terminating 0
 	if(dest!=bol)
-		strcpy(dest, bol);
+		memcpy(dest, bol, eob-bol);
 }
 
 char *file_read_text(Pool& pool, const String& file_spec, bool fail_on_read_problem) {
@@ -70,7 +82,7 @@ char *file_read_text(Pool& pool, const S
 	return file_read(pool, file_spec, result, size, true, fail_on_read_problem)?(char *)result:0;
 }
 bool file_read(Pool& pool, const String& file_spec, 
-			   void*& data, size_t& read_size, bool as_text,
+			   void*& data, size_t& data_size, bool as_text,
 			   bool fail_on_read_problem,
 			   size_t offset, size_t limit) {
 	const char *fname=file_spec.cstr(String::UL_FILE_SPEC);
@@ -92,8 +104,13 @@ bool file_read(Pool& pool, const String&
 		/*if(exclusive)
 			flock(f, LOCK_EX);*/
 		size_t max_size=limit?min(offset+limit, finfo.st_size)-offset:finfo.st_size;
+		int read_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), 3);
@@ -107,17 +124,18 @@ bool file_read(Pool& pool, const String&
 		if(!max_size) // eof
 			return true;
 
-		if(read_size>=0 && read_size<=max_size) {
-			if(as_text)
-				((char*&)data)[read_size]=0;
-		} else
+		if(read_size<0 || read_size>max_size)
 			throw Exception(0, 0, 
 				&file_spec, 
 				"read failed: actually read %d bytes count not in [0..%lu] valid range", 
 					read_size, (unsigned long)max_size); //never
-		
-		if(as_text)
-			fix_line_breaks((char *)data, read_size);
+
+		data_size=read_size;		
+		if(as_text) {
+			fix_line_breaks((char *)data, data_size);
+			// note: after fixing
+			((char*&)data)[data_size]=0;
+		}
 		return true;
     }
 	if(fail_on_read_problem)
@@ -140,40 +158,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]
@@ -444,7 +455,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))
             );