--- parser3/src/main/pa_common.C	2001/09/26 10:32:26	1.68
+++ parser3/src/main/pa_common.C	2002/01/25 11:33:46	1.95
@@ -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.68 2001/09/26 10:32:26 parser Exp $
+	$Id: pa_common.C,v 1.95 2002/01/25 11:33:46 paf Exp $
 */
 
 #include "pa_common.h"
@@ -16,41 +16,125 @@
 #include "pa_hash.h"
 #include "pa_string.h"
 
-#ifndef WIN32
-#	ifndef _O_TEXT
-#		define _O_TEXT 0
+// some maybe-undefined constants
+
+#ifndef _O_TEXT
+#	define _O_TEXT 0
+#endif
+#ifndef _O_BINARY
+#	define _O_BINARY 0
+#endif
+#ifndef O_TRUNC
+#	define O_TRUNC 0
+#endif
+
+// locking constants
+
+#ifndef LOCK_EX
+// win32
+#	ifdef _LK_LOCK
+#		define LOCK_EX _LK_LOCK
+#	else
+// sun 
+#		ifdef F_LOCK
+#			define LOCK_EX F_LOCK
+#		else
+#			error unable to define LOCK_EX
+#		endif
 #	endif
-#	ifndef _O_BINARY
-#		define _O_BINARY 0
+#endif
+
+#ifndef LOCK_SH
+// win32
+#	ifdef _LK_RLCK
+#		define LOCK_SH _LK_RLCK
+#	else
+// sun 
+/// @todo shared lock bit. forgot where to get those  F_LOCK consts group
+#		ifdef F_LOCK
+#			define LOCK_SH F_LOCK
+#		else
+#			error unable to define LOCK_SH
+#		endif
 #	endif
 #endif
 
-#if _MSC_VER
+#ifndef LOCK_UN
+// win32
+#	ifdef _LK_UNLCK
+#		define LOCK_UN _LK_UNLCK
+#	else
+// sun 
+#		ifdef F_ULOCK
+#			define LOCK_UN F_ULOCK
+#		else
+#			error unable to define LOCK_UN
+#		endif
+#	endif
+#endif
 
-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;
+#ifndef HAVE_FLOCK
+// win32
+#ifdef HAVE__LOCKING
+static void flock(int fd, int operation) {
+	lseek(fd, 0, SEEK_SET);
+	while(_locking(fd, operation, 1)!=0);
+	lseek(fd, 0, SEEK_SET);
 }
-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;
+#else
+// sun
+#ifdef HAVE_LOCKF
+static void flock(int fd, int operation) {
+	lseek(fd, 0, SEEK_SET);
+	lockf(fd, operation, 1);
+	lseek(fd, 0, SEEK_SET);
 }
-
+#else
+#error unable to find locking func
+#endif
+#endif
 #endif
 
+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=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]<eob && eol[1]=='\n') { // \r,\n = DOS
+			bol=eol+2;
+			size--;
+		} else // \r,not \n = Macintosh
+			bol=eol+1;
+	}
+	// last piece without \r, including terminating 0
+	if(dest!=bol)
+		memcpy(dest, bol, eob-bol);
+}
 
 char *file_read_text(Pool& pool, const String& file_spec, bool fail_on_read_problem) {
-	void *result;
-	size_t size;
-	return file_read(pool, file_spec, result, size, true, 
-		fail_on_read_problem)?(char *)result:0;
+	void *result;  size_t size;
+	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);
@@ -67,39 +151,45 @@ bool file_read(Pool& pool, const String&
 	//   they delay update till open, so we would receive "!^test[" string
 	//   if would do stat, next open.
     if(
-		(f=open(fname, O_RDONLY|(as_text?_O_TEXT:_O_BINARY)))>=0 && 
+		(f=open(fname, O_RDONLY|(as_text?_O_BINARY/*_O_TEXT*/:_O_BINARY)))>=0 && 
 		stat(fname, &finfo)==0) {
-		/*if(exclusive)
-			flock(f, LOCK_EX);*/
+		flock(f, LOCK_SH);		
 		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));
+			data=pool.malloc(max_size+(as_text?1:0), 3);
 			if(offset)
 				lseek(f, offset, SEEK_SET);
 			read_size=read(f, data, max_size);
 		}
-		/*if(exclusive)
-			flock(f, LOCK_UN);*/
+		flock(f, LOCK_UN);
 		close(f);
 		if(!max_size) // eof
 			return true;
 
-		if(read_size>=0 && read_size<=max_size) {
-			if(as_text)
-				((char*&)data)[read_size]=0;
-		} else
-			PTHROW(0, 0, 
+		if(read_size<0 || size_t(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
-		
-		return true;//prepare_config(result, remove_empty_lines);
+
+		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)
-		PTHROW(0, 0, 
+		throw Exception(0, 0, 
 			&file_spec, 
 			"read failed: %s (%d), actual filename '%s'", 
 				strerror(errno), errno, fname);
@@ -115,43 +205,33 @@ static void create_dir_for_file(const St
 	}
 }
 
-void file_write(Pool& pool, 
+void file_write(
 				const String& file_spec, 
 				const void *data, size_t size, 
-				bool as_text/*, 
-				bool exclusive*/) {
+				bool as_text,
+				bool do_append) {
 	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
+	if((f=open(fname, 
+		O_CREAT|O_RDWR
+		|(as_text?_O_TEXT:_O_BINARY)
+		|(do_append?O_APPEND:O_TRUNC), 0664))>=0) {
+		flock(f, LOCK_EX);
+		
+		if(size) write(f, data, size);
+#if O_TRUNC==0
+		ftruncate(f, size);
 #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);
-#endif
-			/*if(exclusive)
-				flock(f, LOCK_UN);*/
-			close(f);
-			return;
-		}
-	}
-	PTHROW(0, 0, 
-		&file_spec, 
-		"write failed: %s (%d), actual filename '%s'", 
-			strerror(errno), errno, fname);
+		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]
@@ -162,24 +242,28 @@ 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(const String& file_spec, bool fail_on_read_problem) {
 	const char *fname=file_spec.cstr(String::UL_FILE_SPEC);
 	if(unlink(fname)!=0)
-		PTHROW(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) {
+void file_move(const String& old_spec, const String& new_spec) {
 	const char *old_spec_cstr=old_spec.cstr(String::UL_FILE_SPEC);
 	const char *new_spec_cstr=new_spec.cstr(String::UL_FILE_SPEC);
 	
 	create_dir_for_file(new_spec);
 
 	if(rename(old_spec_cstr, new_spec_cstr)!=0)
-		PTHROW(0, 0, 
+		throw Exception(0, 0, 
 			&old_spec, 
 			"rename failed: %s (%d), actual filename '%s' to '%s'", 
 				strerror(errno), errno, old_spec_cstr, new_spec_cstr);
@@ -192,7 +276,7 @@ static bool entry_readable(const String&
     const char *fname=file_spec.cstr(String::UL_FILE_SPEC);
 	struct stat finfo;
 	if(access(fname, R_OK)==0 && stat(fname, &finfo)==0) {
-		bool is_dir=(bool)(finfo.st_mode&S_IFDIR);
+		bool is_dir=finfo.st_mode&S_IFDIR != 0;
 		return is_dir==need_dir;
 	}
 	return false;
@@ -224,7 +308,7 @@ bool file_stat(const String& file_spec,
     struct stat finfo;
 	if(stat(fname, &finfo)!=0)
 		if(fail_on_read_problem)
-			PTHROW(0, 0, 
+			throw Exception(0, 0, 
 				&file_spec, 
 				"getting file size failed: %s (%d), real filename '%s'", 
 					strerror(errno), errno, fname);
@@ -280,7 +364,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"))
@@ -311,8 +395,8 @@ size_t stdout_write(const void *buf, siz
 #endif
 }
 
-const char *unescape_chars(Pool& pool, const char *cp, int len) {
-	char *s=(char *)pool.malloc(len + 1);
+char *unescape_chars(Pool& pool, const char *cp, int len) {
+	char *s=(char *)pool.malloc(len + 1, 5);
 	enum EscapeState {
 		EscapeRest, 
 		EscapeFirst, 
@@ -363,14 +447,14 @@ static void append_attribute_subattribut
 
 	// ...; charset=windows1251
 	*ami.header << "; ";
-	ami.header->append(akey, ami.lang, true);
+	ami.header->append(akey, ami.lang);
 	*ami.header << "=";
-	ami.header->append(static_cast<Value *>(avalue)->as_string(), ami.lang, true);
+	ami.header->append(static_cast<Value *>(avalue)->as_string(), ami.lang);
 }
 const String& attributed_meaning_to_string(Value& meaning, 
 										   String::Untaint_lang lang) {
 	String &result=*new(meaning.pool()) String(meaning.pool());
-	if(Hash *hash=meaning.get_hash()) {
+	if(Hash *hash=meaning.get_hash(0)) {
 		// $value(value) $subattribute(subattribute value)
 		if(Value *value=static_cast<Value *>(hash->get(*value_name)))
 			result.append(value->as_string(), lang, true);
@@ -422,44 +506,7 @@ bool StrEqNc(const char *s1, const char
 	}
 }
 
-char *unquote(char*& current, char stop_at) {
-	char *result=current;
-	char *dest=current;
-	// skip leading WS
-	while(*current==' ' || *current=='\t')
-		current++;
-	if(!*current)
-		return current=0;
-
-	bool quoted=*current=='"';
-	if(quoted)
-		current++;
-
-	for(; *current; ) {
-		if(quoted)
-			switch(*current) {
-			case '\\': // "...\c
-				if(current[1])
-					current++;
-				break;
-			case '"':
-				current++;
-				goto break2;
-			}
-		else
-			if(*current==stop_at)
-				break;
-
-		*dest++=*current++;
-	}
-break2:
-	if(*current)
-		current++; // skip 'stop_at'
-	*dest=0;
-	return result;
-}
-
-static int isLeap(int year) {
+static bool isLeap(int year) {
     return !(
              (year % 4) || ((year % 400) && !(year % 100))
             );
@@ -482,3 +529,62 @@ int getMonthDays(int year, int month) {
     };
     return monthDays[month];
 }
+
+void remove_crlf(char *start, char *end) {
+	for(char *p=start; p<end; p++)
+		switch(*p) {
+			case '\n': *p='|'; break;
+			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;
+}