Rename safe_strncpy() to strlcpy().
This cleans up the use of safe_strncpy() even more. Since it has the same semantics as strlcpy() use this name instead. Also move the definition from inside path.c to its own file compat/strlcpy.c, and use it conditionally at compile time, since some platforms already has strlcpy(). It's included in the same way as compat/setenv.c. 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
3eaa38da94
commit
817151e61a
@ -1271,7 +1271,7 @@ xml_cdata(void *userData, const XML_Char *s, int len)
|
||||
if (ctx->cdata)
|
||||
free(ctx->cdata);
|
||||
ctx->cdata = xmalloc(len + 1);
|
||||
safe_strncpy(ctx->cdata, s, len + 1);
|
||||
strlcpy(ctx->cdata, s, len + 1);
|
||||
}
|
||||
|
||||
static struct remote_lock *lock_remote(char *path, long timeout)
|
||||
@ -1473,7 +1473,7 @@ static void process_ls_object(struct remote_ls_ctx *ls)
|
||||
return;
|
||||
path += 8;
|
||||
obj_hex = xmalloc(strlen(path));
|
||||
safe_strncpy(obj_hex, path, 3);
|
||||
strlcpy(obj_hex, path, 3);
|
||||
strcpy(obj_hex + 2, path + 3);
|
||||
one_remote_object(obj_hex);
|
||||
free(obj_hex);
|
||||
@ -2172,7 +2172,7 @@ static void fetch_symref(char *path, char **symref, unsigned char *sha1)
|
||||
/* If it's a symref, set the refname; otherwise try for a sha1 */
|
||||
if (!strncmp((char *)buffer.buffer, "ref: ", 5)) {
|
||||
*symref = xmalloc(buffer.posn - 5);
|
||||
safe_strncpy(*symref, (char *)buffer.buffer + 5, buffer.posn - 5);
|
||||
strlcpy(*symref, (char *)buffer.buffer + 5, buffer.posn - 5);
|
||||
} else {
|
||||
get_sha1_hex(buffer.buffer, sha1);
|
||||
}
|
||||
|
Reference in New Issue
Block a user