--- parser3/src/classes/file.C 2024/10/02 22:54:02 1.282 +++ parser3/src/classes/file.C 2024/12/11 03:22:23 1.294 @@ -1,7 +1,7 @@ /** @file Parser: @b file parser class. - Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com) Authors: Konstantin Morshnev , Alexandr Petrosian */ @@ -19,6 +19,7 @@ #include "pa_vdate.h" #include "pa_dir.h" #include "pa_vtable.h" +#include "pa_varray.h" #include "pa_charset.h" #include "pa_charsets.h" #include "pa_sql_connection.h" @@ -26,7 +27,7 @@ #include "pa_vregex.h" #include "pa_version.h" -volatile const char * IDENT_FILE_C="$Id: file.C,v 1.282 2024/10/02 22:54:02 moko Exp $"; +volatile const char * IDENT_FILE_C="$Id: file.C,v 1.294 2024/12/11 03:22:23 moko Exp $"; // defines @@ -56,7 +57,12 @@ public: } }; -Table file_list_table_template(new File_list_table_template_columns); +static Table &file_list_table_template(){ + static Table *singleton=NULL; + if(!singleton) + singleton=new Table(new File_list_table_template_columns); + return *singleton; +} // class @@ -127,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) @@ -143,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; @@ -250,8 +256,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?¶ms.as_no_junction(param_index, "file name or options must not be code"):0; @@ -310,9 +316,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=¶ms.as_string(0, MODE_MUST_NOT_BE_CODE); + mode=¶ms.as_string(0, MODE_MUST_BE_STRING); is_text=VFile::is_text_mode(*mode); - file_name=¶ms.as_string(1, FILE_NAME_MUST_NOT_BE_CODE); + file_name=¶ms.as_string(1, FILE_NAME_MUST_BE_STRING); content_index=2; options_index=3; extended_options=false; @@ -384,7 +390,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; @@ -465,15 +471,14 @@ static void pass_cgi_header_attribute( } static void append_to_argv(Request& r, ArrayString& argv, const String* str){ - if(!str->is_empty()) - argv+=new String(str->cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets), String::L_AS_IS); + argv+=new String(str->cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets), String::L_AS_IS); } /// @todo fix `` in perl - they produced flipping consoles and no output to perl 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++; @@ -482,7 +487,7 @@ 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); @@ -545,18 +550,31 @@ static void _exec_cgi(Request& r, Method for(size_t i=param_index; icount(); j++) - append_to_argv(r, argv, table->get(j)->get(0)); - } else { - throw Exception(PARSER_RUNTIME, 0, "param must be string or table"); + if(const String *string=param.get_string()){ + append_to_argv(r, argv, string); + } else if(Table* table=param.get_table()){ + for(size_t j=0; jcount(); j++) + append_to_argv(r, argv, table->get(j)->get(0)); + } else if(VArray* array=dynamic_cast(¶m)){ + for(ArrayValue::Iterator i(array->array()); i; i.next()){ + if(i.value()){ + const String *string=i.value()->get_string(); + if(!string) + i.value()->bark("array element is '%s', it does not have string value"); + append_to_argv(r, argv, string); } } + } else { + throw Exception(PARSER_RUNTIME, 0, "param must be string or table or array of strings"); + } + } + + // remove trailing empty arguments for backward compatibility + for(ArrayString::ReverseIterator i(argv); i;){ + if(i.prev()->is_empty()){ // here for correct i.index() + argv.remove(i.index()); + } else { + break; } } } @@ -724,7 +742,7 @@ static void _list(Request& r, MethodPara const char* absolute_path_cstr=r.full_disk_path(relative_path.as_string()).taint_cstr(String::L_FILE_SPEC); Table::Action_options table_options; - Table& table=*new Table(file_list_table_template, table_options); + Table& table=*new Table(file_list_table_template(), table_options); const int ovector_size=(1/*match*/)*3; int ovector[ovector_size]; @@ -765,7 +783,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, ¶ms.as_junction(1, "body must be code") @@ -789,7 +807,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)?¶ms.as_junction(1, "not-found param must be code"):0; @@ -831,7 +849,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 > . @@ -865,7 +883,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 > . @@ -891,7 +909,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 @@ -901,7 +919,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); @@ -911,7 +929,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; @@ -1093,7 +1111,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=¶ms.as_string(1, FILE_NAME_MUST_BE_STRING); if(params.count() == 4) @@ -1119,7 +1137,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); @@ -1133,7 +1151,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); @@ -1189,7 +1207,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);