3 #include "string-list.h"
4 #include "run-command.h"
10 * Copyright (c) 2013, 2014 Christian Couder <chriscool@tuxfamily.org>
18 enum trailer_where where
;
19 enum trailer_if_exists if_exists
;
20 enum trailer_if_missing if_missing
;
23 static struct conf_info default_conf_info
;
26 struct list_head list
;
28 * If this is not a trailer line, the line is stored in value
29 * (excluding the terminating newline) and token is NULL.
36 struct list_head list
;
39 struct conf_info conf
;
42 static LIST_HEAD(conf_head
);
44 static char *separators
= ":";
46 static int configured
;
48 #define TRAILER_ARG_STRING "$ARG"
50 static const char *git_generated_prefixes
[] = {
52 "(cherry picked from commit ",
56 /* Iterate over the elements of the list. */
57 #define list_for_each_dir(pos, head, is_reverse) \
58 for (pos = is_reverse ? (head)->prev : (head)->next; \
60 pos = is_reverse ? pos->prev : pos->next)
62 static int after_or_end(enum trailer_where where
)
64 return (where
== WHERE_AFTER
) || (where
== WHERE_END
);
68 * Return the length of the string not including any final
69 * punctuation. E.g., the input "Signed-off-by:" would return
70 * 13, stripping the trailing punctuation but retaining
71 * internal punctuation.
73 static size_t token_len_without_separator(const char *token
, size_t len
)
75 while (len
> 0 && !isalnum(token
[len
- 1]))
80 static int same_token(struct trailer_item
*a
, struct arg_item
*b
)
82 size_t a_len
, b_len
, min_len
;
87 a_len
= token_len_without_separator(a
->token
, strlen(a
->token
));
88 b_len
= token_len_without_separator(b
->token
, strlen(b
->token
));
89 min_len
= (a_len
> b_len
) ? b_len
: a_len
;
91 return !strncasecmp(a
->token
, b
->token
, min_len
);
94 static int same_value(struct trailer_item
*a
, struct arg_item
*b
)
96 return !strcasecmp(a
->value
, b
->value
);
99 static int same_trailer(struct trailer_item
*a
, struct arg_item
*b
)
101 return same_token(a
, b
) && same_value(a
, b
);
104 static inline int is_blank_line(const char *str
)
107 while (*s
&& *s
!= '\n' && isspace(*s
))
109 return !*s
|| *s
== '\n';
112 static inline void strbuf_replace(struct strbuf
*sb
, const char *a
, const char *b
)
114 const char *ptr
= strstr(sb
->buf
, a
);
116 strbuf_splice(sb
, ptr
- sb
->buf
, strlen(a
), b
, strlen(b
));
119 static void free_trailer_item(struct trailer_item
*item
)
126 static void free_arg_item(struct arg_item
*item
)
128 free(item
->conf
.name
);
129 free(item
->conf
.key
);
130 free(item
->conf
.command
);
131 free(item
->conf
.cmd
);
137 static char last_non_space_char(const char *s
)
140 for (i
= strlen(s
) - 1; i
>= 0; i
--)
146 static void print_tok_val(FILE *outfile
, const char *tok
, const char *val
)
151 fprintf(outfile
, "%s\n", val
);
155 c
= last_non_space_char(tok
);
158 if (strchr(separators
, c
))
159 fprintf(outfile
, "%s%s\n", tok
, val
);
161 fprintf(outfile
, "%s%c %s\n", tok
, separators
[0], val
);
164 static void print_all(FILE *outfile
, struct list_head
*head
,
165 const struct process_trailer_options
*opts
)
167 struct list_head
*pos
;
168 struct trailer_item
*item
;
169 list_for_each(pos
, head
) {
170 item
= list_entry(pos
, struct trailer_item
, list
);
171 if ((!opts
->trim_empty
|| strlen(item
->value
) > 0) &&
172 (!opts
->only_trailers
|| item
->token
))
173 print_tok_val(outfile
, item
->token
, item
->value
);
177 static struct trailer_item
*trailer_from_arg(struct arg_item
*arg_tok
)
179 struct trailer_item
*new_item
= xcalloc(1, sizeof(*new_item
));
180 new_item
->token
= arg_tok
->token
;
181 new_item
->value
= arg_tok
->value
;
182 arg_tok
->token
= arg_tok
->value
= NULL
;
183 free_arg_item(arg_tok
);
187 static void add_arg_to_input_list(struct trailer_item
*on_tok
,
188 struct arg_item
*arg_tok
)
190 int aoe
= after_or_end(arg_tok
->conf
.where
);
191 struct trailer_item
*to_add
= trailer_from_arg(arg_tok
);
193 list_add(&to_add
->list
, &on_tok
->list
);
195 list_add_tail(&to_add
->list
, &on_tok
->list
);
198 static int check_if_different(struct trailer_item
*in_tok
,
199 struct arg_item
*arg_tok
,
201 struct list_head
*head
)
203 enum trailer_where where
= arg_tok
->conf
.where
;
204 struct list_head
*next_head
;
206 if (same_trailer(in_tok
, arg_tok
))
209 * if we want to add a trailer after another one,
210 * we have to check those before this one
212 next_head
= after_or_end(where
) ? in_tok
->list
.prev
214 if (next_head
== head
)
216 in_tok
= list_entry(next_head
, struct trailer_item
, list
);
221 static char *apply_command(struct conf_info
*conf
, const char *arg
)
223 struct strbuf cmd
= STRBUF_INIT
;
224 struct strbuf buf
= STRBUF_INIT
;
225 struct child_process cp
= CHILD_PROCESS_INIT
;
229 strbuf_addstr(&cmd
, conf
->cmd
);
230 strvec_push(&cp
.args
, cmd
.buf
);
232 strvec_push(&cp
.args
, arg
);
233 } else if (conf
->command
) {
234 strbuf_addstr(&cmd
, conf
->command
);
236 strbuf_replace(&cmd
, TRAILER_ARG_STRING
, arg
);
237 strvec_push(&cp
.args
, cmd
.buf
);
239 strvec_pushv(&cp
.env
, (const char **)local_repo_env
);
243 if (capture_command(&cp
, &buf
, 1024)) {
244 error(_("running trailer command '%s' failed"), cmd
.buf
);
245 strbuf_release(&buf
);
246 result
= xstrdup("");
249 result
= strbuf_detach(&buf
, NULL
);
252 strbuf_release(&cmd
);
256 static void apply_item_command(struct trailer_item
*in_tok
, struct arg_item
*arg_tok
)
258 if (arg_tok
->conf
.command
|| arg_tok
->conf
.cmd
) {
260 if (arg_tok
->value
&& arg_tok
->value
[0]) {
261 arg
= arg_tok
->value
;
263 if (in_tok
&& in_tok
->value
)
264 arg
= xstrdup(in_tok
->value
);
268 arg_tok
->value
= apply_command(&arg_tok
->conf
, arg
);
273 static void apply_arg_if_exists(struct trailer_item
*in_tok
,
274 struct arg_item
*arg_tok
,
275 struct trailer_item
*on_tok
,
276 struct list_head
*head
)
278 switch (arg_tok
->conf
.if_exists
) {
279 case EXISTS_DO_NOTHING
:
280 free_arg_item(arg_tok
);
283 apply_item_command(in_tok
, arg_tok
);
284 add_arg_to_input_list(on_tok
, arg_tok
);
285 list_del(&in_tok
->list
);
286 free_trailer_item(in_tok
);
289 apply_item_command(in_tok
, arg_tok
);
290 add_arg_to_input_list(on_tok
, arg_tok
);
292 case EXISTS_ADD_IF_DIFFERENT
:
293 apply_item_command(in_tok
, arg_tok
);
294 if (check_if_different(in_tok
, arg_tok
, 1, head
))
295 add_arg_to_input_list(on_tok
, arg_tok
);
297 free_arg_item(arg_tok
);
299 case EXISTS_ADD_IF_DIFFERENT_NEIGHBOR
:
300 apply_item_command(in_tok
, arg_tok
);
301 if (check_if_different(on_tok
, arg_tok
, 0, head
))
302 add_arg_to_input_list(on_tok
, arg_tok
);
304 free_arg_item(arg_tok
);
307 BUG("trailer.c: unhandled value %d",
308 arg_tok
->conf
.if_exists
);
312 static void apply_arg_if_missing(struct list_head
*head
,
313 struct arg_item
*arg_tok
)
315 enum trailer_where where
;
316 struct trailer_item
*to_add
;
318 switch (arg_tok
->conf
.if_missing
) {
319 case MISSING_DO_NOTHING
:
320 free_arg_item(arg_tok
);
323 where
= arg_tok
->conf
.where
;
324 apply_item_command(NULL
, arg_tok
);
325 to_add
= trailer_from_arg(arg_tok
);
326 if (after_or_end(where
))
327 list_add_tail(&to_add
->list
, head
);
329 list_add(&to_add
->list
, head
);
332 BUG("trailer.c: unhandled value %d",
333 arg_tok
->conf
.if_missing
);
337 static int find_same_and_apply_arg(struct list_head
*head
,
338 struct arg_item
*arg_tok
)
340 struct list_head
*pos
;
341 struct trailer_item
*in_tok
;
342 struct trailer_item
*on_tok
;
344 enum trailer_where where
= arg_tok
->conf
.where
;
345 int middle
= (where
== WHERE_AFTER
) || (where
== WHERE_BEFORE
);
346 int backwards
= after_or_end(where
);
347 struct trailer_item
*start_tok
;
349 if (list_empty(head
))
352 start_tok
= list_entry(backwards
? head
->prev
: head
->next
,
356 list_for_each_dir(pos
, head
, backwards
) {
357 in_tok
= list_entry(pos
, struct trailer_item
, list
);
358 if (!same_token(in_tok
, arg_tok
))
360 on_tok
= middle
? in_tok
: start_tok
;
361 apply_arg_if_exists(in_tok
, arg_tok
, on_tok
, head
);
367 static void process_trailers_lists(struct list_head
*head
,
368 struct list_head
*arg_head
)
370 struct list_head
*pos
, *p
;
371 struct arg_item
*arg_tok
;
373 list_for_each_safe(pos
, p
, arg_head
) {
375 arg_tok
= list_entry(pos
, struct arg_item
, list
);
379 applied
= find_same_and_apply_arg(head
, arg_tok
);
382 apply_arg_if_missing(head
, arg_tok
);
386 int trailer_set_where(enum trailer_where
*item
, const char *value
)
389 *item
= WHERE_DEFAULT
;
390 else if (!strcasecmp("after", value
))
392 else if (!strcasecmp("before", value
))
393 *item
= WHERE_BEFORE
;
394 else if (!strcasecmp("end", value
))
396 else if (!strcasecmp("start", value
))
403 int trailer_set_if_exists(enum trailer_if_exists
*item
, const char *value
)
406 *item
= EXISTS_DEFAULT
;
407 else if (!strcasecmp("addIfDifferent", value
))
408 *item
= EXISTS_ADD_IF_DIFFERENT
;
409 else if (!strcasecmp("addIfDifferentNeighbor", value
))
410 *item
= EXISTS_ADD_IF_DIFFERENT_NEIGHBOR
;
411 else if (!strcasecmp("add", value
))
413 else if (!strcasecmp("replace", value
))
414 *item
= EXISTS_REPLACE
;
415 else if (!strcasecmp("doNothing", value
))
416 *item
= EXISTS_DO_NOTHING
;
422 int trailer_set_if_missing(enum trailer_if_missing
*item
, const char *value
)
425 *item
= MISSING_DEFAULT
;
426 else if (!strcasecmp("doNothing", value
))
427 *item
= MISSING_DO_NOTHING
;
428 else if (!strcasecmp("add", value
))
435 static void duplicate_conf(struct conf_info
*dst
, const struct conf_info
*src
)
438 dst
->name
= xstrdup_or_null(src
->name
);
439 dst
->key
= xstrdup_or_null(src
->key
);
440 dst
->command
= xstrdup_or_null(src
->command
);
441 dst
->cmd
= xstrdup_or_null(src
->cmd
);
444 static struct arg_item
*get_conf_item(const char *name
)
446 struct list_head
*pos
;
447 struct arg_item
*item
;
449 /* Look up item with same name */
450 list_for_each(pos
, &conf_head
) {
451 item
= list_entry(pos
, struct arg_item
, list
);
452 if (!strcasecmp(item
->conf
.name
, name
))
456 /* Item does not already exists, create it */
457 CALLOC_ARRAY(item
, 1);
458 duplicate_conf(&item
->conf
, &default_conf_info
);
459 item
->conf
.name
= xstrdup(name
);
461 list_add_tail(&item
->list
, &conf_head
);
466 enum trailer_info_type
{ TRAILER_KEY
, TRAILER_COMMAND
, TRAILER_CMD
,
467 TRAILER_WHERE
, TRAILER_IF_EXISTS
, TRAILER_IF_MISSING
};
471 enum trailer_info_type type
;
472 } trailer_config_items
[] = {
473 { "key", TRAILER_KEY
},
474 { "command", TRAILER_COMMAND
},
475 { "cmd", TRAILER_CMD
},
476 { "where", TRAILER_WHERE
},
477 { "ifexists", TRAILER_IF_EXISTS
},
478 { "ifmissing", TRAILER_IF_MISSING
}
481 static int git_trailer_default_config(const char *conf_key
, const char *value
,
484 const char *trailer_item
, *variable_name
;
486 if (!skip_prefix(conf_key
, "trailer.", &trailer_item
))
489 variable_name
= strrchr(trailer_item
, '.');
490 if (!variable_name
) {
491 if (!strcmp(trailer_item
, "where")) {
492 if (trailer_set_where(&default_conf_info
.where
,
494 warning(_("unknown value '%s' for key '%s'"),
496 } else if (!strcmp(trailer_item
, "ifexists")) {
497 if (trailer_set_if_exists(&default_conf_info
.if_exists
,
499 warning(_("unknown value '%s' for key '%s'"),
501 } else if (!strcmp(trailer_item
, "ifmissing")) {
502 if (trailer_set_if_missing(&default_conf_info
.if_missing
,
504 warning(_("unknown value '%s' for key '%s'"),
506 } else if (!strcmp(trailer_item
, "separators")) {
507 separators
= xstrdup(value
);
513 static int git_trailer_config(const char *conf_key
, const char *value
,
516 const char *trailer_item
, *variable_name
;
517 struct arg_item
*item
;
518 struct conf_info
*conf
;
520 enum trailer_info_type type
;
523 if (!skip_prefix(conf_key
, "trailer.", &trailer_item
))
526 variable_name
= strrchr(trailer_item
, '.');
531 for (i
= 0; i
< ARRAY_SIZE(trailer_config_items
); i
++) {
532 if (strcmp(trailer_config_items
[i
].name
, variable_name
))
534 name
= xstrndup(trailer_item
, variable_name
- trailer_item
- 1);
535 type
= trailer_config_items
[i
].type
;
542 item
= get_conf_item(name
);
549 warning(_("more than one %s"), conf_key
);
550 conf
->key
= xstrdup(value
);
552 case TRAILER_COMMAND
:
554 warning(_("more than one %s"), conf_key
);
555 conf
->command
= xstrdup(value
);
559 warning(_("more than one %s"), conf_key
);
560 conf
->cmd
= xstrdup(value
);
563 if (trailer_set_where(&conf
->where
, value
))
564 warning(_("unknown value '%s' for key '%s'"), value
, conf_key
);
566 case TRAILER_IF_EXISTS
:
567 if (trailer_set_if_exists(&conf
->if_exists
, value
))
568 warning(_("unknown value '%s' for key '%s'"), value
, conf_key
);
570 case TRAILER_IF_MISSING
:
571 if (trailer_set_if_missing(&conf
->if_missing
, value
))
572 warning(_("unknown value '%s' for key '%s'"), value
, conf_key
);
575 BUG("trailer.c: unhandled type %d", type
);
580 static void ensure_configured(void)
585 /* Default config must be setup first */
586 default_conf_info
.where
= WHERE_END
;
587 default_conf_info
.if_exists
= EXISTS_ADD_IF_DIFFERENT_NEIGHBOR
;
588 default_conf_info
.if_missing
= MISSING_ADD
;
589 git_config(git_trailer_default_config
, NULL
);
590 git_config(git_trailer_config
, NULL
);
594 static const char *token_from_item(struct arg_item
*item
, char *tok
)
597 return item
->conf
.key
;
600 return item
->conf
.name
;
603 static int token_matches_item(const char *tok
, struct arg_item
*item
, size_t tok_len
)
605 if (!strncasecmp(tok
, item
->conf
.name
, tok_len
))
607 return item
->conf
.key
? !strncasecmp(tok
, item
->conf
.key
, tok_len
) : 0;
611 * If the given line is of the form
612 * "<token><optional whitespace><separator>..." or "<separator>...", return the
613 * location of the separator. Otherwise, return -1. The optional whitespace
614 * is allowed there primarily to allow things like "Bug #43" where <token> is
615 * "Bug" and <separator> is "#".
617 * The separator-starts-line case (in which this function returns 0) is
618 * distinguished from the non-well-formed-line case (in which this function
619 * returns -1) because some callers of this function need such a distinction.
621 static ssize_t
find_separator(const char *line
, const char *separators
)
623 int whitespace_found
= 0;
625 for (c
= line
; *c
; c
++) {
626 if (strchr(separators
, *c
))
628 if (!whitespace_found
&& (isalnum(*c
) || *c
== '-'))
630 if (c
!= line
&& (*c
== ' ' || *c
== '\t')) {
631 whitespace_found
= 1;
640 * Obtain the token, value, and conf from the given trailer.
642 * separator_pos must not be 0, since the token cannot be an empty string.
644 * If separator_pos is -1, interpret the whole trailer as a token.
646 static void parse_trailer(struct strbuf
*tok
, struct strbuf
*val
,
647 const struct conf_info
**conf
, const char *trailer
,
648 ssize_t separator_pos
)
650 struct arg_item
*item
;
652 struct list_head
*pos
;
654 if (separator_pos
!= -1) {
655 strbuf_add(tok
, trailer
, separator_pos
);
657 strbuf_addstr(val
, trailer
+ separator_pos
+ 1);
660 strbuf_addstr(tok
, trailer
);
664 /* Lookup if the token matches something in the config */
665 tok_len
= token_len_without_separator(tok
->buf
, tok
->len
);
667 *conf
= &default_conf_info
;
668 list_for_each(pos
, &conf_head
) {
669 item
= list_entry(pos
, struct arg_item
, list
);
670 if (token_matches_item(tok
->buf
, item
, tok_len
)) {
671 char *tok_buf
= strbuf_detach(tok
, NULL
);
674 strbuf_addstr(tok
, token_from_item(item
, tok_buf
));
681 static struct trailer_item
*add_trailer_item(struct list_head
*head
, char *tok
,
684 struct trailer_item
*new_item
= xcalloc(1, sizeof(*new_item
));
685 new_item
->token
= tok
;
686 new_item
->value
= val
;
687 list_add_tail(&new_item
->list
, head
);
691 static void add_arg_item(struct list_head
*arg_head
, char *tok
, char *val
,
692 const struct conf_info
*conf
,
693 const struct new_trailer_item
*new_trailer_item
)
695 struct arg_item
*new_item
= xcalloc(1, sizeof(*new_item
));
696 new_item
->token
= tok
;
697 new_item
->value
= val
;
698 duplicate_conf(&new_item
->conf
, conf
);
699 if (new_trailer_item
) {
700 if (new_trailer_item
->where
!= WHERE_DEFAULT
)
701 new_item
->conf
.where
= new_trailer_item
->where
;
702 if (new_trailer_item
->if_exists
!= EXISTS_DEFAULT
)
703 new_item
->conf
.if_exists
= new_trailer_item
->if_exists
;
704 if (new_trailer_item
->if_missing
!= MISSING_DEFAULT
)
705 new_item
->conf
.if_missing
= new_trailer_item
->if_missing
;
707 list_add_tail(&new_item
->list
, arg_head
);
710 static void process_command_line_args(struct list_head
*arg_head
,
711 struct list_head
*new_trailer_head
)
713 struct arg_item
*item
;
714 struct strbuf tok
= STRBUF_INIT
;
715 struct strbuf val
= STRBUF_INIT
;
716 const struct conf_info
*conf
;
717 struct list_head
*pos
;
720 * In command-line arguments, '=' is accepted (in addition to the
721 * separators that are defined).
723 char *cl_separators
= xstrfmt("=%s", separators
);
725 /* Add an arg item for each configured trailer with a command */
726 list_for_each(pos
, &conf_head
) {
727 item
= list_entry(pos
, struct arg_item
, list
);
728 if (item
->conf
.command
)
729 add_arg_item(arg_head
,
730 xstrdup(token_from_item(item
, NULL
)),
735 /* Add an arg item for each trailer on the command line */
736 list_for_each(pos
, new_trailer_head
) {
737 struct new_trailer_item
*tr
=
738 list_entry(pos
, struct new_trailer_item
, list
);
739 ssize_t separator_pos
= find_separator(tr
->text
, cl_separators
);
741 if (separator_pos
== 0) {
742 struct strbuf sb
= STRBUF_INIT
;
743 strbuf_addstr(&sb
, tr
->text
);
745 error(_("empty trailer token in trailer '%.*s'"),
746 (int) sb
.len
, sb
.buf
);
749 parse_trailer(&tok
, &val
, &conf
, tr
->text
,
751 add_arg_item(arg_head
,
752 strbuf_detach(&tok
, NULL
),
753 strbuf_detach(&val
, NULL
),
761 static void read_input_file(struct strbuf
*sb
, const char *file
)
764 if (strbuf_read_file(sb
, file
, 0) < 0)
765 die_errno(_("could not read input file '%s'"), file
);
767 if (strbuf_read(sb
, fileno(stdin
), 0) < 0)
768 die_errno(_("could not read from stdin"));
772 static const char *next_line(const char *str
)
774 const char *nl
= strchrnul(str
, '\n');
779 * Return the position of the start of the last line. If len is 0, return -1.
781 static ssize_t
last_line(const char *buf
, size_t len
)
789 * Skip the last character (in addition to the null terminator),
790 * because if the last character is a newline, it is considered as part
791 * of the last line anyway.
795 for (; i
>= 0; i
--) {
803 * Return the position of the start of the patch or the length of str if there
804 * is no patch in the message.
806 static size_t find_patch_start(const char *str
)
810 for (s
= str
; *s
; s
= next_line(s
)) {
813 if (skip_prefix(s
, "---", &v
) && isspace(*v
))
821 * Return the position of the first trailer line or len if there are no
824 static size_t find_trailer_start(const char *buf
, size_t len
)
827 ssize_t end_of_title
, l
;
829 int recognized_prefix
= 0, trailer_lines
= 0, non_trailer_lines
= 0;
831 * Number of possible continuation lines encountered. This will be
832 * reset to 0 if we encounter a trailer (since those lines are to be
833 * considered continuations of that trailer), and added to
834 * non_trailer_lines if we encounter a non-trailer (since those lines
835 * are to be considered non-trailers).
837 int possible_continuation_lines
= 0;
839 /* The first paragraph is the title and cannot be trailers */
840 for (s
= buf
; s
< buf
+ len
; s
= next_line(s
)) {
841 if (s
[0] == comment_line_char
)
843 if (is_blank_line(s
))
846 end_of_title
= s
- buf
;
849 * Get the start of the trailers by looking starting from the end for a
850 * blank line before a set of non-blank lines that (i) are all
851 * trailers, or (ii) contains at least one Git-generated trailer and
852 * consists of at least 25% trailers.
854 for (l
= last_line(buf
, len
);
856 l
= last_line(buf
, l
)) {
857 const char *bol
= buf
+ l
;
859 ssize_t separator_pos
;
861 if (bol
[0] == comment_line_char
) {
862 non_trailer_lines
+= possible_continuation_lines
;
863 possible_continuation_lines
= 0;
866 if (is_blank_line(bol
)) {
869 non_trailer_lines
+= possible_continuation_lines
;
870 if (recognized_prefix
&&
871 trailer_lines
* 3 >= non_trailer_lines
)
872 return next_line(bol
) - buf
;
873 else if (trailer_lines
&& !non_trailer_lines
)
874 return next_line(bol
) - buf
;
879 for (p
= git_generated_prefixes
; *p
; p
++) {
880 if (starts_with(bol
, *p
)) {
882 possible_continuation_lines
= 0;
883 recognized_prefix
= 1;
884 goto continue_outer_loop
;
888 separator_pos
= find_separator(bol
, separators
);
889 if (separator_pos
>= 1 && !isspace(bol
[0])) {
890 struct list_head
*pos
;
893 possible_continuation_lines
= 0;
894 if (recognized_prefix
)
896 list_for_each(pos
, &conf_head
) {
897 struct arg_item
*item
;
898 item
= list_entry(pos
, struct arg_item
, list
);
899 if (token_matches_item(bol
, item
,
901 recognized_prefix
= 1;
905 } else if (isspace(bol
[0]))
906 possible_continuation_lines
++;
909 non_trailer_lines
+= possible_continuation_lines
;
910 possible_continuation_lines
= 0;
919 /* Return the position of the end of the trailers. */
920 static size_t find_trailer_end(const char *buf
, size_t len
)
922 return len
- ignore_non_trailer(buf
, len
);
925 static int ends_with_blank_line(const char *buf
, size_t len
)
927 ssize_t ll
= last_line(buf
, len
);
930 return is_blank_line(buf
+ ll
);
933 static void unfold_value(struct strbuf
*val
)
935 struct strbuf out
= STRBUF_INIT
;
938 strbuf_grow(&out
, val
->len
);
940 while (i
< val
->len
) {
941 char c
= val
->buf
[i
++];
943 /* Collapse continuation down to a single space. */
944 while (i
< val
->len
&& isspace(val
->buf
[i
]))
946 strbuf_addch(&out
, ' ');
948 strbuf_addch(&out
, c
);
952 /* Empty lines may have left us with whitespace cruft at the edges */
955 /* output goes back to val as if we modified it in-place */
956 strbuf_swap(&out
, val
);
957 strbuf_release(&out
);
960 static size_t process_input_file(FILE *outfile
,
962 struct list_head
*head
,
963 const struct process_trailer_options
*opts
)
965 struct trailer_info info
;
966 struct strbuf tok
= STRBUF_INIT
;
967 struct strbuf val
= STRBUF_INIT
;
970 trailer_info_get(&info
, str
, opts
);
972 /* Print lines before the trailers as is */
973 if (!opts
->only_trailers
)
974 fwrite(str
, 1, info
.trailer_start
- str
, outfile
);
976 if (!opts
->only_trailers
&& !info
.blank_line_before_trailer
)
977 fprintf(outfile
, "\n");
979 for (i
= 0; i
< info
.trailer_nr
; i
++) {
981 char *trailer
= info
.trailers
[i
];
982 if (trailer
[0] == comment_line_char
)
984 separator_pos
= find_separator(trailer
, separators
);
985 if (separator_pos
>= 1) {
986 parse_trailer(&tok
, &val
, NULL
, trailer
,
990 add_trailer_item(head
,
991 strbuf_detach(&tok
, NULL
),
992 strbuf_detach(&val
, NULL
));
993 } else if (!opts
->only_trailers
) {
994 strbuf_addstr(&val
, trailer
);
995 strbuf_strip_suffix(&val
, "\n");
996 add_trailer_item(head
,
998 strbuf_detach(&val
, NULL
));
1002 trailer_info_release(&info
);
1004 return info
.trailer_end
- str
;
1007 static void free_all(struct list_head
*head
)
1009 struct list_head
*pos
, *p
;
1010 list_for_each_safe(pos
, p
, head
) {
1012 free_trailer_item(list_entry(pos
, struct trailer_item
, list
));
1016 static struct tempfile
*trailers_tempfile
;
1018 static FILE *create_in_place_tempfile(const char *file
)
1021 struct strbuf filename_template
= STRBUF_INIT
;
1025 if (stat(file
, &st
))
1026 die_errno(_("could not stat %s"), file
);
1027 if (!S_ISREG(st
.st_mode
))
1028 die(_("file %s is not a regular file"), file
);
1029 if (!(st
.st_mode
& S_IWUSR
))
1030 die(_("file %s is not writable by user"), file
);
1032 /* Create temporary file in the same directory as the original */
1033 tail
= strrchr(file
, '/');
1035 strbuf_add(&filename_template
, file
, tail
- file
+ 1);
1036 strbuf_addstr(&filename_template
, "git-interpret-trailers-XXXXXX");
1038 trailers_tempfile
= xmks_tempfile_m(filename_template
.buf
, st
.st_mode
);
1039 strbuf_release(&filename_template
);
1040 outfile
= fdopen_tempfile(trailers_tempfile
, "w");
1042 die_errno(_("could not open temporary file"));
1047 void process_trailers(const char *file
,
1048 const struct process_trailer_options
*opts
,
1049 struct list_head
*new_trailer_head
)
1052 struct strbuf sb
= STRBUF_INIT
;
1054 FILE *outfile
= stdout
;
1056 ensure_configured();
1058 read_input_file(&sb
, file
);
1061 outfile
= create_in_place_tempfile(file
);
1063 /* Print the lines before the trailers */
1064 trailer_end
= process_input_file(outfile
, sb
.buf
, &head
, opts
);
1066 if (!opts
->only_input
) {
1067 LIST_HEAD(arg_head
);
1068 process_command_line_args(&arg_head
, new_trailer_head
);
1069 process_trailers_lists(&head
, &arg_head
);
1072 print_all(outfile
, &head
, opts
);
1076 /* Print the lines after the trailers as is */
1077 if (!opts
->only_trailers
)
1078 fwrite(sb
.buf
+ trailer_end
, 1, sb
.len
- trailer_end
, outfile
);
1081 if (rename_tempfile(&trailers_tempfile
, file
))
1082 die_errno(_("could not rename temporary file to %s"), file
);
1084 strbuf_release(&sb
);
1087 void trailer_info_get(struct trailer_info
*info
, const char *str
,
1088 const struct process_trailer_options
*opts
)
1090 int patch_start
, trailer_end
, trailer_start
;
1091 struct strbuf
**trailer_lines
, **ptr
;
1092 char **trailer_strings
= NULL
;
1093 size_t nr
= 0, alloc
= 0;
1096 ensure_configured();
1098 if (opts
->no_divider
)
1099 patch_start
= strlen(str
);
1101 patch_start
= find_patch_start(str
);
1103 trailer_end
= find_trailer_end(str
, patch_start
);
1104 trailer_start
= find_trailer_start(str
, trailer_end
);
1106 trailer_lines
= strbuf_split_buf(str
+ trailer_start
,
1107 trailer_end
- trailer_start
,
1110 for (ptr
= trailer_lines
; *ptr
; ptr
++) {
1111 if (last
&& isspace((*ptr
)->buf
[0])) {
1112 struct strbuf sb
= STRBUF_INIT
;
1113 strbuf_attach(&sb
, *last
, strlen(*last
), strlen(*last
));
1114 strbuf_addbuf(&sb
, *ptr
);
1115 *last
= strbuf_detach(&sb
, NULL
);
1118 ALLOC_GROW(trailer_strings
, nr
+ 1, alloc
);
1119 trailer_strings
[nr
] = strbuf_detach(*ptr
, NULL
);
1120 last
= find_separator(trailer_strings
[nr
], separators
) >= 1
1121 ? &trailer_strings
[nr
]
1125 strbuf_list_free(trailer_lines
);
1127 info
->blank_line_before_trailer
= ends_with_blank_line(str
,
1129 info
->trailer_start
= str
+ trailer_start
;
1130 info
->trailer_end
= str
+ trailer_end
;
1131 info
->trailers
= trailer_strings
;
1132 info
->trailer_nr
= nr
;
1135 void trailer_info_release(struct trailer_info
*info
)
1138 for (i
= 0; i
< info
->trailer_nr
; i
++)
1139 free(info
->trailers
[i
]);
1140 free(info
->trailers
);
1143 static void format_trailer_info(struct strbuf
*out
,
1144 const struct trailer_info
*info
,
1145 const struct process_trailer_options
*opts
)
1147 size_t origlen
= out
->len
;
1150 /* If we want the whole block untouched, we can take the fast path. */
1151 if (!opts
->only_trailers
&& !opts
->unfold
&& !opts
->filter
&&
1152 !opts
->separator
&& !opts
->key_only
&& !opts
->value_only
&&
1153 !opts
->key_value_separator
) {
1154 strbuf_add(out
, info
->trailer_start
,
1155 info
->trailer_end
- info
->trailer_start
);
1159 for (i
= 0; i
< info
->trailer_nr
; i
++) {
1160 char *trailer
= info
->trailers
[i
];
1161 ssize_t separator_pos
= find_separator(trailer
, separators
);
1163 if (separator_pos
>= 1) {
1164 struct strbuf tok
= STRBUF_INIT
;
1165 struct strbuf val
= STRBUF_INIT
;
1167 parse_trailer(&tok
, &val
, NULL
, trailer
, separator_pos
);
1168 if (!opts
->filter
|| opts
->filter(&tok
, opts
->filter_data
)) {
1172 if (opts
->separator
&& out
->len
!= origlen
)
1173 strbuf_addbuf(out
, opts
->separator
);
1174 if (!opts
->value_only
)
1175 strbuf_addbuf(out
, &tok
);
1176 if (!opts
->key_only
&& !opts
->value_only
) {
1177 if (opts
->key_value_separator
)
1178 strbuf_addbuf(out
, opts
->key_value_separator
);
1180 strbuf_addstr(out
, ": ");
1182 if (!opts
->key_only
)
1183 strbuf_addbuf(out
, &val
);
1184 if (!opts
->separator
)
1185 strbuf_addch(out
, '\n');
1187 strbuf_release(&tok
);
1188 strbuf_release(&val
);
1190 } else if (!opts
->only_trailers
) {
1191 if (opts
->separator
&& out
->len
!= origlen
) {
1192 strbuf_addbuf(out
, opts
->separator
);
1194 strbuf_addstr(out
, trailer
);
1195 if (opts
->separator
) {
1203 void format_trailers_from_commit(struct strbuf
*out
, const char *msg
,
1204 const struct process_trailer_options
*opts
)
1206 struct trailer_info info
;
1208 trailer_info_get(&info
, msg
, opts
);
1209 format_trailer_info(out
, &info
, opts
);
1210 trailer_info_release(&info
);
1213 void trailer_iterator_init(struct trailer_iterator
*iter
, const char *msg
)
1215 struct process_trailer_options opts
= PROCESS_TRAILER_OPTIONS_INIT
;
1216 strbuf_init(&iter
->key
, 0);
1217 strbuf_init(&iter
->val
, 0);
1218 opts
.no_divider
= 1;
1219 trailer_info_get(&iter
->info
, msg
, &opts
);
1223 int trailer_iterator_advance(struct trailer_iterator
*iter
)
1225 while (iter
->cur
< iter
->info
.trailer_nr
) {
1226 char *trailer
= iter
->info
.trailers
[iter
->cur
++];
1227 int separator_pos
= find_separator(trailer
, separators
);
1229 if (separator_pos
< 1)
1230 continue; /* not a real trailer */
1232 strbuf_reset(&iter
->key
);
1233 strbuf_reset(&iter
->val
);
1234 parse_trailer(&iter
->key
, &iter
->val
, NULL
,
1235 trailer
, separator_pos
);
1236 unfold_value(&iter
->val
);
1242 void trailer_iterator_release(struct trailer_iterator
*iter
)
1244 trailer_info_release(&iter
->info
);
1245 strbuf_release(&iter
->val
);
1246 strbuf_release(&iter
->key
);