daxi20/smartdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dns_conf: restore default config file path variable

Browse Source
This commit is contained in:
Nick Peng
2023-03-08 23:27:12 +08:00
parent 905a43ac67
commit 9a43f0859d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/conf.c
View File

@@ -321,6 +321,7 @@ static int load_conf_file(const char *file, struct config_item *items, conf_erro
int line_no = 0; int line_no = 0;
int line_len = 0; int line_len = 0;
int read_len = 0; int read_len = 0;
const char *last_file = NULL;
if (handler == NULL) { if (handler == NULL) {
handler = load_conf_printf; handler = load_conf_printf;
@@ -374,6 +375,7 @@ static int load_conf_file(const char *file, struct config_item *items, conf_erro
conf_getopt_reset(); conf_getopt_reset();
/* call item function */ /* call item function */
last_file = current_conf_file;
current_conf_file = file; current_conf_file = file;
call_ret = items[i].item_func(items[i].item, items[i].data, argc, argv); call_ret = items[i].item_func(items[i].item, items[i].data, argc, argv);
ret = handler(file, line_no, call_ret); ret = handler(file, line_no, call_ret);
@@ -383,6 +385,9 @@ static int load_conf_file(const char *file, struct config_item *items, conf_erro
} }
conf_getopt_reset(); conf_getopt_reset();
if (last_file) {
current_conf_file = last_file;
}
break; break;
} }