From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SS386-00062e-WB for qemu-devel@nongnu.org; Wed, 09 May 2012 05:24:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SS384-00028W-Bj for qemu-devel@nongnu.org; Wed, 09 May 2012 05:24:18 -0400 Received: from mx.meyering.net ([88.168.87.75]:36916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SS384-000242-2y for qemu-devel@nongnu.org; Wed, 09 May 2012 05:24:16 -0400 From: Jim Meyering Date: Wed, 9 May 2012 11:24:01 +0200 Message-Id: <1336555446-20180-18-git-send-email-jim@meyering.net> In-Reply-To: <1336555446-20180-1-git-send-email-jim@meyering.net> References: <1336555446-20180-1-git-send-email-jim@meyering.net> Subject: [Qemu-devel] [PATCH 17/22] libcacard/vcard_emul_nss: use pstrcpy in place of strncpy List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Dong Xu Wang , Stefan Hajnoczi , Jim Meyering , Jan Kiszka , Christophe Fergeau , Alon Levy , Robert Relyea , Brad Smith From: Jim Meyering Replace strncpy+NUL-terminate use with use of pstrcpy. This requires linking with cutils.o (or else vssclient doesn't link), so add that in the Makefile. Signed-off-by: Jim Meyering --- libcacard/Makefile | 2 +- libcacard/vcard_emul_nss.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libcacard/Makefile b/libcacard/Makefile index c6a896a..2a5a42d 100644 --- a/libcacard/Makefile +++ b/libcacard/Makefile @@ -17,7 +17,7 @@ QEMU_CFLAGS+=-I../ libcacard.lib-y=$(addsuffix .lo,$(basename $(libcacard-y))) -vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o +vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o cutils.o $(call quiet-command,$(CC) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK $@") clean: diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c index 802cae3..e1cae5b 100644 --- a/libcacard/vcard_emul_nss.c +++ b/libcacard/vcard_emul_nss.c @@ -1169,8 +1169,7 @@ vcard_emul_options(const char *args) NEXT_TOKEN(vname) NEXT_TOKEN(type_params) type_params_length = MIN(type_params_length, sizeof(type_str)-1); - strncpy(type_str, type_params, type_params_length); - type_str[type_params_length] = 0; + pstrcpy(type_str, type_params_length, type_params); type = vcard_emul_type_from_string(type_str); NEXT_TOKEN(type_params) -- 1.7.10.1.487.ga3935e6