From 7b3f6d620add3799187c17a8d23bc166509da72f Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Fri, 8 Aug 2025 21:52:08 +0800
Subject: [PATCH] use fc_safe_strcpy and fc_combine_two_string

---
 src/sf_binlog_writer.c  |  5 ++---
 src/sf_global.c         | 12 +++---------
 src/sf_ordered_writer.c |  5 ++---
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/sf_binlog_writer.c b/src/sf_binlog_writer.c
index b1de8a8..93f5a56 100644
--- a/src/sf_binlog_writer.c
+++ b/src/sf_binlog_writer.c
@@ -357,8 +357,7 @@ static void *binlog_writer_func(void *arg)
 #ifdef OS_LINUX
     {
         char thread_name[64];
-        snprintf(thread_name, sizeof(thread_name),
-                "%s-writer", thread->name);
+        fc_combine_two_string(thread->name, "writer", '-', thread_name);
         prctl(PR_SET_NAME, thread_name);
     }
 #endif
@@ -497,7 +496,7 @@ int sf_binlog_writer_init_thread_ex(SFBinlogWriterThread *thread,
     pthread_t tid;
     struct fast_mblock_object_callbacks callbacks;
 
-    snprintf(thread->name, sizeof(thread->name), "%s", name);
+    fc_safe_strcpy(thread->name, name);
     thread->order_mode = order_mode;
     thread->use_fixed_buffer_size = use_fixed_buffer_size;
     thread->passive_write = passive_write;
diff --git a/src/sf_global.c b/src/sf_global.c
index fc0ce4e..26c7046 100644
--- a/src/sf_global.c
+++ b/src/sf_global.c
@@ -220,9 +220,7 @@ int sf_load_slow_log_config_ex(IniFullContext *ini_ctx, LogContext *log_ctx,
     if (filename_prefix == NULL || *filename_prefix == '\0') {
         strcpy(slow_log_cfg->filename_prefix, "slow");
     } else {
-        snprintf(slow_log_cfg->filename_prefix,
-                sizeof(slow_log_cfg->filename_prefix),
-                "%s", filename_prefix);
+        fc_safe_strcpy(slow_log_cfg->filename_prefix, filename_prefix);
     }
 
     return 0;
@@ -331,9 +329,7 @@ int sf_load_global_config_ex(const char *log_filename_prefix,
         *g_sf_global_vars.run_by.group = '\0';
     }
     else {
-        snprintf(g_sf_global_vars.run_by.group,
-                sizeof(g_sf_global_vars.run_by.group),
-                "%s", pRunByGroup);
+        fc_safe_strcpy(g_sf_global_vars.run_by.group, pRunByGroup);
     }
     if (*(g_sf_global_vars.run_by.group) == '\0') {
         g_sf_global_vars.run_by.gid = getegid();
@@ -358,9 +354,7 @@ int sf_load_global_config_ex(const char *log_filename_prefix,
         *g_sf_global_vars.run_by.user = '\0';
     }
     else {
-        snprintf(g_sf_global_vars.run_by.user,
-                sizeof(g_sf_global_vars.run_by.user),
-                "%s", pRunByUser);
+        fc_safe_strcpy(g_sf_global_vars.run_by.user, pRunByUser);
     }
     if (*(g_sf_global_vars.run_by.user) == '\0') {
         g_sf_global_vars.run_by.uid = geteuid();
diff --git a/src/sf_ordered_writer.c b/src/sf_ordered_writer.c
index 043d58f..6168384 100644
--- a/src/sf_ordered_writer.c
+++ b/src/sf_ordered_writer.c
@@ -142,8 +142,7 @@ static void *binlog_writer_func(void *arg)
 #ifdef OS_LINUX
     {
         char thread_name[64];
-        snprintf(thread_name, sizeof(thread_name),
-                "%s-writer", thread->name);
+        fc_combine_two_string(thread->name, "writer", '-', thread_name);
         prctl(PR_SET_NAME, thread_name);
     }
 #endif
@@ -203,7 +202,7 @@ static int sf_ordered_writer_init_thread(SFOrderedWriterContext *context,
 
     thread = &context->thread;
     writer = &context->writer;
-    snprintf(thread->name, sizeof(thread->name), "%s", name);
+    fc_safe_strcpy(thread->name, name);
     writer->fw.cfg.max_record_size = max_record_size;
     writer->thread = thread;