[Telepathy-commits] [telepathy-salut/master] Use g_strlcpy instead of strncpy + []='\0'

[Alban Crequy]

---
 lib/gibber/gibber-unix-transport.c |    3 +--
 src/tube-stream.c                  |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/gibber/gibber-unix-transport.c b/lib/gibber/gibber-unix-transport.c
index 6812893..b1a6641 100644
--- a/lib/gibber/gibber-unix-transport.c
+++ b/lib/gibber/gibber-unix-transport.c
@@ -139,8 +139,7 @@ gibber_unix_transport_connect (GibberUnixTransport *transport,
     }
 
   addr.un.sun_family = PF_UNIX;
-  strncpy (addr.un.sun_path, path, sizeof (addr.un.sun_path) - 1);
-  addr.un.sun_path[sizeof (addr.un.sun_path) - 1] = '\0';
+  g_strlcpy (addr.un.sun_path, path, sizeof (addr.un.sun_path));
 
   if (connect (fd, &addr.addr, sizeof (addr.un)) == -1)
     {
diff --git a/src/tube-stream.c b/src/tube-stream.c
index 0075215..a968c0c 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -566,8 +566,7 @@ new_connection_to_socket (SalutTubeStream *self,
         }
 
       addr.un.sun_family = PF_UNIX;
-      strncpy (addr.un.sun_path, array->data, sizeof (addr.un.sun_path) - 1);
-      addr.un.sun_path[sizeof (addr.un.sun_path) - 1] = '\0';
+      g_strlcpy (addr.un.sun_path, array->data, sizeof (addr.un.sun_path));
       len = sizeof (addr.un);
 
       DEBUG ("Will try to connect to socket: %s", (const gchar *) array->data);
-- 
1.5.6.5