diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-20 05:37:21 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-20 05:37:21 +0200 |
commit | ac39c5f554f80b5baddea9a6e6b5ff53cb92b6e3 (patch) | |
tree | 4103889e7fe19f3c82d6b1920a81f314b846c1fe /ident.c | |
parent | Merge branch 'jl/submodule-conflicted-gitmodules' (diff) | |
parent | copy_gecos: fix not adding nlen to len when processing "&" (diff) | |
download | git-ac39c5f554f80b5baddea9a6e6b5ff53cb92b6e3.tar.xz git-ac39c5f554f80b5baddea9a6e6b5ff53cb92b6e3.zip |
Merge branch 'rg/copy-gecos-username'
* rg/copy-gecos-username:
copy_gecos: fix not adding nlen to len when processing "&"
Diffstat (limited to 'ident.c')
-rw-r--r-- | ident.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -34,6 +34,7 @@ static void copy_gecos(const struct passwd *w, char *name, size_t sz) *dst++ = toupper(*w->pw_name); memcpy(dst, w->pw_name + 1, nlen - 1); dst += nlen - 1; + len += nlen; } } if (len < sz) |