Merge a16fde8070 into 3cca66ac15

HISTORY

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

README

@@ -1,3 +1,11 @@
+Copyright (C) 2010 Happy Fish / YuQing
+
+libfastcommon may be copied only under the terms of the Less GNU General
+Public License(LGPL).
+Please visit the libfastcommon Home Page for more detail.
+English language: https://github.com/happyfish100/libfastcommon
+Chinese language: http://www.fastken.com/
+
 
 c common functions library extracted from my open source projects FastDFS and 
 FastDHT. this library is very simple and stable.
@@ -6,29 +14,20 @@ some functions are wrappered into php extension, such as fastcommon_gethostaddrs
      fastcommon_id_generator_xxx, fastcommon_get_ifconfigs, fastcommon_get_sysinfo etc.
 
 C function including:
-
   logger: [logger.h] asynchronously sync to disk for high performance, thread safe,
           log rotate, auto delete old log files, compress log file etc.
 
-  ini file reader: [ini_file_reader.h] support sections marked by [SectionName],
+  ini file reader: [ini_file_reader.h] support sections marked by [SectionName]
           support a config item ocurs multiple times for multiple values, such as:
-```
              tracker_server = ip1
              tracker_server = ip2
-```
-
-```
           #include directive to include other ini file
           #@function directive for annotation
           #@set directive to set variables for condition of #@if directive
           support control statements for special purpose as:
               #@if, #@else, #@endif, #@for, #@endfor
-```
 
-  for more detail, please see [ini file reader guide](doc/ini_file_reader-Chinese.md)
+  id generator: [id_generator.h] generate unique 64 bits integer ID for multi processes
-
-  id generator: [id_generator.h] generate unique 64 bits integer ID for multi processes.
-              for more detail, please see [id generator description](doc/id_generator-Chinese.md)
 
   string operation: [shared_func.h] uppercase, lowercase, trim etc.
 
@@ -73,5 +72,5 @@ C function including:
 
   char convert: [char_converter.h] and [char_convert_loader.h] for fast char convert
 
-  more detail info please see the c header files.
+detail info please see the c header files.
 

doc/ini_file_reader-Chinese.md

@@ -10,42 +10,38 @@ libfastcommon是在github开源的⼀个C函数库。它提供了ini⽂件解析
 ## ini_file_reader的主要特点：
 
 ### 1、⽀持section
-例如: 
 ```
-[workers]
+    例如: [workers]
-threads = 4
-# 其他配置项
 ```
 
 ### 2、⼀个配置项可以出现多次
-通过iniGetValues或者iniGetValuesEx获取。例如：
 ```
-tracker_server = 172.16.168.10
+  通过iniGetValues或者iniGetValuesEx获取。例如：
-tracker_server = 172.16.168.11
+    tracker_server = ip1
+    tracker_server = ip2
 ```
 
 ### 3、 #include指令包含其他配置⽂件
-可以包含本地配置⽂件，也可以包含URL（目前仅⽀持HTTP）。例如：
 ```
+    可以包含本地⽂件，也可以包含URL（目前仅⽀持HTTP）。例如：
     #include http.conf
 ```
 
 ### 4、 #@function指令⽀持标注
-配置项的取值为扩展（外部）动态库的返回值。
-⽀持三个内置标注：
 
 ```
+  配置项的取值为扩展（外部）动态库的返回值
+  V1.39⽀持三个内置标注：
     I. LOCAL_IP_GET [inner | private | outer | public] 获取本机IP地址
       inner或private表示获取内网IP，outer或public表示获取外网IP
       [index]表示获取指定序号的本机IP，0表示获取第一个IP，-1表示获取最后一个IP，
       例如：[0]、inner[-1], outer[1]等等
     II. SHELL_EXEC 获取命令⾏输出，执行的command为配置项
-    III. REPLACE_VARS  替换配置项中%{VARIABLE}格式的变量，普通变量由#@set指令设置。
+    III. REPLACE_VARS  替换配置项中%{VARIABLE}格式的变量，变量由#@set指令设置
-       可以引用环境变量，格式为 %{env::VARIABLE}，例如 %{env::FASTDFS_IPADDR}
 ```
 
-配置⽰例：
 ```
+配置⽰例：
 #@function SHELL_EXEC
   host = hostname
 
@@ -61,14 +57,12 @@ tracker_server = 172.16.168.11
 
 ### 5、 #@add_annotation 扩展#@function标签
 
+```
 格式：
-```
 #@add_annotation <function标签> <动态库文件名> [参数1, 参数2, ...]
-```
 参数个数0到3个。
 
 使用libshmcache扩展标签CONFIG_GET示例：
-```
 #@add_annotation CONFIG_GET /usr/lib/libshmcache.so /etc/libshmcache.conf
 
 #@function CONFIG_GET

libfastcommon.spec

@@ -3,7 +3,7 @@
 %define CommitVersion %(echo $COMMIT_VERSION)
 
 Name: libfastcommon
-Version: 1.0.87
+Version: 1.0.86
 Release: 1%{?dist}
 Summary: c common functions library extracted from my open source projects FastDFS
 License: LGPL

src/fast_buffer.c

@@ -180,7 +180,6 @@ int fast_buffer_append_binary(FastBuffer *buffer,
 
 int fast_buffer_append_file(FastBuffer *buffer, const char *filename)
 {
-    const int64_t offset = 0;
     struct stat st;
     int result;
     int64_t file_size;
@@ -214,7 +213,7 @@ int fast_buffer_append_file(FastBuffer *buffer, const char *filename)
     }
 
     if ((result=getFileContentEx(filename, buffer->data + buffer->length,
-                    offset, &file_size)) != 0)
+                    0, &file_size)) != 0)
     {
         return result;
     }

src/fc_version.h

@@ -22,7 +22,7 @@
 
 #define FC_MAJOR_VERSION   1
 #define FC_MINOR_VERSION   0
-#define FC_PATCH_VERSION  87
+#define FC_PATCH_VERSION  86
 
 #define FC_VERSION_INT  FC_VERSION_TO_INT(FC_MAJOR_VERSION, \
         FC_MINOR_VERSION, FC_PATCH_VERSION)

src/ini_file_reader.c

@@ -299,11 +299,6 @@ static char *doReplaceVars(IniContext *pContext, const char *param,
 {
 #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;
     const char *p;
     const char *e;
@@ -324,14 +319,12 @@ static char *doReplaceVars(IniContext *pContext, const char *param,
 
     set = iniGetVars(pContext);
     if (set == NULL || set->vars == NULL) {
-        if (strstr(param, ENV_VARIABLE_MARK_STR) == NULL) {
         logWarning("file: "__FILE__", line: %d, "
                 "NO set directives before, set value to %s",
                 __LINE__, param);
         fc_strlcpy(output, param, FAST_INI_ITEM_VALUE_SIZE);
         return output;
     }
-    }
 
     pEnd = param + strlen(param);
     pLoopEnd = pEnd - (VARIABLE_TAG_MIN_LENGTH - 1);
@@ -361,33 +354,25 @@ static char *doReplaceVars(IniContext *pContext, const char *param,
             *(name + name_len) = '\0';
             fc_trim(name);
             name_len = strlen(name);
-            if (name_len > ENV_VAR_NAME_STARTWITH_LEN &&
+            if (name_len > 0) {
-                    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 {
-                value = NULL;
-            }
-
             if (value != NULL) {
                 len = strlen(value);
-            } else {
+            }
+            else {
                 logWarning("file: "__FILE__", line: %d, "
-                        "variable \"%s\" NOT found, keep the origin",
+                        "name: %s NOT found, keep the origin",
                         __LINE__, name);
                 value = start - 2;
                 len = p - value;
             }
             pDest += iniCopyBuffer(pDest, FAST_INI_ITEM_VALUE_SIZE -
                     (pDest - output), value, len);
-        } else {
+        }
+        else {
             if (pDest - output < FAST_INI_ITEM_VALUE_LEN) {
                 *pDest++ = *p++;
             }

src/process_ctrl.c

@@ -24,7 +24,6 @@
 
 int get_pid_from_file(const char *pidFilename, pid_t *pid)
 {
-  const int64_t offset = 0;
   char buff[32];
   int64_t file_size;
   int result;
@@ -34,7 +33,7 @@ int get_pid_from_file(const char *pidFilename, pid_t *pid)
   }
 
   file_size = sizeof(buff);
-  if ((result=getFileContentEx(pidFilename, buff, offset, &file_size)) != 0) {
+  if ((result=getFileContentEx(pidFilename, buff, 0, &file_size)) != 0) {
     return result;
   }
 
@@ -184,13 +183,12 @@ static const char *process_get_exename(const char* program)
 static const char *get_exename_by_pid(const pid_t pid, char *buff,
         const int buff_size, int *result)
 {
-    const int64_t offset = 0;
     char cmdfile[MAX_PATH_SIZE];
     int64_t cmdsz;
 
     cmdsz = buff_size;
     sprintf(cmdfile, "/proc/%d/cmdline", pid);
-    if ((*result=getFileContentEx(cmdfile, buff, offset, &cmdsz)) != 0) {
+    if ((*result=getFileContentEx(cmdfile, buff, 0, &cmdsz)) != 0) {
         fprintf(stderr, "read file %s fail, errno: %d, error info: %s\n",
                 cmdfile, *result, strerror(*result));
         return NULL;

src/shared_func.c

@@ -4090,13 +4090,12 @@ int fc_check_rename_ex(const char *oldpath, const char *newpath,
 int fc_get_first_line(const char *filename, char *buff,
         const int buff_size, string_t *line)
 {
-    const int64_t offset = 0;
     int result;
     int64_t read_bytes;
     char *line_end;
 
     read_bytes = buff_size - 1;
-    if ((result=getFileContentEx(filename, buff, offset, &read_bytes)) != 0) {
+    if ((result=getFileContentEx(filename, buff, 0, &read_bytes)) != 0) {
         FC_SET_STRING_EMPTY(*line, buff);
         return result;
     }
@@ -4122,7 +4121,6 @@ int fc_get_first_line(const char *filename, char *buff,
 int fc_get_first_lines(const char *filename, char *buff,
         const int buff_size, string_t *lines, int *count)
 {
-    const int64_t offset = 0;
     int result;
     int target_count;
     int64_t read_bytes;
@@ -4136,7 +4134,7 @@ int fc_get_first_lines(const char *filename, char *buff,
     }
 
     read_bytes = buff_size - 1;
-    if ((result=getFileContentEx(filename, buff, offset, &read_bytes)) != 0) {
+    if ((result=getFileContentEx(filename, buff, 0, &read_bytes)) != 0) {
         *count = 0;
         FC_SET_STRING_EMPTY(*lines, buff);
         return result;

src/shared_func.h

@@ -878,7 +878,7 @@ int getFileContentEx1(int fd, const char *filename, char *buff,
  *  	size: specify the size to fetch and return the fetched size
  *  return: error no , 0 success, != 0 fail
 */
-int getFileContentEx(const char *filename, char *buff,
+int getFileContentEx(const char *filename, char *buff, \
 		int64_t offset, int64_t *size);
 
 /** get file size

src/system_info.c

@@ -118,13 +118,12 @@ int get_sys_cpu_count()
 int get_boot_time(struct timeval *boot_time)
 {
 #ifdef OS_LINUX
-    const int64_t offset = 0;
     char buff[256];
     int64_t bytes;
     struct sysinfo si;
 
     bytes = sizeof(buff);
-    if (getFileContentEx("/proc/uptime", buff, offset, &bytes) == 0)
+    if (getFileContentEx("/proc/uptime", buff, 0, &bytes) == 0)
     {
         double uptime;
         double btime;
@@ -622,7 +621,6 @@ static void parse_proc_stat(char *buff, const int len,
 
 int get_processes(struct fast_process_info **processes, int *count)
 {
-    const int64_t offset = 0;
     const char *dirname = "/proc";
     char filename[128];
     char buff[4096];
@@ -681,7 +679,7 @@ int get_processes(struct fast_process_info **processes, int *count)
 
         sprintf(filename, "%s/%s/stat", dirname, ent->d_name);
         bytes = sizeof(buff);
-        if (getFileContentEx(filename, buff, offset, &bytes) != 0)
+        if (getFileContentEx(filename, buff, 0, &bytes) != 0)
         {
             continue;
         }