pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ini_file_readers can refer env variable as %{env::XXX}

pull/56/merge
YuQing 2026-07-10 19:45:08 +08:00
parent 3cca66ac15
commit 4f87de79ec
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,4 +1,7 @@
Version 1.87 2026-07-10
* ini_file_readers can refer env variable such as %{env::FASTDFS_IPADDR}
Version 1.86 2026-06-26 Version 1.86 2026-06-26
* add function fc_parse_version * add function fc_parse_version
* change return type of format_ip_address and format_ip_port * change return type of format_ip_address and format_ip_port

3
doc/ini_file_reader-Chinese.md
View File

@ -37,7 +37,8 @@ libfastcommon是在github开源的⼀个C函数库。它提供了ini⽂件解析
[index]表示获取指定序号的本机IP，0表示获取第一个IP，-1表示获取最后一个IP， [index]表示获取指定序号的本机IP，0表示获取第一个IP，-1表示获取最后一个IP，
例如：[0]、inner[-1], outer[1]等等 例如：[0]、inner[-1], outer[1]等等
II. SHELL_EXEC 获取命令⾏输出，执行的command为配置项 II. SHELL_EXEC 获取命令⾏输出，执行的command为配置项
III. REPLACE_VARS 替换配置项中%{VARIABLE}格式的变量，变量由#@set指令设置 III. REPLACE_VARS 替换配置项中%{VARIABLE}格式的变量，普通变量由#@set指令设置。
可以引用环境变量，格式为 %{env::VARIABLE}，例如 %{env::FASTDFS_IPADDR}
``` ```
``` ```

30
src/ini_file_reader.c
View File

@ -299,6 +299,11 @@ static char *doReplaceVars(IniContext *pContext, const char *param,
{ {
#define VARIABLE_TAG_MIN_LENGTH 4 //%{v} #define VARIABLE_TAG_MIN_LENGTH 4 //%{v}
#define ENV_VAR_NAME_STARTWITH_STR "env::"
#define ENV_VAR_NAME_STARTWITH_LEN (sizeof(ENV_VAR_NAME_STARTWITH_STR) - 1)
#define ENV_VARIABLE_MARK_STR "%{"ENV_VAR_NAME_STARTWITH_STR
SetDirectiveVars *set; SetDirectiveVars *set;
const char *p; const char *p;
const char *e; const char *e;
@ -319,11 +324,13 @@ static char *doReplaceVars(IniContext *pContext, const char *param,
set = iniGetVars(pContext); set = iniGetVars(pContext);
if (set == NULL || set->vars == NULL) { if (set == NULL || set->vars == NULL) {
logWarning("file: "__FILE__", line: %d, " if (strstr(param, ENV_VARIABLE_MARK_STR) == NULL) {
"NO set directives before, set value to %s", logWarning("file: "__FILE__", line: %d, "
__LINE__, param); "NO set directives before, set value to %s",
fc_strlcpy(output, param, FAST_INI_ITEM_VALUE_SIZE); __LINE__, param);
return output; fc_strlcpy(output, param, FAST_INI_ITEM_VALUE_SIZE);
return output;
}
} }
pEnd = param + strlen(param); pEnd = param + strlen(param);
@ -354,8 +361,17 @@ static char *doReplaceVars(IniContext *pContext, const char *param,
*(name + name_len) = '\0'; *(name + name_len) = '\0';
fc_trim(name); fc_trim(name);
name_len = strlen(name); name_len = strlen(name);
if (name_len > 0) { if (name_len > ENV_VAR_NAME_STARTWITH_LEN &&
value = (char *)fc_hash_find(set->vars, name, name_len); memcmp(name, ENV_VAR_NAME_STARTWITH_STR,
ENV_VAR_NAME_STARTWITH_LEN) == 0)
{
value = getenv(name + ENV_VAR_NAME_STARTWITH_LEN);
} else if (name_len > 0) {
if (set != NULL && set->vars != NULL) {
value = (char *)fc_hash_find(set->vars, name, name_len);
} else {
value = NULL;
}
} else { } else {
value = NULL; value = NULL;
} }