--- parser3/src/main/pa_common.C	2020/02/26 11:59:39	1.311
+++ parser3/src/main/pa_common.C	2021/12/22 21:52:49	1.326
@@ -1,7 +1,7 @@
 /** @file
 	Parser: commonly functions.
 
-	Copyright (c) 2000-2017 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2000-2020 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -29,7 +29,7 @@
 #define pa_mkdir(path, mode) mkdir(path, mode)
 #endif
 
-volatile const char * IDENT_PA_COMMON_C="$Id: pa_common.C,v 1.311 2020/02/26 11:59:39 moko Exp $" IDENT_PA_COMMON_H IDENT_PA_HASH_H IDENT_PA_ARRAY_H IDENT_PA_STACK_H; 
+volatile const char * IDENT_PA_COMMON_C="$Id: pa_common.C,v 1.326 2021/12/22 21:52:49 moko Exp $" IDENT_PA_COMMON_H IDENT_PA_HASH_H IDENT_PA_ARRAY_H IDENT_PA_STACK_H; 
 
 // some maybe-undefined constants
 
@@ -110,18 +110,16 @@ int pa_get_valid_file_options_count(Hash
 #ifndef DOXYGEN
 struct File_read_action_info {
 	char **data; size_t *data_size;
-	char* buf; size_t offset; size_t limit;
+	char* buf; uint64_t offset; size_t limit;
 }; 
 #endif
 
 static void file_read_action(struct stat& finfo, int f, const String& file_spec, void *context) {
 	File_read_action_info& info = *static_cast<File_read_action_info *>(context); 
-	size_t to_read_size = info.limit;
-	if(!to_read_size)
-		to_read_size = check_file_size(finfo.st_size, file_spec);
+	size_t to_read_size = check_file_size(info.limit && info.limit < (size_t)finfo.st_size ? info.limit : (size_t)finfo.st_size, &file_spec);
 	if(to_read_size) {
 		if(info.offset)
-			lseek(f, info.offset, SEEK_SET);
+			 pa_lseek(f, info.offset, SEEK_SET); // seek never fails as POSIX allows the file offset to be set beyond the EOF
 		*info.data = info.buf ? info.buf : (char *)pa_malloc_atomic(to_read_size+1);
 		ssize_t result = read(f, *info.data, to_read_size);
 		if(result<0)
@@ -136,7 +134,7 @@ static void file_read_action(struct stat
 	}
 }
 
-File_read_result file_read_binary(const String& file_spec, bool fail_on_read_problem, char* buf, size_t offset, size_t limit) {
+File_read_result file_read_binary(const String& file_spec, bool fail_on_read_problem, char* buf, uint64_t offset, size_t limit) {
 	File_read_result result = {false, 0, 0, 0};
 	File_read_action_info info = {&result.str, &result.length, buf, offset, limit};
 
@@ -288,11 +286,13 @@ bool file_read_action_under_lock(const S
 }
 
 void create_dir_for_file(const String& file_spec) {
-	size_t pos_after=1;
-	size_t pos_before;
-	while((pos_before=file_spec.pos('/', pos_after))!=STRING_NOT_FOUND) {
-		pa_mkdir(file_spec.mid(0, pos_before).taint_cstr(String::L_FILE_SPEC), 0775); 
-		pos_after=pos_before+1;
+	const char *str=file_spec.taint_cstr(String::L_FILE_SPEC);
+	if(str[0]){
+		const char *pos=str+1;
+		while((pos=strchr(pos,'/')) && pos[1]) { // to avoid trailing /, see #1166
+			pa_mkdir(pa_strdup(str,pos-str), 0775);
+			pos++;
+		}
 	}
 }
 
@@ -407,8 +407,19 @@ static size_t get_dir(char* fname, size_
 	return pos;
 }
 
-static bool entry_exists(const String& file_spec, bool need_dir) {
-	char *fname=file_spec.taint_cstrm(String::L_FILE_SPEC);
+bool entry_exists(const char* fname, struct stat *afinfo) {
+	struct stat lfinfo;
+	bool result=pa_stat(fname, &lfinfo)==0;
+	if(afinfo)
+		*afinfo=lfinfo;
+	return result;
+}
+
+bool entry_exists(const String& file_spec) {
+	return entry_exists(file_spec.taint_cstr(String::L_FILE_SPEC), 0); 
+}
+
+static bool entry_ifdir(char *fname, bool need_dir) {
 	if(need_dir){
 		size_t size=strlen(fname);
 		while(size) {
@@ -428,13 +439,17 @@ static bool entry_exists(const String& f
 	return false;
 }
 
+static bool entry_ifdir(const String& file_spec, bool need_dir) {
+	return entry_ifdir(file_spec.taint_cstrm(String::L_FILE_SPEC), need_dir);
+}
+
 // throws nothing! [this is required in file_move & file_delete]
 static void rmdir(const String& file_spec, size_t pos_after) {
 	char* dir_spec=file_spec.taint_cstrm(String::L_FILE_SPEC);
 	size_t length=strlen(dir_spec);
 	while( (length=get_dir(dir_spec, length)) && (length > pos_after) ){
 #ifdef _MSC_VER
-		if(!entry_exists(dir_spec, true))
+		if(!entry_ifdir(dir_spec, true))
 			break;
 		DWORD attrs=GetFileAttributes(dir_spec);
 		if(
@@ -480,25 +495,12 @@ void file_move(const String& old_spec, c
 }
 
 
-bool entry_exists(const char* fname, struct stat *afinfo) {
-	struct stat lfinfo;
-	bool result=pa_stat(fname, &lfinfo)==0;
-	if(afinfo)
-		*afinfo=lfinfo;
-	return result;
-}
-
-bool entry_exists(const String& file_spec) {
-	const char* fname=file_spec.taint_cstr(String::L_FILE_SPEC); 
-	return entry_exists(fname, 0); 
-}
-
 bool file_exist(const String& file_spec) {
-	return entry_exists(file_spec, false); 
+	return entry_ifdir(file_spec, false); 
 }
 
 bool dir_exists(const String& file_spec) {
-	return entry_exists(file_spec, true); 
+	return entry_ifdir(file_spec, true); 
 }
 
 const String* file_exist(const String& path, const String& name) {
@@ -529,9 +531,9 @@ bool file_stat(const String& file_spec,
 	return true;
 }
 
-size_t check_file_size(uint64_t size, const String& file_spec){
-	if(size > pa_file_size_limit)
-		throw Exception(PARSER_RUNTIME, &file_spec, "content size of %.15g bytes exceeds the limit (%.15g bytes)", (double)size, (double)pa_file_size_limit);
+size_t check_file_size(uint64_t size, const String* file_spec){
+	if(size > (uint64_t)pa_file_size_limit)
+		throw Exception(PARSER_RUNTIME, file_spec, "content size of %.15g bytes exceeds the limit (%.15g bytes)", (double)size, (double)pa_file_size_limit);
 	return (size_t)size;
 }
 
@@ -564,15 +566,15 @@ const char* capitalize(const char* s){
 	return (const char*)result;
 }
 
-char *str_lower(const char *s, size_t helper_length){
-	char *result=pa_strdup(s, helper_length);
+char *str_lower(const char *s, size_t length){
+	char *result=pa_strdup(s, length);
 	for(char* c=result; *c; c++)
 		*c=(char)tolower((unsigned char)*c);
 	return result;
 }
 
-char *str_upper(const char *s, size_t helper_length){
-	char *result=pa_strdup(s, helper_length);
+char *str_upper(const char *s, size_t length){
+	char *result=pa_strdup(s, length);
 	for(char* c=result; *c; c++)
 		*c=(char)toupper((unsigned char)*c);
 	return result;
@@ -649,9 +651,46 @@ char* rsplit(char* string, char delim) {
 			return v+1;
 		}
 	}
-	return NULL;	
+	return NULL;
+}
+
+void pa_strncpy(char *dst, const char *src, size_t n){
+	size_t left = n;
+
+	if (left != 0 && src) {
+		while (--left != 0) {
+			if ((*dst++ = *src++) == '\0')
+				return;
+		}
+	}
+	if (n != 0)
+		*dst = '\0';
 }
 
+#define STRCAT_STEP(str, len) if(str) { memcpy(ptr, str, len); ptr += len; }
+
+char *pa_strcat(const char *a, const char *b, const char *c) {
+	size_t len_a = a ? strlen(a) : 0;
+	size_t len_b = b ? strlen(b) : 0;
+	size_t len_c = c ? strlen(c) : 0;
+	char *result=new(PointerFreeGC) char[len_a + len_b + len_c +1/*0*/];
+	char *ptr=result;
+	STRCAT_STEP(a, len_a);
+	STRCAT_STEP(b, len_b);
+	STRCAT_STEP(c, len_c);
+	*ptr='\0';
+	return result;
+}
+
+const char *pa_filename(const char *path){
+	if(!path)
+		return NULL;
+	for(const char *c = path + strlen(path) - 1; c >= path; c--) {
+		if(*c == '/' || *c == '\\')
+			return c+1;
+        }
+        return path;
+}
 
 // format: %[flags][width][.precision]type	http://msdn.microsoft.com/ru-ru/library/56e442dc(en-us,VS.80).aspx
 //		flags: '-', '+', ' ', '#', '0'		http://msdn.microsoft.com/ru-ru/library/8aky45ct(en-us,VS.80).aspx
@@ -749,16 +788,19 @@ size_t stdout_write(const void *buf, siz
 #ifdef WIN32
 	size_t to_write = size;
 	do{
-		int chunk_written=fwrite(buf, 1, min((size_t)8*0x400, size), stdout); 
+		int chunk_written=fwrite(buf, 1, min((size_t)8*0x400, size), stdout);
 		if(chunk_written<=0)
 			break;
 		size-=chunk_written;
 		buf=((const char*)buf)+chunk_written;
-	} while(size>0); 
+	} while(size>0);
 
+	fflush(stdout);
 	return to_write-size;
 #else
-	return fwrite(buf, 1, size, stdout); 
+	size_t result=fwrite(buf, 1, size, stdout);
+	fflush(stdout);
+	return result;
 #endif
 }
 
@@ -870,7 +912,7 @@ size_t strpos(const char *str, const cha
 	return (p==0)?STRING_NOT_FOUND:p-str;
 }
 
-int remove_crlf(char* start, char* end) {
+size_t remove_crlf(char* start, char* end) {
 	char* from=start;
 	char* to=start;
 	bool skip=false;
@@ -916,8 +958,8 @@ const char* hex_string(unsigned char* by
 	return bytes_hex;
 }
 
-int file_block_read(const int f, unsigned char* buffer, const size_t size){
-	int nCount = read(f, buffer, size);
+ssize_t file_block_read(const int f, void* buffer, const size_t size){
+	ssize_t nCount = read(f, buffer, size);
 	if (nCount < 0)
 		throw Exception("file.read", 0, "read failed: %s (%d)", strerror(errno), errno); 
 	return nCount;