Skip to content
Snippets Groups Projects
Commit 5c2982f7 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

And use iniReadSString() where appropriate in SyncTERM.

parent c69a4f98
Branches
No related tags found
No related merge requests found
Pipeline #5874 passed
...@@ -116,11 +116,11 @@ read_font_files(int *count) ...@@ -116,11 +116,11 @@ read_font_files(int *count)
ret = tmp; ret = tmp;
ret[*count].name = NULL; ret[*count].name = NULL;
ret[*count - 1].name = strdup(fontid + 5); ret[*count - 1].name = strdup(fontid + 5);
if ((ret[*count - 1].path8x8 = iniReadString(inifile, fontid, "Path8x8", NULL, fontpath)) != NULL) if ((ret[*count - 1].path8x8 = iniReadSString(inifile, fontid, "Path8x8", NULL, fontpath, sizeof(fontpath))) != NULL)
ret[*count - 1].path8x8 = strdup(fontpath); ret[*count - 1].path8x8 = strdup(fontpath);
if ((ret[*count - 1].path8x14 = iniReadString(inifile, fontid, "Path8x14", NULL, fontpath)) != NULL) if ((ret[*count - 1].path8x14 = iniReadSString(inifile, fontid, "Path8x14", NULL, fontpath, sizeof(fontpath))) != NULL)
ret[*count - 1].path8x14 = strdup(fontpath); ret[*count - 1].path8x14 = strdup(fontpath);
if ((ret[*count - 1].path8x16 = iniReadString(inifile, fontid, "Path8x16", NULL, fontpath)) != NULL) if ((ret[*count - 1].path8x16 = iniReadSString(inifile, fontid, "Path8x16", NULL, fontpath, sizeof(fontpath))) != NULL)
ret[*count - 1].path8x16 = strdup(fontpath); ret[*count - 1].path8x16 = strdup(fontpath);
free(fontid); free(fontid);
} }
......
...@@ -1345,7 +1345,7 @@ load_settings(struct syncterm_settings *set) ...@@ -1345,7 +1345,7 @@ load_settings(struct syncterm_settings *set)
set->custom_aw = iniReadInteger(inifile, "SyncTERM", "CustomAspectWidth", 4); set->custom_aw = iniReadInteger(inifile, "SyncTERM", "CustomAspectWidth", 4);
set->custom_ah = iniReadInteger(inifile, "SyncTERM", "CustomAspectHeight", 3); set->custom_ah = iniReadInteger(inifile, "SyncTERM", "CustomAspectHeight", 3);
get_syncterm_filename(set->list_path, sizeof(set->list_path), SYNCTERM_PATH_LIST, false); get_syncterm_filename(set->list_path, sizeof(set->list_path), SYNCTERM_PATH_LIST, false);
iniReadString(inifile, "SyncTERM", "ListPath", set->list_path, set->list_path); iniReadSString(inifile, "SyncTERM", "ListPath", set->list_path, set->list_path, sizeof(set->list_path));
set->scaling_factor = iniReadFloat(inifile, "SyncTERM", "ScalingFactor", 0); set->scaling_factor = iniReadFloat(inifile, "SyncTERM", "ScalingFactor", 0);
set->blocky = iniReadBool(inifile, "SyncTERM", "BlockyScaling", true); set->blocky = iniReadBool(inifile, "SyncTERM", "BlockyScaling", true);
set->extern_scale = iniReadBool(inifile, "SyncTERM", "ExternalScaling", false); set->extern_scale = iniReadBool(inifile, "SyncTERM", "ExternalScaling", false);
...@@ -1354,9 +1354,9 @@ load_settings(struct syncterm_settings *set) ...@@ -1354,9 +1354,9 @@ load_settings(struct syncterm_settings *set)
set->left_just = iniReadBool(inifile, "SyncTERM", "LeftJustify", false); set->left_just = iniReadBool(inifile, "SyncTERM", "LeftJustify", false);
/* Modem settings */ /* Modem settings */
iniReadString(inifile, "SyncTERM", "ModemInit", "AT&F&C1&D2", set->mdm.init_string); iniReadSString(inifile, "SyncTERM", "ModemInit", "AT&F&C1&D2", set->mdm.init_string, sizeof(set->mdm.init_string));
iniReadString(inifile, "SyncTERM", "ModemDial", "ATDT", set->mdm.dial_string); iniReadSString(inifile, "SyncTERM", "ModemDial", "ATDT", set->mdm.dial_string, sizeof(set->mdm.dial_string));
iniReadString(inifile, "SyncTERM", "ModemDevice", DEFAULT_MODEM_DEV, set->mdm.device_name); iniReadSString(inifile, "SyncTERM", "ModemDevice", DEFAULT_MODEM_DEV, set->mdm.device_name, sizeof(set->mdm.device_name));
set->mdm.com_rate = iniReadLongInt(inifile, "SyncTERM", "ModemComRate", 0); set->mdm.com_rate = iniReadLongInt(inifile, "SyncTERM", "ModemComRate", 0);
/* Sort order */ /* Sort order */
...@@ -1368,7 +1368,7 @@ load_settings(struct syncterm_settings *set) ...@@ -1368,7 +1368,7 @@ load_settings(struct syncterm_settings *set)
strListFree(&sortby); strListFree(&sortby);
/* Shell TERM settings */ /* Shell TERM settings */
iniReadString(inifile, "SyncTERM", "TERM", "syncterm", set->TERM); iniReadSString(inifile, "SyncTERM", "TERM", "syncterm", set->TERM, sizeof(set->TERM));
if (inifile) if (inifile)
fclose(inifile); fclose(inifile);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment