|
|
|
@ -630,6 +630,7 @@ int yon_config_append_element(char *key, char *append, char *divider){
|
|
|
|
int found = 0;
|
|
|
|
int found = 0;
|
|
|
|
yon_config_parameter *dict = (yon_config_parameter*)yon_dictionary_get((dictionary**)&__yon__config__strings,key);
|
|
|
|
yon_config_parameter *dict = (yon_config_parameter*)yon_dictionary_get((dictionary**)&__yon__config__strings,key);
|
|
|
|
if (dict){
|
|
|
|
if (dict){
|
|
|
|
|
|
|
|
if (!yon_char_check_elements((char*)dict->data,append,divider)){
|
|
|
|
char *temp = yon_char_append_element((char*)dict->data,append,divider);
|
|
|
|
char *temp = yon_char_append_element((char*)dict->data,append,divider);
|
|
|
|
if (!yon_char_is_empty((char*)dict->data)) free(dict->data);
|
|
|
|
if (!yon_char_is_empty((char*)dict->data)) free(dict->data);
|
|
|
|
dict->data = temp;
|
|
|
|
dict->data = temp;
|
|
|
|
@ -637,8 +638,10 @@ int yon_config_append_element(char *key, char *append, char *divider){
|
|
|
|
yon_config_remove_ignore(key);
|
|
|
|
yon_config_remove_ignore(key);
|
|
|
|
return 1;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
} else return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int yon_config_force_append_element(char *key, char *append, char *divider){
|
|
|
|
int yon_config_force_append_element(char *key, char *append, char *divider){
|
|
|
|
@ -1052,6 +1055,7 @@ config_str yon_config_load_file(FILE *file, int *str_len) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
char *yon_config_parameter_wrap(char *parameter_key){
|
|
|
|
char *yon_config_parameter_wrap(char *parameter_key){
|
|
|
|
|
|
|
|
if (!strstr(parameter_key,"[")) return yon_char_new(parameter_key);
|
|
|
|
char *cur = NULL;
|
|
|
|
char *cur = NULL;
|
|
|
|
int size;
|
|
|
|
int size;
|
|
|
|
config_str parsed = yon_char_parse(parameter_key,&size,"[");
|
|
|
|
config_str parsed = yon_char_parse(parameter_key,&size,"[");
|
|
|
|
@ -1061,6 +1065,7 @@ char *yon_config_parameter_wrap(char *parameter_key){
|
|
|
|
char *half_wrapped = yon_char_parsed_to_string_full(parsed,size,"[");
|
|
|
|
char *half_wrapped = yon_char_parsed_to_string_full(parsed,size,"[");
|
|
|
|
yon_char_parsed_free(parsed,size);
|
|
|
|
yon_char_parsed_free(parsed,size);
|
|
|
|
parsed = yon_char_parse(half_wrapped,&size,"]");
|
|
|
|
parsed = yon_char_parse(half_wrapped,&size,"]");
|
|
|
|
|
|
|
|
if (size>1)
|
|
|
|
temp = yon_char_append_c(parsed[size-2],'\'');
|
|
|
|
temp = yon_char_append_c(parsed[size-2],'\'');
|
|
|
|
free(parsed[size-2]);
|
|
|
|
free(parsed[size-2]);
|
|
|
|
parsed[size-2] = temp;
|
|
|
|
parsed[size-2] = temp;
|
|
|
|
@ -1075,7 +1080,7 @@ char *yon_config_parameter_to_string(yon_config_parameter *parameter, int insert
|
|
|
|
if (parameter){
|
|
|
|
if (parameter){
|
|
|
|
char *param_string = NULL;
|
|
|
|
char *param_string = NULL;
|
|
|
|
char *parameter_wrapped = yon_config_parameter_wrap(parameter->key);
|
|
|
|
char *parameter_wrapped = yon_config_parameter_wrap(parameter->key);
|
|
|
|
param_string = yon_char_unite(insert_section?parameter->section:"",insert_section?" ":"", parameter_wrapped,parameter->flag1==-1?NULL:"","=\'",parameter->data,"\'",NULL);
|
|
|
|
param_string = yon_char_unite(insert_section?parameter->section:"",insert_section?" ":"", parameter_wrapped,parameter->flag1==-1?NULL:"","=\'",yon_char_return_if_exist(parameter->data,""),"\'",NULL);
|
|
|
|
return param_string;
|
|
|
|
return param_string;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
return NULL;
|
|
|
|
|