--- parser3/src/main/pa_common.C	2001/03/24 20:08:14	1.29
+++ parser3/src/main/pa_common.C	2001/03/28 13:21:30	1.35
@@ -6,7 +6,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: pa_common.C,v 1.29 2001/03/24 20:08:14 paf Exp $
+	$Id: pa_common.C,v 1.35 2001/03/28 13:21:30 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -45,58 +45,79 @@ int __snprintf(char *b, size_t s, const
 
 
 char *file_read_text(Pool& pool, const String& file_spec, bool fail_on_read_problem) {
-    int f;
-    struct stat finfo;
+	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& size, bool as_text,
+			   bool fail_on_read_problem) {
 	char *fname=file_spec.cstr();
-    if(!stat(fname,&finfo) &&(f=open(fname,O_RDONLY
-#ifdef WIN32
-		|O_TEXT
-#endif
-		))>=0) {
+	int f;
+    struct stat finfo;
+
+	// first open, next stat:
+	// directory update of NTFS symbolic links performed on open.
+	// ex: 
+	//   a.html:^test[] and b.html hardlink to a.html
+	//   user inserts ! before ^test in a.html
+	//   directory entry of b.html in NTFS not updated at once,
+	//   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 && 
+		stat(fname, &finfo)==0) {
 		/*if(exclusive)
 			flock(f, LOCK_EX);*/
-
-		char *result=(char *)pool.malloc(finfo.st_size+1);
-		int read_size=read(f,result,finfo.st_size);
-		if(read_size>=0 && read_size<=finfo.st_size) 
-			result[read_size]='\0';
+		data=pool.malloc(finfo.st_size+(as_text?1:0));
+		size=read(f, data, finfo.st_size);
 		/*if(exclusive)
 			flock(f, LOCK_UN);*/
 		close(f);
-		return result;//prepare_config(result, remove_empty_lines);
+
+		if(size>=0 && size<=(size_t)finfo.st_size) {
+			if(as_text)
+				((char *)data)[size]=0;
+		} else
+			PTHROW(0, 0, 
+				&file_spec, 
+				"read failed: actually read %d bytes count not in [0..%ul] valid range", 
+					size, (unsigned long)finfo.st_size); //never
+		
+		return true;//prepare_config(result, remove_empty_lines);
     }
 	if(fail_on_read_problem)
-		PTHROW(0, 0,
-			&file_spec,
+		PTHROW(0, 0, 
+			&file_spec, 
 			"read failed: %s (#%d)", strerror(errno), errno);
-    return 0;
+    return false;
 }
 
 void file_write(Pool& pool, 
 				const String& file_spec, 
-				const char *data, size_t size, 
-				bool as_text/*,
+				const void *data, size_t size, 
+				bool as_text/*, 
 				bool exclusive*/) {
 	char *fname=file_spec.cstr();
 	int f;
 	if(access(fname, F_OK)!=0) {/*no*/
-		if((f=open(fname,O_WRONLY|O_CREAT|_O_BINARY,0666))>0)
+		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
+		int mode=O_RDWR|(as_text?_O_TEXT:_O_BINARY)
 #ifdef WIN32
 			|O_TRUNC
 #endif
 		;
-		mode|=as_text?_O_TEXT:_O_BINARY;
-		if((f=open(fname,mode,0666))>=0) {
+		if((f=open(fname, mode, 0666))>=0) {
 			/*if(exclusive)
 				flock(f, LOCK_EX);*/
 			
-			if(size) write(f,data,size);
+			if(size) write(f, data, size);
 #ifndef WIN32
-			ftruncate(f,size);
+			ftruncate(f, size);
 #endif
 			/*if(exclusive)
 				flock(f, LOCK_UN);*/
@@ -104,11 +125,22 @@ void file_write(Pool& pool,
 			return;
 		}
 	}
-	PTHROW(0, 0,
-		&file_spec,
+	PTHROW(0, 0, 
+		&file_spec, 
 		"write failed: %s (#%d)", strerror(errno), errno);
 }
 
+void file_delete(Pool& pool, const String& file_spec) {
+	if(unlink(file_spec.cstr())!=0)
+		PTHROW(0, 0, 
+			&file_spec, 
+			"unlink failed: %s (#%d)", strerror(errno), errno);
+}
+
+bool file_readable(const String& file_spec) {
+    return access(file_spec.cstr(), R_OK)==0;
+}
+
 char *getrow(char **row_ref, char delim) {
     char *result=*row_ref;
     if(result) {
@@ -155,13 +187,13 @@ char *format(Pool& pool, double value, c
 	if(fmt)
 		if(strpbrk(fmt, "diouxX"))
 			if(strpbrk(fmt, "ouxX"))
-				snprintf(result, MAX_NUMBER, fmt,(uint)value );
+				snprintf(result, MAX_NUMBER, fmt, (uint)value );
 			else
-				snprintf(result, MAX_NUMBER, fmt,(int)value );
+				snprintf(result, MAX_NUMBER, fmt, (int)value );
 		else
 			snprintf(result, MAX_NUMBER, fmt, value);
 	else
-		snprintf(result, MAX_NUMBER, "%d",(int)value);
+		snprintf(result, MAX_NUMBER, "%d", (int)value);
 	
 	return result;
 }
@@ -185,8 +217,8 @@ size_t stdout_write(const char *buf, siz
 const char *unescape_chars(Pool& pool, const char *cp, int len) {
 	char *s=(char *)pool.malloc(len + 1);
 	enum EscapeState {
-		EscapeRest,
-		EscapeFirst,
+		EscapeRest, 
+		EscapeFirst, 
 		EscapeSecond
 	} escapeState=EscapeRest;
 	int escapedValue=0;