INSTALL changed for V1.0.88

HISTORY

@@ -1,4 +1,9 @@
 
+Version 1.88  2026-09-04
+ * local_host_ip_addrs_to_string: fix buffer overflow
+ * shared_func.[hc]: add function parse_timestamp
+ * ini_file_reader.[hc]: add function iniGetTimestampValueEx
+
 Version 1.87  2026-07-10
  * ini_file_readers can refer env variable such as %{env::FASTDFS_IPADDR}
 

INSTALL

@@ -21,5 +21,5 @@ Debian, Ubuntu etc.:
 # the command lines as:
 
    git clone https://github.com/happyfish100/libfastcommon.git
-   cd libfastcommon; git checkout V1.0.86
+   cd libfastcommon; git checkout V1.0.88
    ./make.sh clean && ./make.sh && sudo ./make.sh install

doc/ini_file_reader-Chinese.md

@@ -10,28 +10,31 @@ libfastcommon是在github开源的⼀个C函数库。它提供了ini⽂件解析
 ## ini_file_reader的主要特点：
 
 ### 1、⽀持section
+例如:
 ```
-    例如: [workers]
+[workers]
+threads = 4
+# 其他配置项
 ```
 
 ### 2、⼀个配置项可以出现多次
+通过iniGetValues或者iniGetValuesEx获取。例如：
 ```
-  通过iniGetValues或者iniGetValuesEx获取。例如：
-    tracker_server = ip1
-    tracker_server = ip2
+tracker_server = 172.16.168.10
+tracker_server = 172.16.168.11
 ```
 
 ### 3、 #include指令包含其他配置⽂件
+可以包含本地配置⽂件，也可以包含URL（目前仅⽀持HTTP）。例如：
 ```
-    可以包含本地⽂件，也可以包含URL（目前仅⽀持HTTP）。例如：
-    #include http.conf
+#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，
@@ -41,8 +44,8 @@ libfastcommon是在github开源的⼀个C函数库。它提供了ini⽂件解析
        可以引用环境变量，格式为 %{env::VARIABLE}，例如 %{env::FASTDFS_IPADDR}
 ```
 
-```
 配置⽰例：
+```
 #@function SHELL_EXEC
   host = hostname
 
@@ -58,12 +61,14 @@ libfastcommon是在github开源的⼀个C函数库。它提供了ini⽂件解析
 
 ### 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.88
 Release: 1%{?dist}
 Summary: c common functions library extracted from my open source projects FastDFS
 License: LGPL

src/fast_buffer.c

@@ -180,6 +180,7 @@ 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;
@@ -213,7 +214,7 @@ int fast_buffer_append_file(FastBuffer *buffer, const char *filename)
     }
 
     if ((result=getFileContentEx(filename, buffer->data + buffer->length,
-                    0, &file_size)) != 0)
+                    offset, &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  88
 
 #define FC_VERSION_INT  FC_VERSION_TO_INT(FC_MAJOR_VERSION, \
         FC_MINOR_VERSION, FC_PATCH_VERSION)

src/ini_file_reader.c

@@ -375,20 +375,19 @@ static char *doReplaceVars(IniContext *pContext, const char *param,
             } else {
                 value = NULL;
             }
+
             if (value != NULL) {
                 len = strlen(value);
-            }
-            else {
+            } else {
                 logWarning("file: "__FILE__", line: %d, "
-                        "name: %s NOT found, keep the origin",
+                        "variable \"%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++;
             }
@@ -3532,3 +3531,26 @@ int iniGetPercentValueEx(IniFullContext *ini_ctx,
 
     return 0;
 }
+
+int64_t iniGetTimestampValueEx(const char *szSectionName,
+        const char *szItemName, IniContext *pContext,
+        const int64_t nDefaultValue, const int nDefaultUnitTS,
+        const bool bRetryGlobal)
+{
+    char *pValue;
+    int64_t nValue;
+
+    pValue = iniGetStrValueEx(szSectionName,
+            szItemName, pContext, bRetryGlobal);
+    if (pValue == NULL)
+    {
+        return nDefaultValue;
+    }
+
+    if (parse_timestamp(pValue, nDefaultUnitTS, &nValue) != 0)
+    {
+        return nDefaultValue;
+    }
+
+    return nValue;
+}

src/ini_file_reader.h

@@ -140,6 +140,10 @@ extern "C" {
 #define iniGetPercentValue(ini_ctx, item_name, item_value, default_value) \
     iniGetPercentValueEx(ini_ctx, item_name, item_value, default_value, false)
 
+#define iniGetTimestampValue(szSectionName, szItemName, pContext, nDefaultValue) \
+    iniGetTimestampValueEx(szSectionName, szItemName, \
+            pContext, nDefaultValue, 1, false)
+
 #define iniGetByteValue(szSectionName, szItemName, pContext, nDefaultValue) \
     iniGetByteValueEx(szSectionName, szItemName, \
             pContext, nDefaultValue, 1, false)
@@ -424,6 +428,22 @@ int64_t iniGetByteCorrectValueEx(IniFullContext *pIniContext,
         const int nDefaultUnitBytes, const int64_t nMinValue,
         const int64_t nMaxValue, const bool bRetryGlobal);
 
+/** get item timestamp value (64 bits integer)
+ *  parameters:
+ *           szSectionName: the section name, NULL or empty string for
+ *                          global section
+ *           szItemName: the item name
+ *           pContext:   the ini context
+ *           nDefaultValue: the default value
+ *           nDefaultUnitBytes: the default timestamp unit, such as 1 for second, 86400 for day
+ *           bRetryGlobal: if fetch from global section when the item not exist
+ *  return: int64 value, return nDefaultValue when the item not exist
+*/
+int64_t iniGetTimestampValueEx(const char *szSectionName,
+        const char *szItemName, IniContext *pContext,
+        const int64_t nDefaultValue, const int nDefaultUnitTS,
+        const bool bRetryGlobal);
+
 /** get item boolean value
  *  parameters:
  *           szSectionName: the section name, NULL or empty string for

src/local_ip_func.c

@@ -70,12 +70,21 @@ const char *local_host_ip_addrs_to_string(char *buff, const int size)
 
 	len = snprintf(buff, size, "local_host_ip_count: %d,",
             g_local_host_ip_count);
+    if (len >= size)
+    {
+        return buff;
+    }
+
 	pEnd = g_local_host_ip_addrs +
 		IP_ADDRESS_SIZE * g_local_host_ip_count;
 	for (p=g_local_host_ip_addrs; p<pEnd; p+=IP_ADDRESS_SIZE)
-	{
-		len += snprintf(buff + len, size - len, "  %s", p);
-	}
+    {
+        len += snprintf(buff + len, size - len, "  %s", p);
+        if (len >= size)
+        {
+            break;
+        }
+    }
 
     return buff;
 }

src/process_ctrl.c

@@ -24,6 +24,7 @@
 
 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;
@@ -33,7 +34,7 @@ int get_pid_from_file(const char *pidFilename, pid_t *pid)
   }
 
   file_size = sizeof(buff);
-  if ((result=getFileContentEx(pidFilename, buff, 0, &file_size)) != 0) {
+  if ((result=getFileContentEx(pidFilename, buff, offset, &file_size)) != 0) {
     return result;
   }
 
@@ -183,12 +184,13 @@ 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, 0, &cmdsz)) != 0) {
+    if ((*result=getFileContentEx(cmdfile, buff, offset, &cmdsz)) != 0) {
         fprintf(stderr, "read file %s fail, errno: %d, error info: %s\n",
                 cmdfile, *result, strerror(*result));
         return NULL;

src/shared_func.c

@@ -2484,6 +2484,88 @@ int parse_bytes(const char *pStr, const int default_unit_bytes, int64_t *bytes)
     return result;
 }
 
+int parse_timestamp(const char *str, const int default_unit_secs, int64_t *seconds)
+{
+	char *pReservedEnd;
+    int result;
+
+	pReservedEnd = NULL;
+	*seconds = strtoll(str, &pReservedEnd, 10);
+	if (*seconds < 0)
+    {
+        logError("file: "__FILE__", line: %d, "
+                "timestamp: %"PRId64" < 0, input string: %s",
+                __LINE__, *seconds, str);
+        return EINVAL;
+    }
+
+	if (pReservedEnd == NULL || *pReservedEnd == '\0')
+	{
+		*seconds *= default_unit_secs;
+        return 0;
+	}
+
+	if (*pReservedEnd == ' ' || *pReservedEnd == '\t')
+    {
+        do {
+            ++pReservedEnd;
+        } while (*pReservedEnd == ' ' || *pReservedEnd == '\t');
+
+        if (*pReservedEnd == '\0')
+        {
+            *seconds *= default_unit_secs;
+            return 0;
+        }
+    }
+
+	if (*(pReservedEnd + 1) != '\0')
+    {
+        logError("file: "__FILE__", line: %d, "
+                "unkown timestamp unit: \"%s\", input string: \"%s\"",
+                __LINE__, pReservedEnd, str);
+        return EINVAL;
+    }
+
+    switch (*pReservedEnd)
+    {
+        case 's':
+            result = 0;
+            break;
+        case 'm':
+            *seconds *= 60;
+            result = 0;
+            break;
+        case 'h':
+            *seconds *= 3600;
+            result = 0;
+            break;
+        case 'd':
+            *seconds *= 86400;
+            result = 0;
+            break;
+        case 'W':
+            *seconds *= 7 * 86400;
+            result = 0;
+            break;
+        case 'M':
+            *seconds *= 30 * 86400;
+            result = 0;
+            break;
+        case 'Y':
+            *seconds *= 365 * 86400;
+            result = 0;
+            break;
+        default:
+            result = EINVAL;
+            logError("file: "__FILE__", line: %d, "
+                    "unkown timestamp unit: \"%s\", input string: \"%s\"",
+                    __LINE__, pReservedEnd, str);
+            break;
+    }
+
+    return result;
+}
+
 int set_rand_seed()
 {
     time_t ts;
@@ -3283,6 +3365,7 @@ static int format_bytes_string(const int64_t input_bytes,
         }
         p = buff + fc_itoa(n, buff);
     }
+
     return p - buff;
 }
 
@@ -4090,12 +4173,13 @@ 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, 0, &read_bytes)) != 0) {
+    if ((result=getFileContentEx(filename, buff, offset, &read_bytes)) != 0) {
         FC_SET_STRING_EMPTY(*line, buff);
         return result;
     }
@@ -4121,6 +4205,7 @@ 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;
@@ -4134,7 +4219,7 @@ int fc_get_first_lines(const char *filename, char *buff,
     }
 
     read_bytes = buff_size - 1;
-    if ((result=getFileContentEx(filename, buff, 0, &read_bytes)) != 0) {
+    if ((result=getFileContentEx(filename, buff, offset, &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
@@ -979,12 +979,22 @@ int fc_compare_int64_ptr(const int64_t *n1, const int64_t *n2);
 /** parse bytes
  *  parameters:
  *  	pStr: the string to parse
- *  	default_unit_bytes: default unit if not specified the unit like MB etc.
+ *  	default_unit_bytes: default unit if not specified, the unit like MB etc.
  *  	bytes: store the parsed bytes
  *  return: error no , 0 success, != 0 fail
 */
 int parse_bytes(const char *pStr, const int default_unit_bytes, int64_t *bytes);
 
+/** parse timestamp
+ *  parameters:
+ *  	str: the string to parse
+ *  	default_unit_secs: default unit if not specified
+ *  	seconds: store the parsed seconds
+ *  return: error no , 0 success, != 0 fail
+*/
+int parse_timestamp(const char *str, const int default_unit_secs, int64_t *seconds);
+
+
 /** set rand seed
  *  return: error no , 0 success, != 0 fail
 */

src/system_info.c

@@ -118,12 +118,13 @@ 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, 0, &bytes) == 0)
+    if (getFileContentEx("/proc/uptime", buff, offset, &bytes) == 0)
     {
         double uptime;
         double btime;
@@ -621,6 +622,7 @@ 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];
@@ -679,7 +681,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, 0, &bytes) != 0)
+        if (getFileContentEx(filename, buff, offset, &bytes) != 0)
         {
             continue;
         }