--- parser3/src/main/pa_common.C	2001/08/27 12:02:24	1.61
+++ parser3/src/main/pa_common.C	2001/09/18 16:05:42	1.65
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 */
-static const char *RCSId="$Id: pa_common.C,v 1.61 2001/08/27 12:02:24 parser Exp $"; 
+static const char *RCSId="$Id: pa_common.C,v 1.65 2001/09/18 16:05:42 parser Exp $"; 
 
 #include "pa_common.h"
 #include "pa_types.h"
@@ -53,8 +53,8 @@ bool file_read(Pool& pool, const String&
 			   void*& data, size_t& read_size, bool as_text,
 			   bool fail_on_read_problem,
 			   size_t offset, size_t limit) {
-	const char *fname=file_spec.cstr(String::UL_FILE_NAME);
-printf("file_read(%s)\n", fname);
+	const char *fname=file_spec.cstr(String::UL_FILE_SPEC);
+//printf("file_read(%s)\n", fname);
 	int f;
     struct stat finfo;
 
@@ -106,20 +106,24 @@ printf("file_read(%s)\n", fname);
     return false;
 }
 
+static void create_dir_for_file(const String& file_spec) {
+	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_SPEC), 0775);
+		pos_after=pos_before+1;
+	}
+}
+
 void file_write(Pool& pool, 
 				const String& file_spec, 
 				const void *data, size_t size, 
 				bool as_text/*, 
 				bool exclusive*/) {
-	const char *fname=file_spec.cstr(String::UL_FILE_NAME);
+	const char *fname=file_spec.cstr(String::UL_FILE_SPEC);
 	int f;
 	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;
-		}
+		create_dir_for_file(file_spec);
 
 		if((f=open(fname, O_WRONLY|O_CREAT|_O_BINARY, 0666))>0)
 			close(f);
@@ -150,15 +154,16 @@ void file_write(Pool& pool,
 			strerror(errno), errno, fname);
 }
 
+// throws nothing! [this is required in file_move & file_delete]
 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));
+	rmdir(file_spec.mid(0, pos_after-1/* / */).cstr(String::UL_FILE_SPEC));
 }
 void file_delete(Pool& pool, const String& file_spec) {
-	const char *fname=file_spec.cstr(String::UL_FILE_NAME);
+	const char *fname=file_spec.cstr(String::UL_FILE_SPEC);
 	if(unlink(fname)!=0)
 		PTHROW(0, 0, 
 			&file_spec, 
@@ -168,18 +173,23 @@ void file_delete(Pool& pool, const Strin
 	rmdir(file_spec, 1);
 }
 void file_move(Pool& pool, const String& old_spec, const String& new_spec) {
-	const char *old_spec_cstr=old_spec.cstr(String::UL_FILE_NAME);
-	const char *new_spec_cstr=new_spec.cstr(String::UL_FILE_NAME);
+	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, 
 			&old_spec, 
 			"rename failed: %s (%d), actual filename '%s' to '%s'", 
 				strerror(errno), errno, old_spec_cstr, new_spec_cstr);
+
+	rmdir(old_spec, 1);
 }
 
 
 static bool entry_readable(const String& file_spec, bool need_dir) {
-    const char *fname=file_spec.cstr(String::UL_FILE_NAME);
+    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);
@@ -193,27 +203,38 @@ bool file_readable(const String& file_sp
 bool dir_readable(const String& file_spec) {
 	return entry_readable(file_spec, true);
 }
+String *file_readable(const String& path, const String& name) {
+	String *result=new(path.pool()) String(path);
+	*result << "/";
+	*result << name;
+	return file_readable(*result)?result:0;
+}
 bool file_executable(const String& file_spec) {
-    return access(file_spec.cstr(String::UL_FILE_NAME), X_OK)==0;
+    return access(file_spec.cstr(String::UL_FILE_SPEC), X_OK)==0;
 }
 
-void file_stat(const String& file_spec, 
+bool file_stat(const String& file_spec, 
 			   size_t& rsize, 
 			   time_t& ratime,
 			   time_t& rmtime,
-			   time_t& rctime) {
+			   time_t& rctime,
+			   bool fail_on_read_problem) {
 	Pool& pool=file_spec.pool();
-	const char *fname=file_spec.cstr(String::UL_FILE_NAME);
+	const char *fname=file_spec.cstr(String::UL_FILE_SPEC);
     struct stat finfo;
 	if(stat(fname, &finfo)!=0)
-		PTHROW(0, 0, 
-			&file_spec, 
-			"getting file size failed: %s (%d), real filename '%s'", 
-				strerror(errno), errno, fname);
+		if(fail_on_read_problem)
+			PTHROW(0, 0, 
+				&file_spec, 
+				"getting file size failed: %s (%d), real filename '%s'", 
+					strerror(errno), errno, fname);
+		else
+			return false;
 	rsize=finfo.st_size;
 	ratime=finfo.st_atime;
 	rmtime=finfo.st_mtime;
 	rctime=finfo.st_ctime;
+	return true;
 }
 
 char *getrow(char **row_ref, char delim) {