diff --git a/src/bin/evas/evas_cserve2_client.c b/src/bin/evas/evas_cserve2_client.c
index 9d63b87abf..91999f0ef0 100644
--- a/src/bin/evas/evas_cserve2_client.c
+++ b/src/bin/evas/evas_cserve2_client.c
@@ -369,7 +369,7 @@ int main(void)
                  (int)getuid());
         env = buf;
      }
-   strncpy(remote.sun_path, env, UNIX_PATH_MAX - 1);
+   eina_strlcpy(remote.sun_path, env, UNIX_PATH_MAX);
    len = strlen(remote.sun_path) + sizeof(remote.sun_family);
    if (connect(s, (struct sockaddr *)&remote, len) == -1)
      {
diff --git a/src/bin/evas/evas_cserve2_debug.c b/src/bin/evas/evas_cserve2_debug.c
index 1dd67c7807..ce8e3e43f1 100644
--- a/src/bin/evas/evas_cserve2_debug.c
+++ b/src/bin/evas/evas_cserve2_debug.c
@@ -49,7 +49,7 @@ _socket_path_set(char *path)
    env = getenv("EVAS_CSERVE2_SOCKET");
    if (env && env[0])
      {
-        strncpy(path, env, UNIX_PATH_MAX - 1);
+        eina_strlcpy(path, env, UNIX_PATH_MAX);
         return;
      }
 
diff --git a/src/bin/evas/evas_cserve2_main_loop_linux.c b/src/bin/evas/evas_cserve2_main_loop_linux.c
index 0fd40ea942..ca156f2597 100644
--- a/src/bin/evas/evas_cserve2_main_loop_linux.c
+++ b/src/bin/evas/evas_cserve2_main_loop_linux.c
@@ -210,7 +210,7 @@ _socket_path_set(char *path)
    env = getenv("EVAS_CSERVE2_SOCKET");
    if (env && env[0])
      {
-        strncpy(path, env, UNIX_PATH_MAX - 1);
+        eina_strlcpy(path, env, UNIX_PATH_MAX);
         return;
      }
 
diff --git a/src/bin/evas/evas_cserve2_usage.c b/src/bin/evas/evas_cserve2_usage.c
index 2aa3ff3650..294f5c3747 100644
--- a/src/bin/evas/evas_cserve2_usage.c
+++ b/src/bin/evas/evas_cserve2_usage.c
@@ -49,7 +49,7 @@ _socket_path_set(char *path)
    env = getenv("EVAS_CSERVE2_SOCKET");
    if (env && env[0])
      {
-        strncpy(path, env, UNIX_PATH_MAX - 1);
+        eina_strlcpy(path, env, UNIX_PATH_MAX);
         return;
      }
 
diff --git a/src/lib/evas/cserve2/evas_cs2_client.c b/src/lib/evas/cserve2/evas_cs2_client.c
index dd91db7339..43bdd239d3 100644
--- a/src/lib/evas/cserve2/evas_cs2_client.c
+++ b/src/lib/evas/cserve2/evas_cs2_client.c
@@ -56,7 +56,7 @@ _socket_path_set(char *path)
    env = getenv("EVAS_CSERVE2_SOCKET");
    if (env && env[0])
      {
-        strncpy(path, env, UNIX_PATH_MAX - 1);
+        eina_strlcpy(path, env, UNIX_PATH_MAX);
         return;
      }