Исправил ошибку с группами

pull/4/head
Igor Belitskiy 2 years ago
parent 39b69f8fa0
commit a716abbe47

@ -244,14 +244,10 @@ void main_update_information() {
} }
else if (menu_id == 1) { else if (menu_id == 1) {
fill_cmb_2 = yon_config_load(CMD_GET_GROUP, &size);
philos_array_string_remove_char(&fill_cmb_2, "\n", size);
}
else if (menu_id == 2) {
fill_cmb_2 = philos_pars_terminal_systemd_cgls(CMD_GET_SLICE_SERVICE, ".service", &size); fill_cmb_2 = philos_pars_terminal_systemd_cgls(CMD_GET_SLICE_SERVICE, ".service", &size);
philos_array_string_remove_char(&fill_cmb_2, "\n", size); philos_array_string_remove_char(&fill_cmb_2, "\n", size);
} }
else if (menu_id == 3) { else if (menu_id == 2) {
fill_cmb_2 = philos_pars_terminal_systemd_cgls(CMD_GET_SLICE_SERVICE, ".slice", &size); fill_cmb_2 = philos_pars_terminal_systemd_cgls(CMD_GET_SLICE_SERVICE, ".slice", &size);
philos_array_string_remove_char(&fill_cmb_2, "\n", size); philos_array_string_remove_char(&fill_cmb_2, "\n", size);
} }
@ -421,15 +417,6 @@ void str_split_key(char* source_value, int index) {
main_config.type_quota = yon_char_parsed_append(main_config.type_quota, &index, STR_USER); main_config.type_quota = yon_char_parsed_append(main_config.type_quota, &index, STR_USER);
index--; index--;
} }
// Группа
else {
main_config.type_quota_size = philos_int_append(main_config.type_quota_size, &index, 1);
index--;
main_config.quota_volume = yon_char_parsed_append(main_config.quota_volume, &index, value);
index--;
main_config.type_quota = yon_char_parsed_append(main_config.type_quota, &index, STR_GROUP);
index--;
}
} }
} }
@ -1280,8 +1267,6 @@ int main(int argc, char *argv[]){
main_config.lock_save_local=1; main_config.lock_save_local=1;
} }
gtk_init(&argc,&argv); gtk_init(&argc,&argv);
add_get_cmd_group(CMD_GET_GROUP);
add_get_systemd_cgls(CMD_GET_SLICE_SERVICE); add_get_systemd_cgls(CMD_GET_SLICE_SERVICE);
gtk_init(&argc,&argv); gtk_init(&argc,&argv);
device_disk_parsed(); device_disk_parsed();

@ -42,7 +42,6 @@
#define CMD_REMOVE_SYSTEM "ubconfig --target system remove security " #define CMD_REMOVE_SYSTEM "ubconfig --target system remove security "
#define CMD_GET_SLICE_SERVICE "systemd-cgls --no-page" #define CMD_GET_SLICE_SERVICE "systemd-cgls --no-page"
#define CMD_GET_GROUP "cut -d: -f1 /etc/group"
typedef char *string; typedef char *string;
string version_application; string version_application;

@ -126,10 +126,6 @@ void add_event(temp_set_window *widgets) {
g_signal_connect(G_OBJECT(widgets->chbTempWrite), "toggled", G_CALLBACK(event_check_io_device), NULL); g_signal_connect(G_OBJECT(widgets->chbTempWrite), "toggled", G_CALLBACK(event_check_io_device), NULL);
} }
void add_get_cmd_group(char* cmd_get_group) {
CMD_GET_GROUP = cmd_get_group;
}
void add_get_systemd_cgls(char* cmd_systemd_cgls) { void add_get_systemd_cgls(char* cmd_systemd_cgls) {
CMD_GET_SLICE_SERVICE = cmd_systemd_cgls; CMD_GET_SLICE_SERVICE = cmd_systemd_cgls;
} }
@ -283,14 +279,10 @@ void add_update_combo_box() {
} }
else if (menu_id == 1) { else if (menu_id == 1) {
fill_cmb_2 = yon_config_load(CMD_GET_GROUP, &size);
philos_array_string_remove_char(&fill_cmb_2, "\n", size);
}
else if (menu_id == 2) {
fill_cmb_2 = philos_pars_terminal_systemd_cgls(CMD_GET_SLICE_SERVICE, ".service", &size); fill_cmb_2 = philos_pars_terminal_systemd_cgls(CMD_GET_SLICE_SERVICE, ".service", &size);
philos_array_string_remove_char(&fill_cmb_2, "\n", size); philos_array_string_remove_char(&fill_cmb_2, "\n", size);
} }
else if (menu_id == 3) { else if (menu_id == 2) {
fill_cmb_2 = philos_pars_terminal_systemd_cgls(CMD_GET_SLICE_SERVICE, ".slice", &size); fill_cmb_2 = philos_pars_terminal_systemd_cgls(CMD_GET_SLICE_SERVICE, ".slice", &size);
philos_array_string_remove_char(&fill_cmb_2, "\n", size); philos_array_string_remove_char(&fill_cmb_2, "\n", size);
} }

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 --> <!-- Generated with glade 3.40.0 -->
<interface> <interface>
<requires lib="gtk+" version="3.24"/> <requires lib="gtk+" version="3.24"/>
<requires lib="vte-2.91" version="0.68"/> <requires lib="vte-2.91" version="0.68"/>
@ -256,7 +256,6 @@
<property name="active-id">0</property> <property name="active-id">0</property>
<items> <items>
<item translatable="yes">User</item> <item translatable="yes">User</item>
<item translatable="yes">Group</item>
<item translatable="yes">Process</item> <item translatable="yes">Process</item>
<item translatable="yes">Slice</item> <item translatable="yes">Slice</item>
</items> </items>
@ -3538,7 +3537,6 @@ limit
<property name="active-id">0</property> <property name="active-id">0</property>
<items> <items>
<item translatable="yes">User</item> <item translatable="yes">User</item>
<item translatable="yes">Group</item>
<item translatable="yes">Process</item> <item translatable="yes">Process</item>
<item translatable="yes">Slice</item> <item translatable="yes">Slice</item>
</items> </items>

Loading…
Cancel
Save