Implement safe_strncpy() as strlcpy() and use it more.
Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:

committed by
Junio C Hamano

parent
5996ca0836
commit
bfbd0bb6ec
13
path.c
13
path.c
@ -83,14 +83,19 @@ int git_mkstemp(char *path, size_t len, const char *template)
|
||||
}
|
||||
|
||||
|
||||
char *safe_strncpy(char *dest, const char *src, size_t n)
|
||||
size_t safe_strncpy(char *dest, const char *src, size_t size)
|
||||
{
|
||||
strncpy(dest, src, n);
|
||||
dest[n - 1] = '\0';
|
||||
size_t ret = strlen(src);
|
||||
|
||||
return dest;
|
||||
if (size) {
|
||||
size_t len = (ret >= size) ? size - 1 : ret;
|
||||
memcpy(dest, src, len);
|
||||
dest[len] = '\0';
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
int validate_symref(const char *path)
|
||||
{
|
||||
struct stat st;
|
||||
|
Reference in New Issue
Block a user