--- parser3/src/classes/file.C 2003/03/24 17:12:33 1.107.2.16.2.10 +++ parser3/src/classes/file.C 2003/04/16 14:19:16 1.107.2.16.2.16 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_FILE_C="$Date: 2003/03/24 17:12:33 $"; +static const char* IDENT_FILE_C="$Date: 2003/04/16 14:19:16 $"; #include "pa_config_includes.h" @@ -102,25 +102,25 @@ static const StringBody cdate_name("cdat // methods -static void _save(Request& r, MethodParams* params) { - Value& vmode_name=params-> as_no_junction(0, "mode must not be code"); - Value& vfile_name=params->as_no_junction(1, "file name must not be code"); +static void _save(Request& r, MethodParams& params) { + Value& vmode_name=params. as_no_junction(0, "mode must not be code"); + Value& vfile_name=params.as_no_junction(1, "file name must not be code"); // save GET_SELF(r, VFile).save(r.absolute(vfile_name.as_string()), vmode_name.as_string()==TEXT_MODE_NAME); } -static void _delete(Request& r, MethodParams* params) { - Value& vfile_name=params->as_no_junction(0, "file name must not be code"); +static void _delete(Request& r, MethodParams& params) { + Value& vfile_name=params.as_no_junction(0, "file name must not be code"); // unlink file_delete(r.absolute(vfile_name.as_string())); } -static void _move(Request& r, MethodParams* params) { - Value& vfrom_file_name=params->as_no_junction(0, "from file name must not be code"); - Value& vto_file_name=params->as_no_junction(1, "to file name must not be code"); +static void _move(Request& r, MethodParams& params) { + Value& vfrom_file_name=params.as_no_junction(0, "from file name must not be code"); + Value& vto_file_name=params.as_no_junction(1, "to file name must not be code"); // move file_move( @@ -134,23 +134,23 @@ static void _load_pass_param( HashStringValue *dest) { dest->put(key, value); } -static void _load(Request& r, MethodParams* params) { - Value& vmode_name=params-> as_no_junction(0, "mode must not be code"); - const String& lfile_name=r.absolute(params->as_no_junction(1, "file name must not be code").as_string()); - Value* third_param=params->count()>2?¶ms->as_no_junction(2, "filename or options must not be code") +static void _load(Request& r, MethodParams& params) { + Value& vmode_name=params. as_no_junction(0, "mode must not be code"); + const String& lfile_name=r.absolute(params.as_no_junction(1, "file name must not be code").as_string()); + Value* third_param=params.count()>2?¶ms.as_no_junction(2, "filename or options must not be code") :0; HashStringValue* third_param_hash=third_param?third_param->get_hash():0; - int alt_filename_param_index=2; + size_t alt_filename_param_index=2; if(third_param_hash) alt_filename_param_index++; - File_read_result file=file_read(r.charsets.source(), lfile_name, + File_read_result file=file_read(r.charsets, lfile_name, vmode_name.as_string()==TEXT_MODE_NAME, third_param_hash ); - const char *user_file_name=params->count()>alt_filename_param_index? - params->as_string(alt_filename_param_index, "filename must be string").cstr() + const char *user_file_name=params.count()>alt_filename_param_index? + params.as_string(alt_filename_param_index, "filename must be string").cstr() :lfile_name.cstr(String::L_FILE_SPEC); Value* vcontent_type=0; @@ -165,8 +165,8 @@ static void _load(Request& r, MethodPara file.headers->for_each(_load_pass_param, &self.fields()); } -static void _stat(Request& r, MethodParams* params) { - Value& vfile_name=params->as_no_junction(0, "file name must not be code"); +static void _stat(Request& r, MethodParams& params) { + Value& vfile_name=params.as_no_junction(0, "file name must not be code"); const String& lfile_name=vfile_name.as_string(); @@ -237,10 +237,10 @@ static void pass_cgi_header_attribute( } } /// @todo fix `` in perl - they produced flipping consoles and no output to perl -static void _exec_cgi(Request& r, MethodParams* params, +static void _exec_cgi(Request& r, MethodParams& params, bool cgi) { - Value& vfile_name=params->as_no_junction(0, "file name must not be code"); + Value& vfile_name=params.as_no_junction(0, "file name must not be code"); const String& script_name=r.absolute(vfile_name.as_string()); @@ -279,11 +279,10 @@ static void _exec_cgi(Request& r, Method bool stdin_specified=false; // environment & stdin from param String in; - if(params->count()>1) { - Value& venv=params->as_no_junction(1, "env must not be code"); + if(params.count()>1) { + Value& venv=params.as_no_junction(1, "env must not be code"); if(HashStringValue* user_env=venv.get_hash()) { - Append_env_pair_info info; - info.env=&env; + Append_env_pair_info info={&env}; user_env->for_each(append_env_pair, &info); if(info.vstdin) { stdin_specified=true; @@ -291,7 +290,7 @@ static void _exec_cgi(Request& r, Method in.append(*sstdin, String::L_CLEAN, true); } else if(VFile* vfile=static_cast(info.vstdin->as("file", false))) - in.append((const char* )vfile->value_ptr(), vfile->value_size(), String::L_TAINTED); + in.append_know_length((const char* )vfile->value_ptr(), vfile->value_size(), String::L_TAINTED); else throw Exception("parser.runtime", 0, @@ -302,14 +301,14 @@ static void _exec_cgi(Request& r, Method // argv from params ArrayString argv; - if(params->count()>2) { - for(int i=2; icount(); i++) - argv+=¶ms->as_string(i, "parameter must be string"); + if(params.count()>2) { + for(size_t i=2; ias_no_junction(0, "path must not be code"); +static void _list(Request& r, MethodParams& params) { + Value& relative_path=params.as_no_junction(0, "path must not be code"); const String* regexp; pcre *regexp_code; const int ovecsize=(1/*match*/)*3; int ovector[ovecsize]; - if(params->count()>1) { - regexp=¶ms->as_no_junction(1, "regexp must not be code").as_string(); + if(params.count()>1) { + regexp=¶ms.as_no_junction(1, "regexp must not be code").as_string(); const char* pattern=regexp->cstr(); const char* errptr; @@ -469,11 +468,11 @@ static void lock_execute_body(int , void // execute body info.r->write_assign_lang(info.r->process(*info.body_code)); }; -static void _lock(Request& r, MethodParams* params) { +static void _lock(Request& r, MethodParams& params) { Lock_execute_body_info info; info.r=&r; - const String& file_spec=r.absolute(params->as_string(0, "file name must be string")); - info.body_code=¶ms->as_junction(1, "body must be code"); + const String& file_spec=r.absolute(params.as_string(0, "file name must be string")); + info.body_code=¶ms.as_junction(1, "body must be code"); file_write_action_under_lock(file_spec, "lock", lock_execute_body, &info); } @@ -493,8 +492,8 @@ static int lastposafter(const String& s, return after; } -static void _find(Request& r, MethodParams* params) { - const String& file_name=params->as_no_junction(0, "file name must not be code").as_string(); +static void _find(Request& r, MethodParams& params) { + const String& file_name=params.as_no_junction(0, "file name must not be code").as_string(); const String* file_spec; if(file_name.first_char()=='/') file_spec=&file_name; @@ -524,14 +523,14 @@ static void _find(Request& r, MethodPara } // no way, not found - if(params->count()==2) { - Value& not_found_code=params->as_junction(1, "not-found param must be code"); + if(params.count()==2) { + Value& not_found_code=params.as_junction(1, "not-found param must be code"); r.write_pass_lang(r.process(not_found_code)); } } -static void _dirname(Request& r, MethodParams* params) { - const String& file_spec=params->as_string(0, "file name must be string"); +static void _dirname(Request& r, MethodParams& params) { + const String& file_spec=params.as_string(0, "file name must be string"); // /a/some.tar.gz > /a // /a/b/ > /a int afterslash=lastposafter(file_spec, 0, "/", 1, true); @@ -541,30 +540,30 @@ static void _dirname(Request& r, MethodP r.write_assign_lang(String(".", 1)); } -static void _basename(Request& r, MethodParams* params) { - const String& file_spec=params->as_string(0, "file name must be string"); +static void _basename(Request& r, MethodParams& params) { + const String& file_spec=params.as_string(0, "file name must be string"); // /a/some.tar.gz > some.tar.gz int afterslash=lastposafter(file_spec, 0, "/", 1); r.write_assign_lang(file_spec.mid(afterslash, file_spec.length())); } -static void _justname(Request& r, MethodParams* params) { - const String& file_spec=params->as_string(0, "file name must be string"); +static void _justname(Request& r, MethodParams& params) { + const String& file_spec=params.as_string(0, "file name must be string"); // /a/some.tar.gz > some.tar int afterslash=lastposafter(file_spec, 0, "/", 1); int afterdot=lastposafter(file_spec, afterslash, ".", 1); r.write_assign_lang(file_spec.mid(afterslash, afterdot!=afterslash?afterdot-1:file_spec.length())); } -static void _justext(Request& r, MethodParams* params) { - const String& file_spec=params->as_string(0, "file name must be string"); +static void _justext(Request& r, MethodParams& params) { + const String& file_spec=params.as_string(0, "file name must be string"); // /a/some.tar.gz > gz int afterdot=lastposafter(file_spec, 0, ".", 1); if(afterdot>0) r.write_assign_lang(file_spec.mid(afterdot, file_spec.length())); } -static void _fullpath(Request& r, MethodParams* params) { - const String& file_spec=params->as_string(0, "file name must be string"); +static void _fullpath(Request& r, MethodParams& params) { + const String& file_spec=params.as_string(0, "file name must be string"); const String* result; if(file_spec.first_char()=='/') result=&file_spec;