From c6300318c86a1c3a0e9a3b9037cea1dbc83b9a1e Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Sat, 25 Jun 2022 11:24:59 +0800
Subject: [PATCH] use macro FC_SET_CLOEXEC from libfastcommon

---
 src/sf_func.c    | 1 +
 src/sf_service.c | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/sf_func.c b/src/sf_func.c
index 06d4b24..510bdcd 100644
--- a/src/sf_func.c
+++ b/src/sf_func.c
@@ -45,6 +45,7 @@ int sf_connect_to_server(const char *ip_addr, const int port, int *sock)
         *sock = -1;
         return result;
     }
+    FC_SET_CLOEXEC(*sock);
 
     if ((result=connectserverbyip_nb(*sock, ip_addr, port,
                     g_sf_global_vars.connect_timeout)) != 0)
diff --git a/src/sf_service.c b/src/sf_service.c
index 1fe248b..e7e788d 100644
--- a/src/sf_service.c
+++ b/src/sf_service.c
@@ -231,11 +231,12 @@ int sf_service_init_ex2(SFContext *sf_context, const char *name,
             break;
         }
         if ((result=fd_add_flags(FC_NOTIFY_READ_FD(thread_data),
-                O_NONBLOCK | FD_CLOEXEC)) != 0)
+                O_NONBLOCK)) != 0)
         {
             break;
         }
-        fd_set_cloexec(FC_NOTIFY_WRITE_FD(thread_data));
+        FC_SET_CLOEXEC(FC_NOTIFY_READ_FD(thread_data));
+        FC_SET_CLOEXEC(FC_NOTIFY_WRITE_FD(thread_data));
 #endif
 
         thread_ctx->sf_context = sf_context;
@@ -340,7 +341,7 @@ static int _socket_server(const char *bind_addr, int port, int *sock)
         return result;
     }
 
-    return fd_set_cloexec(*sock);
+    return 0;
 }
 
 int sf_socket_server_ex(SFContext *sf_context)
@@ -409,6 +410,7 @@ static void accept_run(struct accept_thread_context *accept_context)
             close(incomesock);
             continue;
         }
+        FC_SET_CLOEXEC(incomesock);
 
         if ((task=sf_alloc_init_task(accept_context->
                         sf_context, incomesock)) == NULL)