--- parser3/src/main/pa_common.C	2020/12/02 17:22:44	1.318
+++ parser3/src/main/pa_common.C	2021/11/08 11:44:19	1.325
@@ -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.318 2020/12/02 17:22:44 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.325 2021/11/08 11:44:19 moko Exp $" IDENT_PA_COMMON_H IDENT_PA_HASH_H IDENT_PA_ARRAY_H IDENT_PA_STACK_H; 
 
 // some maybe-undefined constants
 
@@ -116,12 +116,10 @@ struct File_read_action_info {
 
 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 < finfo.st_size ? info.limit : finfo.st_size, &file_spec);
 	if(to_read_size) {
-		if(info.offset && pa_lseek(f, info.offset) !=  info.offset)
-			throw Exception("file.read", &file_spec, "seek to %.15g failed: %s (%d)", (double)info.offset, strerror(errno), errno);
+		if(info.offset)
+			 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)
@@ -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++;
+		}
 	}
 }
 
@@ -532,7 +532,7 @@ bool file_stat(const String& file_spec,
 }
 
 size_t check_file_size(uint64_t size, const String* file_spec){
-	if(size > pa_file_size_limit)
+	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;
 }
@@ -566,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;
@@ -654,6 +654,19 @@ char* rsplit(char* string, char delim) {
 	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) {
@@ -945,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;