From: René Scharfe <l.s.r@web.de>
Date: Sat, 21 Feb 2015 19:55:22 +0000 (+0100)
Subject: sha1_name: use strlcpy() to copy strings
X-Git-Tag: v2.3.2~2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ce63e9fac242a70cd6d9e1325063bbb2e5091f8;p=thirdparty%2Fgit.git

sha1_name: use strlcpy() to copy strings

Use strlcpy() instead of calling strncpy() and then setting the last
byte of the target buffer to NUL explicitly.  This shortens and
simplifies the code a bit.

Signed-of-by: Rene Scharfe <l.s.r@web.de>

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/sha1_name.c b/sha1_name.c
index 63ee66fedd..9ef426b32f 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -1384,9 +1384,7 @@ static int get_sha1_with_context_1(const char *name,
 			namelen = strlen(cp);
 		}
 
-		strncpy(oc->path, cp,
-			sizeof(oc->path));
-		oc->path[sizeof(oc->path)-1] = '\0';
+		strlcpy(oc->path, cp, sizeof(oc->path));
 
 		if (!active_cache)
 			read_cache();
@@ -1436,9 +1434,7 @@ static int get_sha1_with_context_1(const char *name,
 							   name, len);
 			}
 			hashcpy(oc->tree, tree_sha1);
-			strncpy(oc->path, filename,
-				sizeof(oc->path));
-			oc->path[sizeof(oc->path)-1] = '\0';
+			strlcpy(oc->path, filename, sizeof(oc->path));
 
 			free(new_filename);
 			return ret;