--- parser3/src/main/pa_common.C	2001/04/19 15:38:00	1.48
+++ parser3/src/main/pa_common.C	2001/05/19 17:37:06	1.54
@@ -5,10 +5,9 @@
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: pa_common.C,v 1.48 2001/04/19 15:38:00 paf Exp $
+	$Id: pa_common.C,v 1.54 2001/05/19 17:37:06 parser Exp $
 */
 
-#include "pa_config_includes.h"
 #include "pa_common.h"
 #include "pa_types.h"
 #include "pa_exception.h"
@@ -100,11 +99,11 @@ bool file_read(Pool& pool, const String&
 	if(fail_on_read_problem)
 		PTHROW(0, 0, 
 			&file_spec, 
-			"read failed: %s (%d)", strerror(errno), errno);
+			"read failed: %s (%d), actual filename '%s'", 
+				strerror(errno), errno, fname);
     return false;
 }
 
-/// @test mkdirs
 void file_write(Pool& pool, 
 				const String& file_spec, 
 				const void *data, size_t size, 
@@ -112,7 +111,14 @@ void file_write(Pool& pool,
 				bool exclusive*/) {
 	const char *fname=file_spec.cstr(String::UL_FILE_NAME);
 	int f;
-	if(access(fname, F_OK)!=0) {/*no*/
+	if(access(fname, W_OK)!=0) {/*no*/
+		size_t pos_after=1;
+		int pos_before;
+		while((pos_before=file_spec.pos("/", 1, pos_after))>=0) {
+			mkdir(file_spec.mid(0, pos_before).cstr(String::UL_FILE_NAME), 0775);
+			pos_after=pos_before+1;
+		}
+
 		if((f=open(fname, O_WRONLY|O_CREAT|_O_BINARY, 0666))>0)
 			close(f);
 	}
@@ -138,18 +144,43 @@ void file_write(Pool& pool,
 	}
 	PTHROW(0, 0, 
 		&file_spec, 
-		"write failed: %s (%d)", strerror(errno), errno);
+		"write failed: %s (%d), actual filename '%s'", 
+			strerror(errno), errno, fname);
 }
 
+static void rmdir(const String& file_spec, size_t pos_after) {
+	int pos_before;
+	if((pos_before=file_spec.pos("/", 1, pos_after))>=0)
+		rmdir(file_spec, pos_before+1);
+	
+	rmdir(file_spec.mid(0, pos_after-1/* / */).cstr(String::UL_FILE_NAME));
+}
 void file_delete(Pool& pool, const String& file_spec) {
-	if(unlink(file_spec.cstr(String::UL_FILE_NAME))!=0)
+	const char *fname=file_spec.cstr(String::UL_FILE_NAME);
+	if(unlink(fname)!=0)
 		PTHROW(0, 0, 
 			&file_spec, 
-			"unlink failed: %s (%d)", strerror(errno), errno);
+			"unlink failed: %s (%d), actual filename '%s'", 
+				strerror(errno), errno, fname);
+
+	rmdir(file_spec, 1);
 }
 
+
+static bool entry_readable(const String& file_spec, bool need_dir) {
+    const char *fname=file_spec.cstr(String::UL_FILE_NAME);
+	struct stat finfo;
+	if(access(fname, R_OK)==0 && stat(fname, &finfo)==0) {
+		bool is_dir=(bool)(finfo.st_mode&S_IFDIR);
+		return is_dir==need_dir;
+	}
+	return false;
+}
 bool file_readable(const String& file_spec) {
-    return access(file_spec.cstr(String::UL_FILE_NAME), R_OK)==0;
+	return entry_readable(file_spec, false);
+}
+bool dir_readable(const String& file_spec) {
+	return entry_readable(file_spec, true);
 }
 bool file_executable(const String& file_spec) {
     return access(file_spec.cstr(String::UL_FILE_NAME), X_OK)==0;
@@ -162,7 +193,8 @@ size_t file_size(const String& file_spec
 	if(stat(fname, &finfo)!=0)
 		PTHROW(0, 0, 
 			&file_spec, 
-			"write failed: %s (%d)", strerror(errno), errno);
+			"getting file size failed: %s (%d), real filename '%s'", 
+				strerror(errno), errno, fname);
 	return finfo.st_size;
 }
 
@@ -278,9 +310,10 @@ const char *unescape_chars(Pool& pool, c
 	return s;
 }
 
+/// used by attributed_meaning_to_string / append_attribute_subattribute
 struct Attributed_meaning_info {
-	String::Untaint_lang lang;
-	String *header;
+	String *header; // header line being constructed
+	String::Untaint_lang lang; // language in which to append to that line
 };
 static void append_attribute_subattribute(const Hash::Key& akey, Hash::Val *avalue, 
 										  void *info) {
@@ -295,7 +328,8 @@ static void append_attribute_subattribut
 	*ami.header << "=";
 	ami.header->append(static_cast<Value *>(avalue)->as_string(), ami.lang, true);
 }
-const String& attributed_meaning_to_string(Value& meaning, String::Untaint_lang 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()) {
 		// $value(value) $subattribute(subattribute value)
@@ -303,8 +337,8 @@ const String& attributed_meaning_to_stri
 			result.append(value->as_string(), lang, true);
 
 		Attributed_meaning_info attributed_meaning_info={
-			lang,
-			&result
+			&result,
+			lang
 		};
 		hash->for_each(append_attribute_subattribute, &attributed_meaning_info);
 	} else // result value