diff --git a/source/model/load.c b/source/model/load.c index c82421d..cf48cf8 100644 --- a/source/model/load.c +++ b/source/model/load.c @@ -62,12 +62,17 @@ void load_pars_keys_u_g(config_u_g_p* _config, char* str_key, int index) { char** arr_keys = philos_str_split(yon_char_new(str_key), &size_point, ":"); _config->type_arr = yon_char_new(arr_keys[0]); int size_users = 0; - if (yon_char_find_count(str_key, ":") == 2) { + if (yon_char_find_count(str_key, ":") == 1) { + int size_comma = 0; + char** arr_user = philos_str_split(arr_keys[size_point-1], &size_comma, ","); + _config->UNIX_file = yon_char_new(arr_keys[1]); + } + else if (yon_char_find_count(str_key, ":") == 2) { if (yon_char_find_count(str_key, ",")) { int size_comma = 0; char** arr_user = philos_str_split(arr_keys[size_point-1], &size_comma, ","); _config->UNIX_file = yon_char_new(arr_keys[1]); - for (int i = 1; i < size_comma; i++) { + for (int i = 0; i < size_comma; i++) { _config->actors.pfVectorAdd(&_config->actors,yon_char_new(arr_user[i])); } } @@ -100,7 +105,7 @@ void load_pars_keys_p(config_u_g_p* _config, char* str_key, int index) { else { _config->id = atoi(arr_user[0]); } - _config->actors.pfVectorAdd(&_config->actors,yon_char_new(arr_keys[size_comma-1])); + _config->actors.pfVectorAdd(&_config->actors,yon_char_new(arr_user[size_comma-1])); } else { if (strstr(str_key, "AUTO")) { @@ -143,11 +148,9 @@ void load_pars_values(config_u_g_p* _config, char* str_value, int index) { if (index_split == 3 || index_split == 5) { philos_set_pow_size_memory(yon_char_new(arr_values[0]), &_config->soft_restriction_size_pow, array_size_pow); philos_set_size_memory_integer(yon_char_new(arr_values[0]), &_config->soft_restriction_size); - philos_set_pow_size_memory(yon_char_new(arr_values[1]), &_config->soft_restriction_file_pow, array_size_pow); philos_set_size_memory_integer(yon_char_new(arr_values[1]), &_config->soft_restriction_file); philos_set_pow_size_memory(yon_char_new(arr_values[2]), &_config->severe_limitation_size_pow, array_size_pow); philos_set_size_memory_integer(yon_char_new(arr_values[2]), &_config->severe_limitation_size); - philos_set_pow_size_memory(yon_char_new(arr_values[3]), &_config->severe_limitation_file_pow, array_size_pow); philos_set_size_memory_integer(yon_char_new(arr_values[3]), &_config->severe_limitation_file); if (index_split == 5) { _config->deferring_size = atoll(arr_values[4]);