Merge branch 'rg/copy-gecos-username' into maint

gitster · gitster · commit 93446aa76004 · 2011-05-26T09:37:04.000-07:00
* rg/copy-gecos-username:
  copy_gecos: fix not adding nlen to len when processing "&amp;"
diff --git a/ident.c b/ident.c
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ static void copy_gecos(const struct passwd w, char name, size_t sz)`
`34`	`34`	`dst++ = toupper(w->pw_name);`
`35`	`35`	`memcpy(dst, w->pw_name + 1, nlen - 1);`
`36`	`36`	`dst += nlen - 1;`
	`37`	`+ len += nlen;`
`37`	`38`	`}`
`38`	`39`	`}`
`39`	`40`	`if (len < sz)`