[Pcsclite-cvs-commit] r7070 - trunk/PCSC/src

[ludovic.rousseau at free.fr]

Author: rousseau
Date: 2014-12-31 18:00:29 +0000 (Wed, 31 Dec 2014)
New Revision: 7070

Modified:
   trunk/PCSC/src/winscard_msg.c
Log:
Do not use strlcpy(3)

Remove the dependency.


Modified: trunk/PCSC/src/winscard_msg.c
===================================================================
--- trunk/PCSC/src/winscard_msg.c	2014-12-31 17:57:54 UTC (rev 7069)
+++ trunk/PCSC/src/winscard_msg.c	2014-12-31 18:00:29 UTC (rev 7070)
@@ -68,7 +68,6 @@
 #include "winscard_msg.h"
 #include "sys_generic.h"
 #include "utils.h"
-#include "strlcpycat.h"
 
 #ifdef PCSCD
 
@@ -93,9 +92,12 @@
 
 		socketNameEnv = getenv("PCSCLITE_CSOCK_NAME");
 		if (socketNameEnv)
-			strlcpy(socketName, socketNameEnv, sizeof(socketName));
+			strncpy(socketName, socketNameEnv, sizeof(socketName));
 		else
-			strlcpy(socketName, PCSCLITE_CSOCK_NAME, sizeof(socketName));
+			strncpy(socketName, PCSCLITE_CSOCK_NAME, sizeof(socketName));
+
+		/* Ensure a NUL byte */
+		socketName[sizeof socketName -1] = '\0';
 	}
 
 	return socketName;