null+****@clear*****
null+****@clear*****
2012年 3月 14日 (水) 10:29:56 JST
Susumu Yata 2012-03-14 10:29:56 +0900 (Wed, 14 Mar 2012) New Revision: cb76a9f40a79027c256f3543b1b6ba63218bcd21 Log: Add document_root_arg so as not to set grn_document_root directly. Modified files: src/groonga.c Modified: src/groonga.c (+7 -2) =================================================================== --- src/groonga.c 2012-03-14 10:03:09 +0900 (b862ce4) +++ src/groonga.c 2012-03-14 10:29:56 +0900 (f3076e0) @@ -2395,7 +2395,8 @@ main(int argc, char **argv) *max_num_threads_arg = NULL, *log_level_arg = NULL, *bind_address_arg = NULL, *hostname_arg = NULL, *protocol_arg = NULL, *log_path_arg = NULL, *query_log_path_arg = NULL, - *cache_limit_arg = NULL, *default_command_version_arg = NULL, + *cache_limit_arg = NULL, *document_root_arg = NULL, + *default_command_version_arg = NULL, *default_match_escalation_threshold_arg = NULL; const char *config_path = NULL; int r, i, mode = mode_alone; @@ -2438,7 +2439,7 @@ main(int argc, char **argv) opts[16].arg = &config_path; opts[18].arg = &cache_limit_arg; opts[19].arg = &input_path; - opts[20].arg = &grn_document_root; + opts[20].arg = &document_root_arg; opts[21].arg = &default_command_version_arg; opts[22].arg = &default_match_escalation_threshold_arg; opts[23].arg = &bind_address_arg; @@ -2619,6 +2620,10 @@ main(int argc, char **argv) strcpy(hostname, default_hostname); } + if (document_root_arg) { + grn_document_root = document_root_arg; + } + if (default_command_version_arg) { const char * const end = default_command_version_arg + strlen(default_command_version_arg);