From 30e77bcb5008d1947c721fb084e21eeaa591c45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Thu, 25 Apr 2013 21:40:25 +0200 Subject: [PATCH 1/3] pretty: simplify input line length calculation in pp_user_info() Instead of searching for LF and NUL with two strchr() calls use a single strchrnul() call. We don't need to check if the returned pointer is NULL because either we'll find the NUL at the end of line, or the caller forgot to NUL-terminate the string and we'll overrun the buffer in any case. Also we don't need to pass LF or NUL to split_ident_line() as it ignores it anyway. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- pretty.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pretty.c b/pretty.c index acbfceb5fe..a9c35812dc 100644 --- a/pretty.c +++ b/pretty.c @@ -413,7 +413,6 @@ void pp_user_info(const struct pretty_print_context *pp, struct strbuf name; struct strbuf mail; struct ident_split ident; - int linelen; char *line_end; const char *mailbuf, *namebuf; size_t namelen, maillen; @@ -422,18 +421,10 @@ void pp_user_info(const struct pretty_print_context *pp, if (pp->fmt == CMIT_FMT_ONELINE) return; - line_end = strchr(line, '\n'); - if (!line_end) { - line_end = strchr(line, '\0'); - if (!line_end) - return; - } - - linelen = ++line_end - line; - if (split_ident_line(&ident, line, linelen)) + line_end = strchrnul(line, '\n'); + if (split_ident_line(&ident, line, line_end - line)) return; - mailbuf = ident.mail_begin; maillen = ident.mail_end - ident.mail_begin; namebuf = ident.name_begin; From 97a17e7721dd026dbc4213608d4c61a9351ae527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Thu, 25 Apr 2013 21:41:57 +0200 Subject: [PATCH 2/3] pretty: simplify output line length calculation in pp_user_info() Keep namelen unchanged and don't use it to hold a value that we're not interested in anyway -- we can use maillen and the constant part directly instead. This simplifies the code slightly and prepares for the next patch that makes use of the original value of namelen. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- pretty.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pretty.c b/pretty.c index a9c35812dc..2031c77f15 100644 --- a/pretty.c +++ b/pretty.c @@ -439,8 +439,6 @@ void pp_user_info(const struct pretty_print_context *pp, strbuf_add(&mail, mailbuf, maillen); strbuf_add(&name, namebuf, namelen); - namelen = name.len + mail.len + 3; /* ' ' + '<' + '>' */ - if (pp->fmt == CMIT_FMT_EMAIL) { strbuf_addstr(sb, "From: "); if (needs_rfc2047_encoding(name.buf, name.len, RFC2047_ADDRESS)) { @@ -457,9 +455,10 @@ void pp_user_info(const struct pretty_print_context *pp, strbuf_add_wrapped_bytes(sb, name.buf, name.len, -6, 1, max_length); } - if (namelen - name.len + last_line_length(sb) > max_length) - strbuf_addch(sb, '\n'); + if (max_length < + last_line_length(sb) + strlen(" <") + maillen + strlen(">")) + strbuf_addch(sb, '\n'); strbuf_addf(sb, " <%s>\n", mail.buf); } else { strbuf_addf(sb, "%s: %.*s%s <%s>\n", what, From a0511b3934287d0dbffdb28ff6f00a220f794e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Thu, 25 Apr 2013 21:43:56 +0200 Subject: [PATCH 3/3] pretty: remove intermediate strbufs from pp_user_info() Use namebuf/namelen and mailbuf/maillen directly instead of copying their contents into strbufs first. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- pretty.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/pretty.c b/pretty.c index 2031c77f15..0530abfa72 100644 --- a/pretty.c +++ b/pretty.c @@ -410,8 +410,6 @@ void pp_user_info(const struct pretty_print_context *pp, const char *what, struct strbuf *sb, const char *line, const char *encoding) { - struct strbuf name; - struct strbuf mail; struct ident_split ident; char *line_end; const char *mailbuf, *namebuf; @@ -433,42 +431,33 @@ void pp_user_info(const struct pretty_print_context *pp, if (pp->mailmap) map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen); - strbuf_init(&mail, 0); - strbuf_init(&name, 0); - - strbuf_add(&mail, mailbuf, maillen); - strbuf_add(&name, namebuf, namelen); - if (pp->fmt == CMIT_FMT_EMAIL) { strbuf_addstr(sb, "From: "); - if (needs_rfc2047_encoding(name.buf, name.len, RFC2047_ADDRESS)) { - add_rfc2047(sb, name.buf, name.len, + if (needs_rfc2047_encoding(namebuf, namelen, RFC2047_ADDRESS)) { + add_rfc2047(sb, namebuf, namelen, encoding, RFC2047_ADDRESS); max_length = 76; /* per rfc2047 */ - } else if (needs_rfc822_quoting(name.buf, name.len)) { + } else if (needs_rfc822_quoting(namebuf, namelen)) { struct strbuf quoted = STRBUF_INIT; - add_rfc822_quoted("ed, name.buf, name.len); + add_rfc822_quoted("ed, namebuf, namelen); strbuf_add_wrapped_bytes(sb, quoted.buf, quoted.len, -6, 1, max_length); strbuf_release("ed); } else { - strbuf_add_wrapped_bytes(sb, name.buf, name.len, + strbuf_add_wrapped_bytes(sb, namebuf, namelen, -6, 1, max_length); } if (max_length < last_line_length(sb) + strlen(" <") + maillen + strlen(">")) strbuf_addch(sb, '\n'); - strbuf_addf(sb, " <%s>\n", mail.buf); + strbuf_addf(sb, " <%.*s>\n", (int)maillen, mailbuf); } else { - strbuf_addf(sb, "%s: %.*s%s <%s>\n", what, - (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0, - " ", name.buf, mail.buf); + strbuf_addf(sb, "%s: %.*s%.*s <%.*s>\n", what, + (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0, " ", + (int)namelen, namebuf, (int)maillen, mailbuf); } - strbuf_release(&mail); - strbuf_release(&name); - switch (pp->fmt) { case CMIT_FMT_MEDIUM: strbuf_addf(sb, "Date: %s\n",