From: Anders Waldenborg Date: Sun, 25 Oct 2020 21:26:45 GMT Subject: [PATCH 14/21] trailer: move skipping of blank lines to own loop when finding trailer Message-ID: <20201025212652.3003036-15-anders@0x63.nu> In-Reply-To: <20201025212652.3003036-1-anders@0x63.nu> ); SAEximRunCond expanded to false No functional change intended. Signed-off-by: Anders Waldenborg --- trailer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/trailer.c b/trailer.c index 110d3ed226..937cf1edeb 100644 --- a/trailer.c +++ b/trailer.c @@ -829,7 +829,6 @@ static size_t find_trailer_start(const char *buf, size_t len) { const char *s; ssize_t end_of_title, l; - int only_spaces = 1; int recognized_prefix = 0, trailer_lines = 0, non_trailer_lines = 0; /* * Number of possible continuation lines encountered. This will be @@ -856,6 +855,12 @@ static size_t find_trailer_start(const char *buf, size_t len) * consists of at least 25% trailers. */ for (l = last_line(buf, len); + l >= end_of_title; + l = last_line(buf, l)) { + if (!is_blank_line(buf + l) && buf[l] != comment_line_char) + break; + } + for (; l >= end_of_title; l = last_line(buf, l)) { const char *bol = buf + l; @@ -868,8 +873,6 @@ static size_t find_trailer_start(const char *buf, size_t len) continue; } if (is_blank_line(bol)) { - if (only_spaces) - continue; non_trailer_lines += possible_continuation_lines; if (recognized_prefix && trailer_lines * 3 >= non_trailer_lines) @@ -878,7 +881,6 @@ static size_t find_trailer_start(const char *buf, size_t len) return next_line(bol) - buf; return len; } - only_spaces = 0; for (p = git_generated_prefixes; *p; p++) { if (starts_with(bol, *p)) { -- 2.25.1