Github
/
FTL
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1669 from pi-hole/fix/empty_conf_array_elems 

Skip empty elements in config arrays both when reading and writing
This commit is contained in:
DL6ER 2023-10-16 21:06:22 +02:00 committed by GitHub
parent 0823207657 ae36ddc686
commit 3167d90b52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/config/toml_helper.c
View File

@ -389,12 +389,18 @@ void writeTOMLvalue(FILE * fp, const int indent, const enum conf_type t, union c
fputc(' ', fp);
for(unsigned int i = 0; i < elems; i++)
{
// Get the element
cJSON *item = cJSON_GetArrayItem(v->json, i);
// Skip empty elements
if(strlen(item->valuestring) == 0)
continue;
// Add intendation (if we are indenting)
if(indent > -1)
indentTOML(fp, indent + 1);
// Get and print the element
cJSON *item = cJSON_GetArrayItem(v->json, i);
// Print the element
printTOMLstring(fp, item->valuestring, toml);
// Add a comma if there is one more element to come
@ -683,10 +689,14 @@ void readTOMLvalue(struct conf_item *conf_item, const char* key, toml_table_t *t
log_debug(DEBUG_CONFIG, "%s is an invalid array (found at index %u)", conf_item->k, i);
break;
}
// Add string to our JSON array
cJSON *item = cJSON_CreateString(d.u.s);
// Only import non-empty entries
if(strlen(d.u.s) > 0)
{
// Add string to our JSON array
cJSON *item = cJSON_CreateString(d.u.s);
cJSON_AddItemToArray(conf_item->v.json, item);
}
free(d.u.s);
cJSON_AddItemToArray(conf_item->v.json, item);
}
}
else