summaryrefslogtreecommitdiff
path: root/path.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-07-19 15:35:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-21 17:37:02 (GMT)
commit5c0b13f85ab3a5326508b854768eb70c8829cda4 (patch)
treec498179a86e3e05abb664caa8d943c81ae4142f5 /path.c
parent51a60f5bfbaf1ee7c7a2d2b73eca4f042f7af8cb (diff)
downloadgit-5c0b13f85ab3a5326508b854768eb70c8829cda4.zip
git-5c0b13f85ab3a5326508b854768eb70c8829cda4.tar.gz
git-5c0b13f85ab3a5326508b854768eb70c8829cda4.tar.bz2
use xmemdupz() to allocate copies of strings given by start and length
Use xmemdupz() to allocate the memory, copy the data and make sure to NUL-terminate the result, all in one step. The resulting code is shorter, doesn't contain the constants 1 and '\0', and avoids duplicating function parameters. For blame, the last copied byte (o->file.ptr[o->file.size]) is always set to NUL by fake_working_tree_commit() or read_sha1_file(), so no information is lost by the conversion to using xmemdupz(). Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'path.c')
-rw-r--r--path.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/path.c b/path.c
index f9c5062..c36f003 100644
--- a/path.c
+++ b/path.c
@@ -249,9 +249,7 @@ int validate_headref(const char *path)
static struct passwd *getpw_str(const char *username, size_t len)
{
struct passwd *pw;
- char *username_z = xmalloc(len + 1);
- memcpy(username_z, username, len);
- username_z[len] = '\0';
+ char *username_z = xmemdupz(username, len);
pw = getpwnam(username_z);
free(username_z);
return pw;