From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH v8 06/12] trailer: parse trailers from stdin Date: Wed, 26 Mar 2014 23:15:24 +0100 Message-ID: <20140326221531.11352.99065.chriscool@tuxfamily.org> References: <20140326215858.11352.89243.chriscool@tuxfamily.org> Cc: git@vger.kernel.org, Johan Herland , Josh Triplett , Thomas Rast , Michael Haggerty , Dan Carpenter , Greg Kroah-Hartman , Jeff King , Eric Sunshine , Ramsay Jones To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Mar 26 23:16:41 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WSw7g-0001vi-0c for gcvg-git-2@plane.gmane.org; Wed, 26 Mar 2014 23:16:36 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756301AbaCZWQZ (ORCPT ); Wed, 26 Mar 2014 18:16:25 -0400 Received: from [194.158.98.14] ([194.158.98.14]:44075 "EHLO mail-1y.bbox.fr" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1756086AbaCZWQY (ORCPT ); Wed, 26 Mar 2014 18:16:24 -0400 Received: from [127.0.1.1] (cha92-h01-128-78-31-246.dsl.sta.abo.bbox.fr [128.78.31.246]) by mail-1y.bbox.fr (Postfix) with ESMTP id 64B686C; Wed, 26 Mar 2014 23:16:03 +0100 (CET) X-git-sha1: 5c68ed5331a9ab201e500f347b1037006ca9d619 X-Mailer: git-mail-commits v0.5.2 In-Reply-To: <20140326215858.11352.89243.chriscool@tuxfamily.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Read trailers from stdin, parse them and put the result into a doubly linked list. Signed-off-by: Christian Couder --- trailer.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/trailer.c b/trailer.c index 1871843..3993840 100644 --- a/trailer.c +++ b/trailer.c @@ -50,6 +50,14 @@ static size_t alnum_len(const char *buf, size_t len) return len; } +static inline int contains_only_spaces(const char *str) +{ + const char *s = str; + while (*s && isspace(*s)) + s++; + return !*s; +} + static void free_trailer_item(struct trailer_item *item) { free(item->conf.name); @@ -501,3 +509,71 @@ static struct trailer_item *process_command_line_args(int argc, const char **arg return arg_tok_first; } + +static struct strbuf **read_stdin(void) +{ + struct strbuf **lines; + struct strbuf sb = STRBUF_INIT; + + if (strbuf_read(&sb, fileno(stdin), 0) < 0) + die_errno(_("could not read from stdin")); + + lines = strbuf_split(&sb, '\n'); + + strbuf_release(&sb); + + return lines; +} + +/* + * Return the the (0 based) index of the first trailer line + * or the line count if there are no trailers. + */ +static int find_trailer_start(struct strbuf **lines) +{ + int start, empty = 1, count = 0; + + /* Get the line count */ + while (lines[count]) + count++; + + /* + * Get the start of the trailers by looking starting from the end + * for a line with only spaces before lines with one ':'. + */ + for (start = count - 1; start >= 0; start--) { + if (contains_only_spaces(lines[start]->buf)) { + if (empty) + continue; + return start + 1; + } + if (strchr(lines[start]->buf, ':')) { + if (empty) + empty = 0; + continue; + } + return count; + } + + return empty ? count : start + 1; +} + +static void process_stdin(struct trailer_item **in_tok_first, + struct trailer_item **in_tok_last) +{ + struct strbuf **lines = read_stdin(); + int start = find_trailer_start(lines); + int i; + + /* Print non trailer lines as is */ + for (i = 0; lines[i] && i < start; i++) + printf("%s", lines[i]->buf); + + /* Parse trailer lines */ + for (i = start; lines[i]; i++) { + struct trailer_item *new = create_trailer_item(lines[i]->buf); + add_trailer_item(in_tok_first, in_tok_last, new); + } + + strbuf_list_free(lines); +} -- 1.9.0.164.g3aa33cd.dirty