format-patch: simplify after-subject MIME header handling
[git.git] / trailer.c
blobef9df4af558fbb18849279cff2e67507026af106
1 #include "git-compat-util.h"
2 #include "config.h"
3 #include "environment.h"
4 #include "gettext.h"
5 #include "string-list.h"
6 #include "run-command.h"
7 #include "commit.h"
8 #include "tempfile.h"
9 #include "trailer.h"
10 #include "list.h"
12 * Copyright (c) 2013, 2014 Christian Couder <chriscool@tuxfamily.org>
15 struct conf_info {
16 char *name;
17 char *key;
18 char *command;
19 char *cmd;
20 enum trailer_where where;
21 enum trailer_if_exists if_exists;
22 enum trailer_if_missing if_missing;
25 static struct conf_info default_conf_info;
27 struct trailer_item {
28 struct list_head list;
30 * If this is not a trailer line, the line is stored in value
31 * (excluding the terminating newline) and token is NULL.
33 char *token;
34 char *value;
37 struct arg_item {
38 struct list_head list;
39 char *token;
40 char *value;
41 struct conf_info conf;
44 static LIST_HEAD(conf_head);
46 static char *separators = ":";
48 static int configured;
50 #define TRAILER_ARG_STRING "$ARG"
52 static const char *git_generated_prefixes[] = {
53 "Signed-off-by: ",
54 "(cherry picked from commit ",
55 NULL
58 /* Iterate over the elements of the list. */
59 #define list_for_each_dir(pos, head, is_reverse) \
60 for (pos = is_reverse ? (head)->prev : (head)->next; \
61 pos != (head); \
62 pos = is_reverse ? pos->prev : pos->next)
64 static int after_or_end(enum trailer_where where)
66 return (where == WHERE_AFTER) || (where == WHERE_END);
70 * Return the length of the string not including any final
71 * punctuation. E.g., the input "Signed-off-by:" would return
72 * 13, stripping the trailing punctuation but retaining
73 * internal punctuation.
75 static size_t token_len_without_separator(const char *token, size_t len)
77 while (len > 0 && !isalnum(token[len - 1]))
78 len--;
79 return len;
82 static int same_token(struct trailer_item *a, struct arg_item *b)
84 size_t a_len, b_len, min_len;
86 if (!a->token)
87 return 0;
89 a_len = token_len_without_separator(a->token, strlen(a->token));
90 b_len = token_len_without_separator(b->token, strlen(b->token));
91 min_len = (a_len > b_len) ? b_len : a_len;
93 return !strncasecmp(a->token, b->token, min_len);
96 static int same_value(struct trailer_item *a, struct arg_item *b)
98 return !strcasecmp(a->value, b->value);
101 static int same_trailer(struct trailer_item *a, struct arg_item *b)
103 return same_token(a, b) && same_value(a, b);
106 static inline int is_blank_line(const char *str)
108 const char *s = str;
109 while (*s && *s != '\n' && isspace(*s))
110 s++;
111 return !*s || *s == '\n';
114 static inline void strbuf_replace(struct strbuf *sb, const char *a, const char *b)
116 const char *ptr = strstr(sb->buf, a);
117 if (ptr)
118 strbuf_splice(sb, ptr - sb->buf, strlen(a), b, strlen(b));
121 static void free_trailer_item(struct trailer_item *item)
123 free(item->token);
124 free(item->value);
125 free(item);
128 static void free_arg_item(struct arg_item *item)
130 free(item->conf.name);
131 free(item->conf.key);
132 free(item->conf.command);
133 free(item->conf.cmd);
134 free(item->token);
135 free(item->value);
136 free(item);
139 static char last_non_space_char(const char *s)
141 int i;
142 for (i = strlen(s) - 1; i >= 0; i--)
143 if (!isspace(s[i]))
144 return s[i];
145 return '\0';
148 static void print_tok_val(FILE *outfile, const char *tok, const char *val)
150 char c;
152 if (!tok) {
153 fprintf(outfile, "%s\n", val);
154 return;
157 c = last_non_space_char(tok);
158 if (!c)
159 return;
160 if (strchr(separators, c))
161 fprintf(outfile, "%s%s\n", tok, val);
162 else
163 fprintf(outfile, "%s%c %s\n", tok, separators[0], val);
166 static void print_all(FILE *outfile, struct list_head *head,
167 const struct process_trailer_options *opts)
169 struct list_head *pos;
170 struct trailer_item *item;
171 list_for_each(pos, head) {
172 item = list_entry(pos, struct trailer_item, list);
173 if ((!opts->trim_empty || strlen(item->value) > 0) &&
174 (!opts->only_trailers || item->token))
175 print_tok_val(outfile, item->token, item->value);
179 static struct trailer_item *trailer_from_arg(struct arg_item *arg_tok)
181 struct trailer_item *new_item = xcalloc(1, sizeof(*new_item));
182 new_item->token = arg_tok->token;
183 new_item->value = arg_tok->value;
184 arg_tok->token = arg_tok->value = NULL;
185 free_arg_item(arg_tok);
186 return new_item;
189 static void add_arg_to_input_list(struct trailer_item *on_tok,
190 struct arg_item *arg_tok)
192 int aoe = after_or_end(arg_tok->conf.where);
193 struct trailer_item *to_add = trailer_from_arg(arg_tok);
194 if (aoe)
195 list_add(&to_add->list, &on_tok->list);
196 else
197 list_add_tail(&to_add->list, &on_tok->list);
200 static int check_if_different(struct trailer_item *in_tok,
201 struct arg_item *arg_tok,
202 int check_all,
203 struct list_head *head)
205 enum trailer_where where = arg_tok->conf.where;
206 struct list_head *next_head;
207 do {
208 if (same_trailer(in_tok, arg_tok))
209 return 0;
211 * if we want to add a trailer after another one,
212 * we have to check those before this one
214 next_head = after_or_end(where) ? in_tok->list.prev
215 : in_tok->list.next;
216 if (next_head == head)
217 break;
218 in_tok = list_entry(next_head, struct trailer_item, list);
219 } while (check_all);
220 return 1;
223 static char *apply_command(struct conf_info *conf, const char *arg)
225 struct strbuf cmd = STRBUF_INIT;
226 struct strbuf buf = STRBUF_INIT;
227 struct child_process cp = CHILD_PROCESS_INIT;
228 char *result;
230 if (conf->cmd) {
231 strbuf_addstr(&cmd, conf->cmd);
232 strvec_push(&cp.args, cmd.buf);
233 if (arg)
234 strvec_push(&cp.args, arg);
235 } else if (conf->command) {
236 strbuf_addstr(&cmd, conf->command);
237 if (arg)
238 strbuf_replace(&cmd, TRAILER_ARG_STRING, arg);
239 strvec_push(&cp.args, cmd.buf);
241 strvec_pushv(&cp.env, (const char **)local_repo_env);
242 cp.no_stdin = 1;
243 cp.use_shell = 1;
245 if (capture_command(&cp, &buf, 1024)) {
246 error(_("running trailer command '%s' failed"), cmd.buf);
247 strbuf_release(&buf);
248 result = xstrdup("");
249 } else {
250 strbuf_trim(&buf);
251 result = strbuf_detach(&buf, NULL);
254 strbuf_release(&cmd);
255 return result;
258 static void apply_item_command(struct trailer_item *in_tok, struct arg_item *arg_tok)
260 if (arg_tok->conf.command || arg_tok->conf.cmd) {
261 const char *arg;
262 if (arg_tok->value && arg_tok->value[0]) {
263 arg = arg_tok->value;
264 } else {
265 if (in_tok && in_tok->value)
266 arg = xstrdup(in_tok->value);
267 else
268 arg = xstrdup("");
270 arg_tok->value = apply_command(&arg_tok->conf, arg);
271 free((char *)arg);
275 static void apply_arg_if_exists(struct trailer_item *in_tok,
276 struct arg_item *arg_tok,
277 struct trailer_item *on_tok,
278 struct list_head *head)
280 switch (arg_tok->conf.if_exists) {
281 case EXISTS_DO_NOTHING:
282 free_arg_item(arg_tok);
283 break;
284 case EXISTS_REPLACE:
285 apply_item_command(in_tok, arg_tok);
286 add_arg_to_input_list(on_tok, arg_tok);
287 list_del(&in_tok->list);
288 free_trailer_item(in_tok);
289 break;
290 case EXISTS_ADD:
291 apply_item_command(in_tok, arg_tok);
292 add_arg_to_input_list(on_tok, arg_tok);
293 break;
294 case EXISTS_ADD_IF_DIFFERENT:
295 apply_item_command(in_tok, arg_tok);
296 if (check_if_different(in_tok, arg_tok, 1, head))
297 add_arg_to_input_list(on_tok, arg_tok);
298 else
299 free_arg_item(arg_tok);
300 break;
301 case EXISTS_ADD_IF_DIFFERENT_NEIGHBOR:
302 apply_item_command(in_tok, arg_tok);
303 if (check_if_different(on_tok, arg_tok, 0, head))
304 add_arg_to_input_list(on_tok, arg_tok);
305 else
306 free_arg_item(arg_tok);
307 break;
308 default:
309 BUG("trailer.c: unhandled value %d",
310 arg_tok->conf.if_exists);
314 static void apply_arg_if_missing(struct list_head *head,
315 struct arg_item *arg_tok)
317 enum trailer_where where;
318 struct trailer_item *to_add;
320 switch (arg_tok->conf.if_missing) {
321 case MISSING_DO_NOTHING:
322 free_arg_item(arg_tok);
323 break;
324 case MISSING_ADD:
325 where = arg_tok->conf.where;
326 apply_item_command(NULL, arg_tok);
327 to_add = trailer_from_arg(arg_tok);
328 if (after_or_end(where))
329 list_add_tail(&to_add->list, head);
330 else
331 list_add(&to_add->list, head);
332 break;
333 default:
334 BUG("trailer.c: unhandled value %d",
335 arg_tok->conf.if_missing);
339 static int find_same_and_apply_arg(struct list_head *head,
340 struct arg_item *arg_tok)
342 struct list_head *pos;
343 struct trailer_item *in_tok;
344 struct trailer_item *on_tok;
346 enum trailer_where where = arg_tok->conf.where;
347 int middle = (where == WHERE_AFTER) || (where == WHERE_BEFORE);
348 int backwards = after_or_end(where);
349 struct trailer_item *start_tok;
351 if (list_empty(head))
352 return 0;
354 start_tok = list_entry(backwards ? head->prev : head->next,
355 struct trailer_item,
356 list);
358 list_for_each_dir(pos, head, backwards) {
359 in_tok = list_entry(pos, struct trailer_item, list);
360 if (!same_token(in_tok, arg_tok))
361 continue;
362 on_tok = middle ? in_tok : start_tok;
363 apply_arg_if_exists(in_tok, arg_tok, on_tok, head);
364 return 1;
366 return 0;
369 static void process_trailers_lists(struct list_head *head,
370 struct list_head *arg_head)
372 struct list_head *pos, *p;
373 struct arg_item *arg_tok;
375 list_for_each_safe(pos, p, arg_head) {
376 int applied = 0;
377 arg_tok = list_entry(pos, struct arg_item, list);
379 list_del(pos);
381 applied = find_same_and_apply_arg(head, arg_tok);
383 if (!applied)
384 apply_arg_if_missing(head, arg_tok);
388 int trailer_set_where(enum trailer_where *item, const char *value)
390 if (!value)
391 *item = WHERE_DEFAULT;
392 else if (!strcasecmp("after", value))
393 *item = WHERE_AFTER;
394 else if (!strcasecmp("before", value))
395 *item = WHERE_BEFORE;
396 else if (!strcasecmp("end", value))
397 *item = WHERE_END;
398 else if (!strcasecmp("start", value))
399 *item = WHERE_START;
400 else
401 return -1;
402 return 0;
405 int trailer_set_if_exists(enum trailer_if_exists *item, const char *value)
407 if (!value)
408 *item = EXISTS_DEFAULT;
409 else if (!strcasecmp("addIfDifferent", value))
410 *item = EXISTS_ADD_IF_DIFFERENT;
411 else if (!strcasecmp("addIfDifferentNeighbor", value))
412 *item = EXISTS_ADD_IF_DIFFERENT_NEIGHBOR;
413 else if (!strcasecmp("add", value))
414 *item = EXISTS_ADD;
415 else if (!strcasecmp("replace", value))
416 *item = EXISTS_REPLACE;
417 else if (!strcasecmp("doNothing", value))
418 *item = EXISTS_DO_NOTHING;
419 else
420 return -1;
421 return 0;
424 int trailer_set_if_missing(enum trailer_if_missing *item, const char *value)
426 if (!value)
427 *item = MISSING_DEFAULT;
428 else if (!strcasecmp("doNothing", value))
429 *item = MISSING_DO_NOTHING;
430 else if (!strcasecmp("add", value))
431 *item = MISSING_ADD;
432 else
433 return -1;
434 return 0;
437 static void duplicate_conf(struct conf_info *dst, const struct conf_info *src)
439 *dst = *src;
440 dst->name = xstrdup_or_null(src->name);
441 dst->key = xstrdup_or_null(src->key);
442 dst->command = xstrdup_or_null(src->command);
443 dst->cmd = xstrdup_or_null(src->cmd);
446 static struct arg_item *get_conf_item(const char *name)
448 struct list_head *pos;
449 struct arg_item *item;
451 /* Look up item with same name */
452 list_for_each(pos, &conf_head) {
453 item = list_entry(pos, struct arg_item, list);
454 if (!strcasecmp(item->conf.name, name))
455 return item;
458 /* Item does not already exists, create it */
459 CALLOC_ARRAY(item, 1);
460 duplicate_conf(&item->conf, &default_conf_info);
461 item->conf.name = xstrdup(name);
463 list_add_tail(&item->list, &conf_head);
465 return item;
468 enum trailer_info_type { TRAILER_KEY, TRAILER_COMMAND, TRAILER_CMD,
469 TRAILER_WHERE, TRAILER_IF_EXISTS, TRAILER_IF_MISSING };
471 static struct {
472 const char *name;
473 enum trailer_info_type type;
474 } trailer_config_items[] = {
475 { "key", TRAILER_KEY },
476 { "command", TRAILER_COMMAND },
477 { "cmd", TRAILER_CMD },
478 { "where", TRAILER_WHERE },
479 { "ifexists", TRAILER_IF_EXISTS },
480 { "ifmissing", TRAILER_IF_MISSING }
483 static int git_trailer_default_config(const char *conf_key, const char *value,
484 const struct config_context *ctx UNUSED,
485 void *cb UNUSED)
487 const char *trailer_item, *variable_name;
489 if (!skip_prefix(conf_key, "trailer.", &trailer_item))
490 return 0;
492 variable_name = strrchr(trailer_item, '.');
493 if (!variable_name) {
494 if (!strcmp(trailer_item, "where")) {
495 if (trailer_set_where(&default_conf_info.where,
496 value) < 0)
497 warning(_("unknown value '%s' for key '%s'"),
498 value, conf_key);
499 } else if (!strcmp(trailer_item, "ifexists")) {
500 if (trailer_set_if_exists(&default_conf_info.if_exists,
501 value) < 0)
502 warning(_("unknown value '%s' for key '%s'"),
503 value, conf_key);
504 } else if (!strcmp(trailer_item, "ifmissing")) {
505 if (trailer_set_if_missing(&default_conf_info.if_missing,
506 value) < 0)
507 warning(_("unknown value '%s' for key '%s'"),
508 value, conf_key);
509 } else if (!strcmp(trailer_item, "separators")) {
510 if (!value)
511 return config_error_nonbool(conf_key);
512 separators = xstrdup(value);
515 return 0;
518 static int git_trailer_config(const char *conf_key, const char *value,
519 const struct config_context *ctx UNUSED,
520 void *cb UNUSED)
522 const char *trailer_item, *variable_name;
523 struct arg_item *item;
524 struct conf_info *conf;
525 char *name = NULL;
526 enum trailer_info_type type;
527 int i;
529 if (!skip_prefix(conf_key, "trailer.", &trailer_item))
530 return 0;
532 variable_name = strrchr(trailer_item, '.');
533 if (!variable_name)
534 return 0;
536 variable_name++;
537 for (i = 0; i < ARRAY_SIZE(trailer_config_items); i++) {
538 if (strcmp(trailer_config_items[i].name, variable_name))
539 continue;
540 name = xstrndup(trailer_item, variable_name - trailer_item - 1);
541 type = trailer_config_items[i].type;
542 break;
545 if (!name)
546 return 0;
548 item = get_conf_item(name);
549 conf = &item->conf;
550 free(name);
552 switch (type) {
553 case TRAILER_KEY:
554 if (conf->key)
555 warning(_("more than one %s"), conf_key);
556 if (!value)
557 return config_error_nonbool(conf_key);
558 conf->key = xstrdup(value);
559 break;
560 case TRAILER_COMMAND:
561 if (conf->command)
562 warning(_("more than one %s"), conf_key);
563 if (!value)
564 return config_error_nonbool(conf_key);
565 conf->command = xstrdup(value);
566 break;
567 case TRAILER_CMD:
568 if (conf->cmd)
569 warning(_("more than one %s"), conf_key);
570 if (!value)
571 return config_error_nonbool(conf_key);
572 conf->cmd = xstrdup(value);
573 break;
574 case TRAILER_WHERE:
575 if (trailer_set_where(&conf->where, value))
576 warning(_("unknown value '%s' for key '%s'"), value, conf_key);
577 break;
578 case TRAILER_IF_EXISTS:
579 if (trailer_set_if_exists(&conf->if_exists, value))
580 warning(_("unknown value '%s' for key '%s'"), value, conf_key);
581 break;
582 case TRAILER_IF_MISSING:
583 if (trailer_set_if_missing(&conf->if_missing, value))
584 warning(_("unknown value '%s' for key '%s'"), value, conf_key);
585 break;
586 default:
587 BUG("trailer.c: unhandled type %d", type);
589 return 0;
592 static void ensure_configured(void)
594 if (configured)
595 return;
597 /* Default config must be setup first */
598 default_conf_info.where = WHERE_END;
599 default_conf_info.if_exists = EXISTS_ADD_IF_DIFFERENT_NEIGHBOR;
600 default_conf_info.if_missing = MISSING_ADD;
601 git_config(git_trailer_default_config, NULL);
602 git_config(git_trailer_config, NULL);
603 configured = 1;
606 static const char *token_from_item(struct arg_item *item, char *tok)
608 if (item->conf.key)
609 return item->conf.key;
610 if (tok)
611 return tok;
612 return item->conf.name;
615 static int token_matches_item(const char *tok, struct arg_item *item, size_t tok_len)
617 if (!strncasecmp(tok, item->conf.name, tok_len))
618 return 1;
619 return item->conf.key ? !strncasecmp(tok, item->conf.key, tok_len) : 0;
623 * If the given line is of the form
624 * "<token><optional whitespace><separator>..." or "<separator>...", return the
625 * location of the separator. Otherwise, return -1. The optional whitespace
626 * is allowed there primarily to allow things like "Bug #43" where <token> is
627 * "Bug" and <separator> is "#".
629 * The separator-starts-line case (in which this function returns 0) is
630 * distinguished from the non-well-formed-line case (in which this function
631 * returns -1) because some callers of this function need such a distinction.
633 static ssize_t find_separator(const char *line, const char *separators)
635 int whitespace_found = 0;
636 const char *c;
637 for (c = line; *c; c++) {
638 if (strchr(separators, *c))
639 return c - line;
640 if (!whitespace_found && (isalnum(*c) || *c == '-'))
641 continue;
642 if (c != line && (*c == ' ' || *c == '\t')) {
643 whitespace_found = 1;
644 continue;
646 break;
648 return -1;
652 * Obtain the token, value, and conf from the given trailer.
654 * separator_pos must not be 0, since the token cannot be an empty string.
656 * If separator_pos is -1, interpret the whole trailer as a token.
658 static void parse_trailer(struct strbuf *tok, struct strbuf *val,
659 const struct conf_info **conf, const char *trailer,
660 ssize_t separator_pos)
662 struct arg_item *item;
663 size_t tok_len;
664 struct list_head *pos;
666 if (separator_pos != -1) {
667 strbuf_add(tok, trailer, separator_pos);
668 strbuf_trim(tok);
669 strbuf_addstr(val, trailer + separator_pos + 1);
670 strbuf_trim(val);
671 } else {
672 strbuf_addstr(tok, trailer);
673 strbuf_trim(tok);
676 /* Lookup if the token matches something in the config */
677 tok_len = token_len_without_separator(tok->buf, tok->len);
678 if (conf)
679 *conf = &default_conf_info;
680 list_for_each(pos, &conf_head) {
681 item = list_entry(pos, struct arg_item, list);
682 if (token_matches_item(tok->buf, item, tok_len)) {
683 char *tok_buf = strbuf_detach(tok, NULL);
684 if (conf)
685 *conf = &item->conf;
686 strbuf_addstr(tok, token_from_item(item, tok_buf));
687 free(tok_buf);
688 break;
693 static struct trailer_item *add_trailer_item(struct list_head *head, char *tok,
694 char *val)
696 struct trailer_item *new_item = xcalloc(1, sizeof(*new_item));
697 new_item->token = tok;
698 new_item->value = val;
699 list_add_tail(&new_item->list, head);
700 return new_item;
703 static void add_arg_item(struct list_head *arg_head, char *tok, char *val,
704 const struct conf_info *conf,
705 const struct new_trailer_item *new_trailer_item)
707 struct arg_item *new_item = xcalloc(1, sizeof(*new_item));
708 new_item->token = tok;
709 new_item->value = val;
710 duplicate_conf(&new_item->conf, conf);
711 if (new_trailer_item) {
712 if (new_trailer_item->where != WHERE_DEFAULT)
713 new_item->conf.where = new_trailer_item->where;
714 if (new_trailer_item->if_exists != EXISTS_DEFAULT)
715 new_item->conf.if_exists = new_trailer_item->if_exists;
716 if (new_trailer_item->if_missing != MISSING_DEFAULT)
717 new_item->conf.if_missing = new_trailer_item->if_missing;
719 list_add_tail(&new_item->list, arg_head);
722 static void parse_trailers_from_config(struct list_head *config_head)
724 struct arg_item *item;
725 struct list_head *pos;
727 /* Add an arg item for each configured trailer with a command */
728 list_for_each(pos, &conf_head) {
729 item = list_entry(pos, struct arg_item, list);
730 if (item->conf.command)
731 add_arg_item(config_head,
732 xstrdup(token_from_item(item, NULL)),
733 xstrdup(""),
734 &item->conf, NULL);
738 static void parse_trailers_from_command_line_args(struct list_head *arg_head,
739 struct list_head *new_trailer_head)
741 struct strbuf tok = STRBUF_INIT;
742 struct strbuf val = STRBUF_INIT;
743 const struct conf_info *conf;
744 struct list_head *pos;
747 * In command-line arguments, '=' is accepted (in addition to the
748 * separators that are defined).
750 char *cl_separators = xstrfmt("=%s", separators);
752 /* Add an arg item for each trailer on the command line */
753 list_for_each(pos, new_trailer_head) {
754 struct new_trailer_item *tr =
755 list_entry(pos, struct new_trailer_item, list);
756 ssize_t separator_pos = find_separator(tr->text, cl_separators);
758 if (separator_pos == 0) {
759 struct strbuf sb = STRBUF_INIT;
760 strbuf_addstr(&sb, tr->text);
761 strbuf_trim(&sb);
762 error(_("empty trailer token in trailer '%.*s'"),
763 (int) sb.len, sb.buf);
764 strbuf_release(&sb);
765 } else {
766 parse_trailer(&tok, &val, &conf, tr->text,
767 separator_pos);
768 add_arg_item(arg_head,
769 strbuf_detach(&tok, NULL),
770 strbuf_detach(&val, NULL),
771 conf, tr);
775 free(cl_separators);
778 static void read_input_file(struct strbuf *sb, const char *file)
780 if (file) {
781 if (strbuf_read_file(sb, file, 0) < 0)
782 die_errno(_("could not read input file '%s'"), file);
783 } else {
784 if (strbuf_read(sb, fileno(stdin), 0) < 0)
785 die_errno(_("could not read from stdin"));
789 static const char *next_line(const char *str)
791 const char *nl = strchrnul(str, '\n');
792 return nl + !!*nl;
796 * Return the position of the start of the last line. If len is 0, return -1.
798 static ssize_t last_line(const char *buf, size_t len)
800 ssize_t i;
801 if (len == 0)
802 return -1;
803 if (len == 1)
804 return 0;
806 * Skip the last character (in addition to the null terminator),
807 * because if the last character is a newline, it is considered as part
808 * of the last line anyway.
810 i = len - 2;
812 for (; i >= 0; i--) {
813 if (buf[i] == '\n')
814 return i + 1;
816 return 0;
820 * Find the end of the log message as an offset from the start of the input
821 * (where callers of this function are interested in looking for a trailers
822 * block in the same input). We have to consider two categories of content that
823 * can come at the end of the input which we want to ignore (because they don't
824 * belong in the log message):
826 * (1) the "patch part" which begins with a "---" divider and has patch
827 * information (like the output of git-format-patch), and
829 * (2) any trailing comment lines, blank lines like in the output of "git
830 * commit -v", or stuff below the "cut" (scissor) line.
832 * As a formula, the situation looks like this:
834 * INPUT = LOG MESSAGE + IGNORED
836 * where IGNORED can be either of the two categories described above. It may be
837 * that there is nothing to ignore. Now it may be the case that the LOG MESSAGE
838 * contains a trailer block, but that's not the concern of this function.
840 static size_t find_end_of_log_message(const char *input, int no_divider)
842 size_t end;
843 const char *s;
845 /* Assume the naive end of the input is already what we want. */
846 end = strlen(input);
848 /* Optionally skip over any patch part ("---" line and below). */
849 if (!no_divider) {
850 for (s = input; *s; s = next_line(s)) {
851 const char *v;
853 if (skip_prefix(s, "---", &v) && isspace(*v)) {
854 end = s - input;
855 break;
860 /* Skip over other ignorable bits. */
861 return end - ignored_log_message_bytes(input, end);
865 * Return the position of the first trailer line or len if there are no
866 * trailers.
868 static size_t find_trailer_block_start(const char *buf, size_t len)
870 const char *s;
871 ssize_t end_of_title, l;
872 int only_spaces = 1;
873 int recognized_prefix = 0, trailer_lines = 0, non_trailer_lines = 0;
875 * Number of possible continuation lines encountered. This will be
876 * reset to 0 if we encounter a trailer (since those lines are to be
877 * considered continuations of that trailer), and added to
878 * non_trailer_lines if we encounter a non-trailer (since those lines
879 * are to be considered non-trailers).
881 int possible_continuation_lines = 0;
883 /* The first paragraph is the title and cannot be trailers */
884 for (s = buf; s < buf + len; s = next_line(s)) {
885 if (s[0] == comment_line_char)
886 continue;
887 if (is_blank_line(s))
888 break;
890 end_of_title = s - buf;
893 * Get the start of the trailers by looking starting from the end for a
894 * blank line before a set of non-blank lines that (i) are all
895 * trailers, or (ii) contains at least one Git-generated trailer and
896 * consists of at least 25% trailers.
898 for (l = last_line(buf, len);
899 l >= end_of_title;
900 l = last_line(buf, l)) {
901 const char *bol = buf + l;
902 const char **p;
903 ssize_t separator_pos;
905 if (bol[0] == comment_line_char) {
906 non_trailer_lines += possible_continuation_lines;
907 possible_continuation_lines = 0;
908 continue;
910 if (is_blank_line(bol)) {
911 if (only_spaces)
912 continue;
913 non_trailer_lines += possible_continuation_lines;
914 if (recognized_prefix &&
915 trailer_lines * 3 >= non_trailer_lines)
916 return next_line(bol) - buf;
917 else if (trailer_lines && !non_trailer_lines)
918 return next_line(bol) - buf;
919 return len;
921 only_spaces = 0;
923 for (p = git_generated_prefixes; *p; p++) {
924 if (starts_with(bol, *p)) {
925 trailer_lines++;
926 possible_continuation_lines = 0;
927 recognized_prefix = 1;
928 goto continue_outer_loop;
932 separator_pos = find_separator(bol, separators);
933 if (separator_pos >= 1 && !isspace(bol[0])) {
934 struct list_head *pos;
936 trailer_lines++;
937 possible_continuation_lines = 0;
938 if (recognized_prefix)
939 continue;
940 list_for_each(pos, &conf_head) {
941 struct arg_item *item;
942 item = list_entry(pos, struct arg_item, list);
943 if (token_matches_item(bol, item,
944 separator_pos)) {
945 recognized_prefix = 1;
946 break;
949 } else if (isspace(bol[0]))
950 possible_continuation_lines++;
951 else {
952 non_trailer_lines++;
953 non_trailer_lines += possible_continuation_lines;
954 possible_continuation_lines = 0;
956 continue_outer_loop:
960 return len;
963 static int ends_with_blank_line(const char *buf, size_t len)
965 ssize_t ll = last_line(buf, len);
966 if (ll < 0)
967 return 0;
968 return is_blank_line(buf + ll);
971 static void unfold_value(struct strbuf *val)
973 struct strbuf out = STRBUF_INIT;
974 size_t i;
976 strbuf_grow(&out, val->len);
977 i = 0;
978 while (i < val->len) {
979 char c = val->buf[i++];
980 if (c == '\n') {
981 /* Collapse continuation down to a single space. */
982 while (i < val->len && isspace(val->buf[i]))
983 i++;
984 strbuf_addch(&out, ' ');
985 } else {
986 strbuf_addch(&out, c);
990 /* Empty lines may have left us with whitespace cruft at the edges */
991 strbuf_trim(&out);
993 /* output goes back to val as if we modified it in-place */
994 strbuf_swap(&out, val);
995 strbuf_release(&out);
999 * Parse trailers in "str", populating the trailer info and "head"
1000 * linked list structure.
1002 static void parse_trailers(struct trailer_info *info,
1003 const char *str,
1004 struct list_head *head,
1005 const struct process_trailer_options *opts)
1007 struct strbuf tok = STRBUF_INIT;
1008 struct strbuf val = STRBUF_INIT;
1009 size_t i;
1011 trailer_info_get(info, str, opts);
1013 for (i = 0; i < info->trailer_nr; i++) {
1014 int separator_pos;
1015 char *trailer = info->trailers[i];
1016 if (trailer[0] == comment_line_char)
1017 continue;
1018 separator_pos = find_separator(trailer, separators);
1019 if (separator_pos >= 1) {
1020 parse_trailer(&tok, &val, NULL, trailer,
1021 separator_pos);
1022 if (opts->unfold)
1023 unfold_value(&val);
1024 add_trailer_item(head,
1025 strbuf_detach(&tok, NULL),
1026 strbuf_detach(&val, NULL));
1027 } else if (!opts->only_trailers) {
1028 strbuf_addstr(&val, trailer);
1029 strbuf_strip_suffix(&val, "\n");
1030 add_trailer_item(head,
1031 NULL,
1032 strbuf_detach(&val, NULL));
1037 static void free_all(struct list_head *head)
1039 struct list_head *pos, *p;
1040 list_for_each_safe(pos, p, head) {
1041 list_del(pos);
1042 free_trailer_item(list_entry(pos, struct trailer_item, list));
1046 static struct tempfile *trailers_tempfile;
1048 static FILE *create_in_place_tempfile(const char *file)
1050 struct stat st;
1051 struct strbuf filename_template = STRBUF_INIT;
1052 const char *tail;
1053 FILE *outfile;
1055 if (stat(file, &st))
1056 die_errno(_("could not stat %s"), file);
1057 if (!S_ISREG(st.st_mode))
1058 die(_("file %s is not a regular file"), file);
1059 if (!(st.st_mode & S_IWUSR))
1060 die(_("file %s is not writable by user"), file);
1062 /* Create temporary file in the same directory as the original */
1063 tail = strrchr(file, '/');
1064 if (tail)
1065 strbuf_add(&filename_template, file, tail - file + 1);
1066 strbuf_addstr(&filename_template, "git-interpret-trailers-XXXXXX");
1068 trailers_tempfile = xmks_tempfile_m(filename_template.buf, st.st_mode);
1069 strbuf_release(&filename_template);
1070 outfile = fdopen_tempfile(trailers_tempfile, "w");
1071 if (!outfile)
1072 die_errno(_("could not open temporary file"));
1074 return outfile;
1077 void process_trailers(const char *file,
1078 const struct process_trailer_options *opts,
1079 struct list_head *new_trailer_head)
1081 LIST_HEAD(head);
1082 struct strbuf sb = STRBUF_INIT;
1083 struct trailer_info info;
1084 FILE *outfile = stdout;
1086 ensure_configured();
1088 read_input_file(&sb, file);
1090 if (opts->in_place)
1091 outfile = create_in_place_tempfile(file);
1093 parse_trailers(&info, sb.buf, &head, opts);
1095 /* Print the lines before the trailers */
1096 if (!opts->only_trailers)
1097 fwrite(sb.buf, 1, info.trailer_block_start, outfile);
1099 if (!opts->only_trailers && !info.blank_line_before_trailer)
1100 fprintf(outfile, "\n");
1103 if (!opts->only_input) {
1104 LIST_HEAD(config_head);
1105 LIST_HEAD(arg_head);
1106 parse_trailers_from_config(&config_head);
1107 parse_trailers_from_command_line_args(&arg_head, new_trailer_head);
1108 list_splice(&config_head, &arg_head);
1109 process_trailers_lists(&head, &arg_head);
1112 print_all(outfile, &head, opts);
1114 free_all(&head);
1115 trailer_info_release(&info);
1117 /* Print the lines after the trailers as is */
1118 if (!opts->only_trailers)
1119 fwrite(sb.buf + info.trailer_block_end, 1, sb.len - info.trailer_block_end, outfile);
1121 if (opts->in_place)
1122 if (rename_tempfile(&trailers_tempfile, file))
1123 die_errno(_("could not rename temporary file to %s"), file);
1125 strbuf_release(&sb);
1128 void trailer_info_get(struct trailer_info *info, const char *str,
1129 const struct process_trailer_options *opts)
1131 size_t end_of_log_message = 0, trailer_block_start = 0;
1132 struct strbuf **trailer_lines, **ptr;
1133 char **trailer_strings = NULL;
1134 size_t nr = 0, alloc = 0;
1135 char **last = NULL;
1137 ensure_configured();
1139 end_of_log_message = find_end_of_log_message(str, opts->no_divider);
1140 trailer_block_start = find_trailer_block_start(str, end_of_log_message);
1142 trailer_lines = strbuf_split_buf(str + trailer_block_start,
1143 end_of_log_message - trailer_block_start,
1144 '\n',
1146 for (ptr = trailer_lines; *ptr; ptr++) {
1147 if (last && isspace((*ptr)->buf[0])) {
1148 struct strbuf sb = STRBUF_INIT;
1149 strbuf_attach(&sb, *last, strlen(*last), strlen(*last));
1150 strbuf_addbuf(&sb, *ptr);
1151 *last = strbuf_detach(&sb, NULL);
1152 continue;
1154 ALLOC_GROW(trailer_strings, nr + 1, alloc);
1155 trailer_strings[nr] = strbuf_detach(*ptr, NULL);
1156 last = find_separator(trailer_strings[nr], separators) >= 1
1157 ? &trailer_strings[nr]
1158 : NULL;
1159 nr++;
1161 strbuf_list_free(trailer_lines);
1163 info->blank_line_before_trailer = ends_with_blank_line(str,
1164 trailer_block_start);
1165 info->trailer_block_start = trailer_block_start;
1166 info->trailer_block_end = end_of_log_message;
1167 info->trailers = trailer_strings;
1168 info->trailer_nr = nr;
1171 void trailer_info_release(struct trailer_info *info)
1173 size_t i;
1174 for (i = 0; i < info->trailer_nr; i++)
1175 free(info->trailers[i]);
1176 free(info->trailers);
1179 static void format_trailer_info(struct strbuf *out,
1180 const struct trailer_info *info,
1181 const char *msg,
1182 const struct process_trailer_options *opts)
1184 size_t origlen = out->len;
1185 size_t i;
1187 /* If we want the whole block untouched, we can take the fast path. */
1188 if (!opts->only_trailers && !opts->unfold && !opts->filter &&
1189 !opts->separator && !opts->key_only && !opts->value_only &&
1190 !opts->key_value_separator) {
1191 strbuf_add(out, msg + info->trailer_block_start,
1192 info->trailer_block_end - info->trailer_block_start);
1193 return;
1196 for (i = 0; i < info->trailer_nr; i++) {
1197 char *trailer = info->trailers[i];
1198 ssize_t separator_pos = find_separator(trailer, separators);
1200 if (separator_pos >= 1) {
1201 struct strbuf tok = STRBUF_INIT;
1202 struct strbuf val = STRBUF_INIT;
1204 parse_trailer(&tok, &val, NULL, trailer, separator_pos);
1205 if (!opts->filter || opts->filter(&tok, opts->filter_data)) {
1206 if (opts->unfold)
1207 unfold_value(&val);
1209 if (opts->separator && out->len != origlen)
1210 strbuf_addbuf(out, opts->separator);
1211 if (!opts->value_only)
1212 strbuf_addbuf(out, &tok);
1213 if (!opts->key_only && !opts->value_only) {
1214 if (opts->key_value_separator)
1215 strbuf_addbuf(out, opts->key_value_separator);
1216 else
1217 strbuf_addstr(out, ": ");
1219 if (!opts->key_only)
1220 strbuf_addbuf(out, &val);
1221 if (!opts->separator)
1222 strbuf_addch(out, '\n');
1224 strbuf_release(&tok);
1225 strbuf_release(&val);
1227 } else if (!opts->only_trailers) {
1228 if (opts->separator && out->len != origlen) {
1229 strbuf_addbuf(out, opts->separator);
1231 strbuf_addstr(out, trailer);
1232 if (opts->separator) {
1233 strbuf_rtrim(out);
1240 void format_trailers_from_commit(struct strbuf *out, const char *msg,
1241 const struct process_trailer_options *opts)
1243 struct trailer_info info;
1245 trailer_info_get(&info, msg, opts);
1246 format_trailer_info(out, &info, msg, opts);
1247 trailer_info_release(&info);
1250 void trailer_iterator_init(struct trailer_iterator *iter, const char *msg)
1252 struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
1253 strbuf_init(&iter->key, 0);
1254 strbuf_init(&iter->val, 0);
1255 opts.no_divider = 1;
1256 trailer_info_get(&iter->internal.info, msg, &opts);
1257 iter->internal.cur = 0;
1260 int trailer_iterator_advance(struct trailer_iterator *iter)
1262 while (iter->internal.cur < iter->internal.info.trailer_nr) {
1263 char *trailer = iter->internal.info.trailers[iter->internal.cur++];
1264 int separator_pos = find_separator(trailer, separators);
1266 if (separator_pos < 1)
1267 continue; /* not a real trailer */
1269 strbuf_reset(&iter->key);
1270 strbuf_reset(&iter->val);
1271 parse_trailer(&iter->key, &iter->val, NULL,
1272 trailer, separator_pos);
1273 unfold_value(&iter->val);
1274 return 1;
1276 return 0;
1279 void trailer_iterator_release(struct trailer_iterator *iter)
1281 trailer_info_release(&iter->internal.info);
1282 strbuf_release(&iter->val);
1283 strbuf_release(&iter->key);