--- parser3/src/classes/file.C	2024/11/10 20:33:21	1.288
+++ parser3/src/classes/file.C	2025/05/26 00:52:15	1.296
@@ -27,7 +27,7 @@
 #include "pa_vregex.h"
 #include "pa_version.h"
 
-volatile const char * IDENT_FILE_C="$Id: file.C,v 1.288 2024/11/10 20:33:21 moko Exp $";
+volatile const char * IDENT_FILE_C="$Id: file.C,v 1.296 2025/05/26 00:52:15 moko Exp $";
 
 // defines
 
@@ -59,7 +59,7 @@ public:
 
 static Table &file_list_table_template(){
 	static Table *singleton=NULL;
-	if(singleton==NULL)
+	if(!singleton)
 		singleton=new Table(new File_list_table_template_columns);
 	return *singleton;
 }
@@ -133,8 +133,8 @@ static const String::Body cdate_name("cd
 // methods
 
 static void _save(Request& r, MethodParams& params) {
-	bool is_text=VFile::is_text_mode(params.as_string(0, MODE_MUST_NOT_BE_CODE));
-	Value& vfile_name=params.as_no_junction(1, FILE_NAME_MUST_NOT_BE_CODE);
+	bool is_text=VFile::is_text_mode(params.as_string(0, MODE_MUST_BE_STRING));
+	const String& file_name=params.as_file_name(1);
 
 	Charset* asked_charset=0;
 	if(params.count()>2)
@@ -149,11 +149,11 @@ static void _save(Request& r, MethodPara
 		}
 
 	// save
-	GET_SELF(r, VFile).save(r.charsets, r.full_disk_path(vfile_name.as_string()), is_text, asked_charset);
+	GET_SELF(r, VFile).save(r.charsets, r.full_disk_path(file_name), is_text, asked_charset);
 }
 
 static void _delete(Request& r, MethodParams& params) {
-	const String& file_name=params.as_string(0, FILE_NAME_MUST_NOT_BE_CODE);
+	const String& file_name=params.as_file_name(0);
 	bool keep_empty_dirs=false;
 	bool fail_on_problem=true;
 
@@ -208,9 +208,7 @@ static void copy_process_source(struct s
 		nCount = file_block_read(from_file, buffer, sizeof(buffer));
 		int written=write(to_file, buffer, nCount); 
 		if( written < 0 )
-			throw Exception("file.access", 
-				0, 
-				"write failed: %s (%d)",  strerror(errno), errno); 
+			throw Exception("file.write", 0, "write failed: %s (%d)", strerror(errno), errno);
 		
 	} while(nCount > 0);
 }
@@ -256,8 +254,8 @@ static void _load_pass_param(
 }
 
 static void _load(Request& r, MethodParams& params) {
-	bool as_text=VFile::is_text_mode(params.as_string(0, MODE_MUST_NOT_BE_CODE));
-	const String& lfile_name=r.full_disk_path(params.as_string(1, FILE_NAME_MUST_NOT_BE_CODE));
+	bool as_text=VFile::is_text_mode(params.as_string(0, MODE_MUST_BE_STRING));
+	const String& lfile_name=r.full_disk_path(params.as_file_name(1));
 
 	size_t param_index=params.count()-1;
 	Value* param_value=param_index>1?&params.as_no_junction(param_index, "file name or options must not be code"):0;
@@ -316,9 +314,9 @@ static void _create(Request& r, MethodPa
 
 	if(params.count()>=3){
 		// old format: ^file::create[text|binary;file-name;string-or-file-content[;options]] 
-		mode=&params.as_string(0, MODE_MUST_NOT_BE_CODE);
+		mode=&params.as_string(0, MODE_MUST_BE_STRING);
 		is_text=VFile::is_text_mode(*mode);
-		file_name=&params.as_string(1, FILE_NAME_MUST_NOT_BE_CODE);
+		file_name=&params.as_string(1, FILE_NAME_MUST_BE_STRING);
 		content_index=2;
 		options_index=3;
 		extended_options=false;
@@ -390,7 +388,7 @@ static void _create(Request& r, MethodPa
 }
 
 static void _stat(Request& r, MethodParams& params) {
-	const String& lfile_name=params.as_string(0, FILE_NAME_MUST_NOT_BE_CODE);
+	const String& lfile_name=params.as_file_name(0);
 
 	uint64_t size;
 	time_t atime, mtime, ctime;
@@ -478,7 +476,7 @@ static void append_to_argv(Request& r, A
 static void _exec_cgi(Request& r, MethodParams& params, bool cgi) {
 	bool is_text=true;
 	size_t param_index=0;
-	const String& mode=params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE);
+	const String& mode=params.as_string(0, "mode must be string");
 	if(VFile::is_valid_mode(mode)) {
 		is_text=VFile::is_text_mode(mode);
 		param_index++;
@@ -487,13 +485,13 @@ static void _exec_cgi(Request& r, Method
 	if(param_index>=params.count())
 		throw Exception(PARSER_RUNTIME, 0, FILE_NAME_MUST_BE_SPECIFIED);
 
-	const String& script_name=r.full_disk_path(params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE));
+	const String& script_name=r.full_disk_path(params.as_file_name(param_index++));
 
 	HashStringString env;
-	#define ECSTR(name, value_cstr) if(value_cstr) env.put(#name, value_cstr);
+	#define ECSTR(name, value_cstr) if(value_cstr) env.put(#name, String::Body(value_cstr));
 	// passing environment
 	for(SAPI::Env::Iterator i(r.sapi_info); i; i.next() )
-		env.put(i.key(), i.value() );
+		env.put(i.key(), String::Body(i.value()) );
 
 	// const
 	ECSTR(GATEWAY_INTERFACE, "CGI/1.1");
@@ -783,7 +781,7 @@ static void lock_execute_body(int , void
 }
 
 static void _lock(Request& r, MethodParams& params) {
-	const String& file_spec=r.full_disk_path(params.as_string(0, FILE_NAME_MUST_BE_STRING));
+	const String& file_spec=r.full_disk_path(params.as_file_name(0));
 	Lock_execute_body_info info={
 		&r, 
 		&params.as_junction(1, "body must be code")
@@ -807,7 +805,7 @@ static size_t afterlastslash(const Strin
 }
 
 static void _find(Request& r, MethodParams& params) {
-	const String& file_name=params.as_string(0, FILE_NAME_MUST_NOT_BE_CODE);
+	const String& file_name=params.as_string(0, FILE_NAME_MUST_BE_STRING);
 
 	Value* not_found_code=(params.count()==2)?&params.as_junction(1, "not-found param must be code"):0;
 
@@ -849,7 +847,7 @@ static void _find(Request& r, MethodPara
 }
 
 static void _dirname(Request& r, MethodParams& params) {
-	const String& file_spec=params.as_string(0, FILE_NAME_MUST_BE_STRING);
+	const String& file_spec=params.as_file_spec(0);
 	// works as *nix dirname
 
 	// empty   > .
@@ -883,7 +881,7 @@ static void _dirname(Request& r, MethodP
 }
 
 static void _basename(Request& r, MethodParams& params) {
-	const String& file_spec=params.as_string(0, FILE_NAME_MUST_BE_STRING);
+	const String& file_spec=params.as_file_spec(0);
 	// works as *nix basename
 
 	// empty   > .
@@ -909,7 +907,7 @@ static void _basename(Request& r, Method
 }
 
 static void _justname(Request& r, MethodParams& params) {
-	const String& file_spec=params.as_string(0, FILE_NAME_MUST_BE_STRING);
+	const String& file_spec=params.as_file_spec(0);
 	// /a/some.tar.gz > some.tar
 	// /a/b.c/ > empty
 	// /a/b.c  > b
@@ -919,7 +917,7 @@ static void _justname(Request& r, Method
 }
 
 static void _justext(Request& r, MethodParams& params) {
-	const String& file_spec=params.as_string(0, FILE_NAME_MUST_BE_STRING);
+	const String& file_spec=params.as_file_spec(0);
 	// /a/some.tar.gz > gz
 	// /a/b.c/ > empty
 	size_t pos=afterlastslash(file_spec);
@@ -929,7 +927,7 @@ static void _justext(Request& r, MethodP
 }
 
 static void _fullpath(Request& r, MethodParams& params) {
-	const String& file_spec=params.as_string(0, FILE_NAME_MUST_BE_STRING);
+	const String& file_spec=params.as_file_spec(0);
 	const String* result;
 	if(file_spec.first_char()=='/')
 		result=&file_spec;
@@ -1111,7 +1109,7 @@ static void _base64(Request& r, MethodPa
 				if(params.count() < 3)
 					throw Exception(PARSER_RUNTIME, 0, "constructor cannot have less than 3 parameters (has %d parameters)", params.count()); // actually it accepts 1 parameter (backward)
 
-				is_text=VFile::is_text_mode(params.as_string(0, MODE_MUST_NOT_BE_CODE));
+				is_text=VFile::is_text_mode(params.as_string(0, MODE_MUST_BE_STRING));
 				user_file_name=&params.as_string(1, FILE_NAME_MUST_BE_STRING);
 
 				if(params.count() == 4)
@@ -1137,7 +1135,7 @@ static void _base64(Request& r, MethodPa
 		if(params.count() > 2)
 			throw Exception(PARSER_RUNTIME, 0, "accepts maximum 2 parameter(s) (has %d parameters)", params.count());
 
-		const String& file_spec = params.as_string(0, FILE_NAME_MUST_BE_STRING);
+		const String& file_spec = params.as_file_name(0);
 		File_read_result data = file_read_binary(r.full_disk_path(file_spec), true /*fail on problem*/);
 
 		Base64Options options = base64_encode_options(r, params.count() > 1 ? params.as_hash(1) : NULL);
@@ -1151,7 +1149,7 @@ static void _crc32(Request& r, MethodPar
 	if(&r.get_self() == file_class) {
 		// ^file:crc32[file-name]
 		if(params.count()) {
-			const String& file_spec=params.as_string(0, FILE_NAME_MUST_BE_STRING);
+			const String& file_spec=params.as_file_name(0);
 			crc32=pa_crc32(r.full_disk_path(file_spec));
 		} else {
 			throw Exception(PARSER_RUNTIME, 0, FILE_NAME_MUST_BE_SPECIFIED);
@@ -1207,7 +1205,7 @@ static void _md5(Request& r, MethodParam
 	if(&r.get_self() == file_class) {
 		// ^file:md5[file-name]
 		if(params.count()) {
-			const String& file_spec=params.as_string(0, FILE_NAME_MUST_BE_STRING);
+			const String& file_spec=params.as_file_name(0);
 			md5=pa_md5(r.full_disk_path(file_spec));
 		} else {
 			throw Exception(PARSER_RUNTIME, 0, FILE_NAME_MUST_BE_SPECIFIED);