--- parser3/src/main/pa_common.C	2001/11/05 10:21:27	1.84
+++ parser3/src/main/pa_common.C	2001/12/06 21:34:50	1.91.4.1.2.1
@@ -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.84 2001/11/05 10:21:27 paf Exp $
+	$Id: pa_common.C,v 1.91.4.1.2.1 2001/12/06 21:34:50 paf Exp $
 */
 
 #include "pa_common.h"
@@ -26,36 +26,30 @@
 #	define O_TRUNC 0
 #endif
 
-#if _MSC_VER
+static char *strnchr(char *buf, size_t size, char c) {
+	for(; size-->0; buf++) {
+		if(*buf==c)
+			return buf;
+	}
 
-int __vsnprintf(char *b, size_t s, const char *f, va_list l) {
-	int r=_vsnprintf(b, --s, f, l);
-	b[s]=0;
-	return r;
-}
-int __snprintf(char *b, size_t s, const char *f, ...) {
-	va_list l;
-    va_start(l, f);
-    int r=__vsnprintf(b, s, f, l);
-    va_end(l);
-	return r;
+	return 0;
 }
 
-#endif
-
-void fix_line_breaks(char *cstr, size_t& size) {
-	char *dest=cstr;
+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=cstr;
-	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
@@ -63,7 +57,7 @@ void fix_line_breaks(char *cstr, 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) {
@@ -71,7 +65,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);
@@ -93,6 +87,7 @@ 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
 			if(as_text) {
 				data=pool.malloc(1);
@@ -112,17 +107,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)
@@ -156,7 +152,7 @@ void file_write(Pool& pool,
 	if((f=open(fname, 
 		O_CREAT|O_RDWR
 		|(as_text?_O_TEXT:_O_BINARY)
-		|(do_append?O_APPEND:O_TRUNC), 0666))>=0) {
+		|(do_append?O_APPEND:O_TRUNC), 0664))>=0) {
 		/*if(exclusive)
 			flock(f, LOCK_EX);*/
 		
@@ -182,15 +178,19 @@ static void rmdir(const String& file_spe
 	
 	rmdir(file_spec.mid(0, pos_after-1/* / */).cstr(String::UL_FILE_SPEC));
 }
-void file_delete(Pool& pool, const String& file_spec) {
+bool file_delete(Pool& pool, const String& file_spec, bool fail_on_read_problem) {
 	const char *fname=file_spec.cstr(String::UL_FILE_SPEC);
 	if(unlink(fname)!=0)
-		throw Exception(0, 0, 
-			&file_spec, 
-			"unlink failed: %s (%d), actual filename '%s'", 
-				strerror(errno), errno, fname);
+		if(fail_on_read_problem)
+			throw Exception(0, 0, 
+				&file_spec, 
+				"unlink failed: %s (%d), actual filename '%s'", 
+					strerror(errno), errno, fname);
+		else
+			return false;
 
 	rmdir(file_spec, 1);
+	return true;
 }
 void file_move(Pool& pool, const String& old_spec, const String& new_spec) {
 	const char *old_spec_cstr=old_spec.cstr(String::UL_FILE_SPEC);
@@ -473,3 +473,54 @@ void remove_crlf(char *start, char *end)
 			case '\r': *p=' '; break;
 		}
 }
+
+
+/// must be last in this file
+#undef vsnprintf
+int __vsnprintf(char *b, size_t s, const char *f, va_list l) {
+	if(!s)
+		return 0;
+
+	int r;
+	// note: on win32& maybe somewhere else
+	// vsnprintf do not writes terminating 0 in 'buffer full' case, reducing
+	--s;
+#if _MSC_VER
+	/*
+	win32: 
+	mk:@MSITStore:C:\Program%20Files\Microsoft%20Visual%20Studio\MSDN\2001APR\1033\vccore.chm::/html/_crt__vsnprintf.2c_._vsnwprintf.htm
+
+	  if the number of bytes to write exceeds buffer, then count bytes are written and –1 is returned
+	*/
+	r=_vsnprintf(b, s, f, l);
+	if(r<0) 
+		r=s;
+#else
+	r=vsnprintf(b, s, f, l);
+	/*
+	solaris: 
+	man vsnprintf
+
+	  The snprintf() function returns  the  number  of  characters
+	formatted, that is, the number of characters that would have
+	been written to the buffer if it were large enough.  If  the
+	value  of  n  is  0  on a call to snprintf(), an unspecified
+	value less than 1 is returned.
+	*/
+
+	if(r<0)
+		r=0;
+	else if(r>s)
+		r=s;
+#endif
+	b[r]=0;
+	return r;
+}
+
+int __snprintf(char *b, size_t s, const char *f, ...) {
+	va_list l;
+    va_start(l, f);
+    int r=__vsnprintf(b, s, f, l);
+    va_end(l);
+	return r;
+}