]> git.ipfire.org Git - thirdparty/git.git/blame - trailer.c
trailer: use offsets for trailer_start/trailer_end
[thirdparty/git.git] / trailer.c
CommitLineData
98750588 1#include "git-compat-util.h"
b2141fc1 2#include "config.h"
7ee24e18 3#include "environment.h"
f394e093 4#include "gettext.h"
f0a90b4e 5#include "string-list.h"
85039fb6 6#include "run-command.h"
61cfef4c 7#include "commit.h"
e1f89863 8#include "tempfile.h"
b1d78d77 9#include "trailer.h"
8966a394 10#include "list.h"
9385b5d7
CC
11/*
12 * Copyright (c) 2013, 2014 Christian Couder <chriscool@tuxfamily.org>
13 */
14
9385b5d7
CC
15struct conf_info {
16 char *name;
17 char *key;
18 char *command;
c364b7ef 19 char *cmd;
52fc319d
PB
20 enum trailer_where where;
21 enum trailer_if_exists if_exists;
22 enum trailer_if_missing if_missing;
9385b5d7
CC
23};
24
25static struct conf_info default_conf_info;
26
27struct trailer_item {
8966a394 28 struct list_head list;
14624506
JT
29 /*
30 * If this is not a trailer line, the line is stored in value
31 * (excluding the terminating newline) and token is NULL.
32 */
d65fd424
JT
33 char *token;
34 char *value;
cc71b0de
JT
35};
36
37struct arg_item {
38 struct list_head list;
39 char *token;
40 char *value;
9385b5d7
CC
41 struct conf_info conf;
42};
43
8966a394 44static LIST_HEAD(conf_head);
9385b5d7
CC
45
46static char *separators = ":";
47
e8c352c3
JT
48static int configured;
49
85039fb6
CC
50#define TRAILER_ARG_STRING "$ARG"
51
14624506
JT
52static const char *git_generated_prefixes[] = {
53 "Signed-off-by: ",
54 "(cherry picked from commit ",
55 NULL
56};
57
8966a394
JT
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)
63
52fc319d 64static int after_or_end(enum trailer_where where)
9385b5d7
CC
65{
66 return (where == WHERE_AFTER) || (where == WHERE_END);
67}
68
69/*
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.
74 */
75static size_t token_len_without_separator(const char *token, size_t len)
76{
77 while (len > 0 && !isalnum(token[len - 1]))
78 len--;
79 return len;
80}
81
cc71b0de 82static int same_token(struct trailer_item *a, struct arg_item *b)
9385b5d7 83{
14624506
JT
84 size_t a_len, b_len, min_len;
85
86 if (!a->token)
87 return 0;
88
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;
9385b5d7
CC
92
93 return !strncasecmp(a->token, b->token, min_len);
94}
95
cc71b0de 96static int same_value(struct trailer_item *a, struct arg_item *b)
9385b5d7
CC
97{
98 return !strcasecmp(a->value, b->value);
99}
100
cc71b0de 101static int same_trailer(struct trailer_item *a, struct arg_item *b)
9385b5d7
CC
102{
103 return same_token(a, b) && same_value(a, b);
104}
4103818d 105
022349c3 106static inline int is_blank_line(const char *str)
2013d850
CC
107{
108 const char *s = str;
022349c3 109 while (*s && *s != '\n' && isspace(*s))
2013d850 110 s++;
022349c3 111 return !*s || *s == '\n';
2013d850
CC
112}
113
85039fb6
CC
114static inline void strbuf_replace(struct strbuf *sb, const char *a, const char *b)
115{
116 const char *ptr = strstr(sb->buf, a);
117 if (ptr)
118 strbuf_splice(sb, ptr - sb->buf, strlen(a), b, strlen(b));
119}
120
4103818d 121static void free_trailer_item(struct trailer_item *item)
cc71b0de
JT
122{
123 free(item->token);
124 free(item->value);
125 free(item);
126}
127
128static void free_arg_item(struct arg_item *item)
4103818d
CC
129{
130 free(item->conf.name);
131 free(item->conf.key);
132 free(item->conf.command);
c364b7ef 133 free(item->conf.cmd);
d65fd424
JT
134 free(item->token);
135 free(item->value);
4103818d
CC
136 free(item);
137}
138
b1d78d77
CC
139static char last_non_space_char(const char *s)
140{
141 int i;
142 for (i = strlen(s) - 1; i >= 0; i--)
143 if (!isspace(s[i]))
144 return s[i];
145 return '\0';
146}
147
d0d2344a 148static void print_tok_val(FILE *outfile, const char *tok, const char *val)
b1d78d77 149{
14624506
JT
150 char c;
151
152 if (!tok) {
153 fprintf(outfile, "%s\n", val);
154 return;
155 }
156
157 c = last_non_space_char(tok);
b1d78d77
CC
158 if (!c)
159 return;
160 if (strchr(separators, c))
d0d2344a 161 fprintf(outfile, "%s%s\n", tok, val);
b1d78d77 162 else
d0d2344a 163 fprintf(outfile, "%s%c %s\n", tok, separators[0], val);
b1d78d77
CC
164}
165
56c493ed
JK
166static void print_all(FILE *outfile, struct list_head *head,
167 const struct process_trailer_options *opts)
b1d78d77 168{
8966a394 169 struct list_head *pos;
b1d78d77 170 struct trailer_item *item;
8966a394
JT
171 list_for_each(pos, head) {
172 item = list_entry(pos, struct trailer_item, list);
56c493ed
JK
173 if ((!opts->trim_empty || strlen(item->value) > 0) &&
174 (!opts->only_trailers || item->token))
d0d2344a 175 print_tok_val(outfile, item->token, item->value);
b1d78d77
CC
176 }
177}
178
cc71b0de 179static struct trailer_item *trailer_from_arg(struct arg_item *arg_tok)
4103818d 180{
241b5d3e 181 struct trailer_item *new_item = xcalloc(1, sizeof(*new_item));
17651326
BW
182 new_item->token = arg_tok->token;
183 new_item->value = arg_tok->value;
cc71b0de
JT
184 arg_tok->token = arg_tok->value = NULL;
185 free_arg_item(arg_tok);
17651326 186 return new_item;
4103818d
CC
187}
188
189static void add_arg_to_input_list(struct trailer_item *on_tok,
cc71b0de 190 struct arg_item *arg_tok)
8966a394 191{
cc71b0de
JT
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);
8966a394 196 else
cc71b0de 197 list_add_tail(&to_add->list, &on_tok->list);
4103818d
CC
198}
199
200static int check_if_different(struct trailer_item *in_tok,
cc71b0de 201 struct arg_item *arg_tok,
8966a394
JT
202 int check_all,
203 struct list_head *head)
4103818d 204{
52fc319d 205 enum trailer_where where = arg_tok->conf.where;
8966a394 206 struct list_head *next_head;
4103818d 207 do {
4103818d
CC
208 if (same_trailer(in_tok, arg_tok))
209 return 0;
210 /*
211 * if we want to add a trailer after another one,
212 * we have to check those before this one
213 */
8966a394
JT
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);
4103818d
CC
219 } while (check_all);
220 return 1;
221}
222
c364b7ef 223static char *apply_command(struct conf_info *conf, const char *arg)
85039fb6
CC
224{
225 struct strbuf cmd = STRBUF_INIT;
226 struct strbuf buf = STRBUF_INIT;
b226293b 227 struct child_process cp = CHILD_PROCESS_INIT;
d65fd424 228 char *result;
85039fb6 229
c364b7ef
ZH
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);
240 }
29fda24d 241 strvec_pushv(&cp.env, (const char **)local_repo_env);
85039fb6 242 cp.no_stdin = 1;
85039fb6
CC
243 cp.use_shell = 1;
244
c5eadcaa 245 if (capture_command(&cp, &buf, 1024)) {
13ad56f8 246 error(_("running trailer command '%s' failed"), cmd.buf);
85039fb6
CC
247 strbuf_release(&buf);
248 result = xstrdup("");
c5eadcaa
JK
249 } else {
250 strbuf_trim(&buf);
85039fb6 251 result = strbuf_detach(&buf, NULL);
c5eadcaa 252 }
85039fb6
CC
253
254 strbuf_release(&cmd);
255 return result;
256}
257
cc71b0de 258static void apply_item_command(struct trailer_item *in_tok, struct arg_item *arg_tok)
85039fb6 259{
c364b7ef 260 if (arg_tok->conf.command || arg_tok->conf.cmd) {
85039fb6
CC
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("");
269 }
c364b7ef 270 arg_tok->value = apply_command(&arg_tok->conf, arg);
85039fb6
CC
271 free((char *)arg);
272 }
273}
274
4103818d 275static void apply_arg_if_exists(struct trailer_item *in_tok,
cc71b0de 276 struct arg_item *arg_tok,
4103818d 277 struct trailer_item *on_tok,
8966a394 278 struct list_head *head)
4103818d
CC
279{
280 switch (arg_tok->conf.if_exists) {
281 case EXISTS_DO_NOTHING:
cc71b0de 282 free_arg_item(arg_tok);
4103818d
CC
283 break;
284 case EXISTS_REPLACE:
85039fb6 285 apply_item_command(in_tok, arg_tok);
8966a394
JT
286 add_arg_to_input_list(on_tok, arg_tok);
287 list_del(&in_tok->list);
4103818d
CC
288 free_trailer_item(in_tok);
289 break;
290 case EXISTS_ADD:
85039fb6 291 apply_item_command(in_tok, arg_tok);
8966a394 292 add_arg_to_input_list(on_tok, arg_tok);
4103818d
CC
293 break;
294 case EXISTS_ADD_IF_DIFFERENT:
85039fb6 295 apply_item_command(in_tok, arg_tok);
8966a394
JT
296 if (check_if_different(in_tok, arg_tok, 1, head))
297 add_arg_to_input_list(on_tok, arg_tok);
4103818d 298 else
cc71b0de 299 free_arg_item(arg_tok);
4103818d
CC
300 break;
301 case EXISTS_ADD_IF_DIFFERENT_NEIGHBOR:
85039fb6 302 apply_item_command(in_tok, arg_tok);
8966a394
JT
303 if (check_if_different(on_tok, arg_tok, 0, head))
304 add_arg_to_input_list(on_tok, arg_tok);
4103818d 305 else
cc71b0de 306 free_arg_item(arg_tok);
4103818d 307 break;
0ea5292e 308 default:
033abf97 309 BUG("trailer.c: unhandled value %d",
0ea5292e 310 arg_tok->conf.if_exists);
4103818d
CC
311 }
312}
313
8966a394 314static void apply_arg_if_missing(struct list_head *head,
cc71b0de 315 struct arg_item *arg_tok)
4103818d 316{
52fc319d 317 enum trailer_where where;
cc71b0de 318 struct trailer_item *to_add;
4103818d
CC
319
320 switch (arg_tok->conf.if_missing) {
321 case MISSING_DO_NOTHING:
cc71b0de 322 free_arg_item(arg_tok);
4103818d
CC
323 break;
324 case MISSING_ADD:
325 where = arg_tok->conf.where;
85039fb6 326 apply_item_command(NULL, arg_tok);
cc71b0de 327 to_add = trailer_from_arg(arg_tok);
8966a394 328 if (after_or_end(where))
cc71b0de 329 list_add_tail(&to_add->list, head);
8966a394 330 else
cc71b0de 331 list_add(&to_add->list, head);
0ea5292e
PB
332 break;
333 default:
033abf97 334 BUG("trailer.c: unhandled value %d",
0ea5292e 335 arg_tok->conf.if_missing);
4103818d
CC
336 }
337}
338
8966a394 339static int find_same_and_apply_arg(struct list_head *head,
cc71b0de 340 struct arg_item *arg_tok)
4103818d 341{
8966a394 342 struct list_head *pos;
4103818d
CC
343 struct trailer_item *in_tok;
344 struct trailer_item *on_tok;
4103818d 345
52fc319d 346 enum trailer_where where = arg_tok->conf.where;
4103818d
CC
347 int middle = (where == WHERE_AFTER) || (where == WHERE_BEFORE);
348 int backwards = after_or_end(where);
8966a394 349 struct trailer_item *start_tok;
4103818d 350
8966a394
JT
351 if (list_empty(head))
352 return 0;
4103818d 353
8966a394
JT
354 start_tok = list_entry(backwards ? head->prev : head->next,
355 struct trailer_item,
356 list);
357
358 list_for_each_dir(pos, head, backwards) {
359 in_tok = list_entry(pos, struct trailer_item, list);
4103818d
CC
360 if (!same_token(in_tok, arg_tok))
361 continue;
362 on_tok = middle ? in_tok : start_tok;
8966a394 363 apply_arg_if_exists(in_tok, arg_tok, on_tok, head);
4103818d
CC
364 return 1;
365 }
366 return 0;
367}
368
8966a394
JT
369static void process_trailers_lists(struct list_head *head,
370 struct list_head *arg_head)
4103818d 371{
8966a394 372 struct list_head *pos, *p;
cc71b0de 373 struct arg_item *arg_tok;
4103818d 374
8966a394 375 list_for_each_safe(pos, p, arg_head) {
4103818d 376 int applied = 0;
cc71b0de 377 arg_tok = list_entry(pos, struct arg_item, list);
4103818d 378
8966a394 379 list_del(pos);
4103818d 380
8966a394 381 applied = find_same_and_apply_arg(head, arg_tok);
4103818d
CC
382
383 if (!applied)
8966a394 384 apply_arg_if_missing(head, arg_tok);
4103818d
CC
385 }
386}
46a0613f 387
52fc319d 388int trailer_set_where(enum trailer_where *item, const char *value)
46a0613f 389{
0ea5292e
PB
390 if (!value)
391 *item = WHERE_DEFAULT;
392 else if (!strcasecmp("after", value))
52fc319d 393 *item = WHERE_AFTER;
46a0613f 394 else if (!strcasecmp("before", value))
52fc319d 395 *item = WHERE_BEFORE;
46a0613f 396 else if (!strcasecmp("end", value))
52fc319d 397 *item = WHERE_END;
46a0613f 398 else if (!strcasecmp("start", value))
52fc319d 399 *item = WHERE_START;
46a0613f
CC
400 else
401 return -1;
402 return 0;
403}
404
52fc319d 405int trailer_set_if_exists(enum trailer_if_exists *item, const char *value)
46a0613f 406{
0ea5292e
PB
407 if (!value)
408 *item = EXISTS_DEFAULT;
409 else if (!strcasecmp("addIfDifferent", value))
52fc319d 410 *item = EXISTS_ADD_IF_DIFFERENT;
46a0613f 411 else if (!strcasecmp("addIfDifferentNeighbor", value))
52fc319d 412 *item = EXISTS_ADD_IF_DIFFERENT_NEIGHBOR;
46a0613f 413 else if (!strcasecmp("add", value))
52fc319d 414 *item = EXISTS_ADD;
46a0613f 415 else if (!strcasecmp("replace", value))
52fc319d 416 *item = EXISTS_REPLACE;
46a0613f 417 else if (!strcasecmp("doNothing", value))
52fc319d 418 *item = EXISTS_DO_NOTHING;
46a0613f
CC
419 else
420 return -1;
421 return 0;
422}
423
52fc319d 424int trailer_set_if_missing(enum trailer_if_missing *item, const char *value)
46a0613f 425{
0ea5292e
PB
426 if (!value)
427 *item = MISSING_DEFAULT;
428 else if (!strcasecmp("doNothing", value))
52fc319d 429 *item = MISSING_DO_NOTHING;
46a0613f 430 else if (!strcasecmp("add", value))
52fc319d 431 *item = MISSING_ADD;
46a0613f
CC
432 else
433 return -1;
434 return 0;
435}
436
d65fd424 437static void duplicate_conf(struct conf_info *dst, const struct conf_info *src)
46a0613f
CC
438{
439 *dst = *src;
13092a91
JH
440 dst->name = xstrdup_or_null(src->name);
441 dst->key = xstrdup_or_null(src->key);
442 dst->command = xstrdup_or_null(src->command);
c364b7ef 443 dst->cmd = xstrdup_or_null(src->cmd);
46a0613f
CC
444}
445
cc71b0de 446static struct arg_item *get_conf_item(const char *name)
46a0613f 447{
8966a394 448 struct list_head *pos;
cc71b0de 449 struct arg_item *item;
46a0613f
CC
450
451 /* Look up item with same name */
8966a394 452 list_for_each(pos, &conf_head) {
cc71b0de 453 item = list_entry(pos, struct arg_item, list);
46a0613f
CC
454 if (!strcasecmp(item->conf.name, name))
455 return item;
456 }
457
458 /* Item does not already exists, create it */
ca56dadb 459 CALLOC_ARRAY(item, 1);
46a0613f
CC
460 duplicate_conf(&item->conf, &default_conf_info);
461 item->conf.name = xstrdup(name);
462
8966a394 463 list_add_tail(&item->list, &conf_head);
46a0613f
CC
464
465 return item;
466}
467
c364b7ef
ZH
468enum trailer_info_type { TRAILER_KEY, TRAILER_COMMAND, TRAILER_CMD,
469 TRAILER_WHERE, TRAILER_IF_EXISTS, TRAILER_IF_MISSING };
46a0613f
CC
470
471static struct {
472 const char *name;
473 enum trailer_info_type type;
474} trailer_config_items[] = {
475 { "key", TRAILER_KEY },
476 { "command", TRAILER_COMMAND },
c364b7ef 477 { "cmd", TRAILER_CMD },
46a0613f
CC
478 { "where", TRAILER_WHERE },
479 { "ifexists", TRAILER_IF_EXISTS },
480 { "ifmissing", TRAILER_IF_MISSING }
481};
482
783a86c1 483static int git_trailer_default_config(const char *conf_key, const char *value,
a4e7e317 484 const struct config_context *ctx UNUSED,
5cf88fd8 485 void *cb UNUSED)
46a0613f
CC
486{
487 const char *trailer_item, *variable_name;
488
489 if (!skip_prefix(conf_key, "trailer.", &trailer_item))
490 return 0;
491
492 variable_name = strrchr(trailer_item, '.');
493 if (!variable_name) {
494 if (!strcmp(trailer_item, "where")) {
52fc319d
PB
495 if (trailer_set_where(&default_conf_info.where,
496 value) < 0)
46a0613f
CC
497 warning(_("unknown value '%s' for key '%s'"),
498 value, conf_key);
499 } else if (!strcmp(trailer_item, "ifexists")) {
52fc319d
PB
500 if (trailer_set_if_exists(&default_conf_info.if_exists,
501 value) < 0)
46a0613f
CC
502 warning(_("unknown value '%s' for key '%s'"),
503 value, conf_key);
504 } else if (!strcmp(trailer_item, "ifmissing")) {
52fc319d
PB
505 if (trailer_set_if_missing(&default_conf_info.if_missing,
506 value) < 0)
46a0613f
CC
507 warning(_("unknown value '%s' for key '%s'"),
508 value, conf_key);
509 } else if (!strcmp(trailer_item, "separators")) {
510 separators = xstrdup(value);
511 }
512 }
513 return 0;
514}
515
783a86c1 516static int git_trailer_config(const char *conf_key, const char *value,
a4e7e317 517 const struct config_context *ctx UNUSED,
5cf88fd8 518 void *cb UNUSED)
46a0613f
CC
519{
520 const char *trailer_item, *variable_name;
cc71b0de 521 struct arg_item *item;
46a0613f
CC
522 struct conf_info *conf;
523 char *name = NULL;
524 enum trailer_info_type type;
525 int i;
526
527 if (!skip_prefix(conf_key, "trailer.", &trailer_item))
528 return 0;
529
530 variable_name = strrchr(trailer_item, '.');
531 if (!variable_name)
532 return 0;
533
534 variable_name++;
535 for (i = 0; i < ARRAY_SIZE(trailer_config_items); i++) {
536 if (strcmp(trailer_config_items[i].name, variable_name))
537 continue;
538 name = xstrndup(trailer_item, variable_name - trailer_item - 1);
539 type = trailer_config_items[i].type;
540 break;
541 }
542
543 if (!name)
544 return 0;
545
546 item = get_conf_item(name);
547 conf = &item->conf;
548 free(name);
549
550 switch (type) {
551 case TRAILER_KEY:
552 if (conf->key)
553 warning(_("more than one %s"), conf_key);
554 conf->key = xstrdup(value);
555 break;
556 case TRAILER_COMMAND:
557 if (conf->command)
558 warning(_("more than one %s"), conf_key);
559 conf->command = xstrdup(value);
560 break;
c364b7ef
ZH
561 case TRAILER_CMD:
562 if (conf->cmd)
563 warning(_("more than one %s"), conf_key);
564 conf->cmd = xstrdup(value);
565 break;
46a0613f 566 case TRAILER_WHERE:
52fc319d 567 if (trailer_set_where(&conf->where, value))
46a0613f
CC
568 warning(_("unknown value '%s' for key '%s'"), value, conf_key);
569 break;
570 case TRAILER_IF_EXISTS:
52fc319d 571 if (trailer_set_if_exists(&conf->if_exists, value))
46a0613f
CC
572 warning(_("unknown value '%s' for key '%s'"), value, conf_key);
573 break;
574 case TRAILER_IF_MISSING:
52fc319d 575 if (trailer_set_if_missing(&conf->if_missing, value))
46a0613f
CC
576 warning(_("unknown value '%s' for key '%s'"), value, conf_key);
577 break;
578 default:
033abf97 579 BUG("trailer.c: unhandled type %d", type);
46a0613f
CC
580 }
581 return 0;
582}
f0a90b4e 583
e8c352c3
JT
584static void ensure_configured(void)
585{
586 if (configured)
587 return;
588
589 /* Default config must be setup first */
52fc319d
PB
590 default_conf_info.where = WHERE_END;
591 default_conf_info.if_exists = EXISTS_ADD_IF_DIFFERENT_NEIGHBOR;
592 default_conf_info.if_missing = MISSING_ADD;
e8c352c3
JT
593 git_config(git_trailer_default_config, NULL);
594 git_config(git_trailer_config, NULL);
595 configured = 1;
596}
597
cc71b0de 598static const char *token_from_item(struct arg_item *item, char *tok)
f0a90b4e
CC
599{
600 if (item->conf.key)
601 return item->conf.key;
602 if (tok)
603 return tok;
604 return item->conf.name;
605}
606
0d2db00e 607static int token_matches_item(const char *tok, struct arg_item *item, size_t tok_len)
f0a90b4e
CC
608{
609 if (!strncasecmp(tok, item->conf.name, tok_len))
610 return 1;
611 return item->conf.key ? !strncasecmp(tok, item->conf.key, tok_len) : 0;
612}
613
fdbf4510 614/*
e4319562
JT
615 * If the given line is of the form
616 * "<token><optional whitespace><separator>..." or "<separator>...", return the
617 * location of the separator. Otherwise, return -1. The optional whitespace
618 * is allowed there primarily to allow things like "Bug #43" where <token> is
619 * "Bug" and <separator> is "#".
620 *
621 * The separator-starts-line case (in which this function returns 0) is
622 * distinguished from the non-well-formed-line case (in which this function
623 * returns -1) because some callers of this function need such a distinction.
fdbf4510 624 */
0d2db00e 625static ssize_t find_separator(const char *line, const char *separators)
f0a90b4e 626{
e4319562
JT
627 int whitespace_found = 0;
628 const char *c;
629 for (c = line; *c; c++) {
630 if (strchr(separators, *c))
631 return c - line;
632 if (!whitespace_found && (isalnum(*c) || *c == '-'))
633 continue;
634 if (c != line && (*c == ' ' || *c == '\t')) {
635 whitespace_found = 1;
636 continue;
637 }
638 break;
639 }
640 return -1;
fdbf4510 641}
f0a90b4e 642
fdbf4510
JT
643/*
644 * Obtain the token, value, and conf from the given trailer.
645 *
646 * separator_pos must not be 0, since the token cannot be an empty string.
647 *
648 * If separator_pos is -1, interpret the whole trailer as a token.
649 */
650static void parse_trailer(struct strbuf *tok, struct strbuf *val,
651 const struct conf_info **conf, const char *trailer,
0d2db00e 652 ssize_t separator_pos)
f0a90b4e 653{
cc71b0de 654 struct arg_item *item;
0d2db00e 655 size_t tok_len;
63ab3f34 656 struct list_head *pos;
f0a90b4e 657
fdbf4510
JT
658 if (separator_pos != -1) {
659 strbuf_add(tok, trailer, separator_pos);
f0a90b4e 660 strbuf_trim(tok);
fdbf4510 661 strbuf_addstr(val, trailer + separator_pos + 1);
f0a90b4e
CC
662 strbuf_trim(val);
663 } else {
664 strbuf_addstr(tok, trailer);
665 strbuf_trim(tok);
666 }
f0a90b4e
CC
667
668 /* Lookup if the token matches something in the config */
63ab3f34 669 tok_len = token_len_without_separator(tok->buf, tok->len);
cc71b0de
JT
670 if (conf)
671 *conf = &default_conf_info;
8966a394 672 list_for_each(pos, &conf_head) {
cc71b0de 673 item = list_entry(pos, struct arg_item, list);
63ab3f34
JT
674 if (token_matches_item(tok->buf, item, tok_len)) {
675 char *tok_buf = strbuf_detach(tok, NULL);
cc71b0de
JT
676 if (conf)
677 *conf = &item->conf;
63ab3f34
JT
678 strbuf_addstr(tok, token_from_item(item, tok_buf));
679 free(tok_buf);
680 break;
681 }
f0a90b4e 682 }
f0a90b4e 683}
f0a90b4e 684
60ef86a1
JT
685static struct trailer_item *add_trailer_item(struct list_head *head, char *tok,
686 char *val)
f0a90b4e 687{
241b5d3e 688 struct trailer_item *new_item = xcalloc(1, sizeof(*new_item));
17651326
BW
689 new_item->token = tok;
690 new_item->value = val;
691 list_add_tail(&new_item->list, head);
692 return new_item;
f0a90b4e
CC
693}
694
cc71b0de 695static void add_arg_item(struct list_head *arg_head, char *tok, char *val,
0ea5292e
PB
696 const struct conf_info *conf,
697 const struct new_trailer_item *new_trailer_item)
f0a90b4e 698{
241b5d3e 699 struct arg_item *new_item = xcalloc(1, sizeof(*new_item));
17651326
BW
700 new_item->token = tok;
701 new_item->value = val;
702 duplicate_conf(&new_item->conf, conf);
0ea5292e
PB
703 if (new_trailer_item) {
704 if (new_trailer_item->where != WHERE_DEFAULT)
17651326 705 new_item->conf.where = new_trailer_item->where;
0ea5292e 706 if (new_trailer_item->if_exists != EXISTS_DEFAULT)
17651326 707 new_item->conf.if_exists = new_trailer_item->if_exists;
0ea5292e 708 if (new_trailer_item->if_missing != MISSING_DEFAULT)
17651326 709 new_item->conf.if_missing = new_trailer_item->if_missing;
0ea5292e 710 }
17651326 711 list_add_tail(&new_item->list, arg_head);
f0a90b4e
CC
712}
713
94430d03 714static void parse_trailers_from_config(struct list_head *config_head)
f0a90b4e 715{
cc71b0de 716 struct arg_item *item;
8966a394 717 struct list_head *pos;
85039fb6 718
cc71b0de 719 /* Add an arg item for each configured trailer with a command */
8966a394 720 list_for_each(pos, &conf_head) {
cc71b0de 721 item = list_entry(pos, struct arg_item, list);
63ab3f34 722 if (item->conf.command)
94430d03 723 add_arg_item(config_head,
cc71b0de
JT
724 xstrdup(token_from_item(item, NULL)),
725 xstrdup(""),
0ea5292e 726 &item->conf, NULL);
85039fb6 727 }
94430d03
LA
728}
729
730static void parse_trailers_from_command_line_args(struct list_head *arg_head,
731 struct list_head *new_trailer_head)
732{
733 struct strbuf tok = STRBUF_INIT;
734 struct strbuf val = STRBUF_INIT;
735 const struct conf_info *conf;
736 struct list_head *pos;
737
738 /*
739 * In command-line arguments, '=' is accepted (in addition to the
740 * separators that are defined).
741 */
742 char *cl_separators = xstrfmt("=%s", separators);
f0a90b4e 743
cc71b0de 744 /* Add an arg item for each trailer on the command line */
51166b87
PB
745 list_for_each(pos, new_trailer_head) {
746 struct new_trailer_item *tr =
747 list_entry(pos, struct new_trailer_item, list);
0d2db00e 748 ssize_t separator_pos = find_separator(tr->text, cl_separators);
51166b87 749
fdbf4510
JT
750 if (separator_pos == 0) {
751 struct strbuf sb = STRBUF_INIT;
51166b87 752 strbuf_addstr(&sb, tr->text);
fdbf4510
JT
753 strbuf_trim(&sb);
754 error(_("empty trailer token in trailer '%.*s'"),
755 (int) sb.len, sb.buf);
756 strbuf_release(&sb);
757 } else {
51166b87 758 parse_trailer(&tok, &val, &conf, tr->text,
fdbf4510 759 separator_pos);
cc71b0de
JT
760 add_arg_item(arg_head,
761 strbuf_detach(&tok, NULL),
762 strbuf_detach(&val, NULL),
0ea5292e 763 conf, tr);
fdbf4510 764 }
f0a90b4e
CC
765 }
766
fdbf4510 767 free(cl_separators);
f0a90b4e 768}
2013d850 769
022349c3 770static void read_input_file(struct strbuf *sb, const char *file)
2013d850 771{
2013d850 772 if (file) {
022349c3 773 if (strbuf_read_file(sb, file, 0) < 0)
2013d850
CC
774 die_errno(_("could not read input file '%s'"), file);
775 } else {
022349c3 776 if (strbuf_read(sb, fileno(stdin), 0) < 0)
2013d850
CC
777 die_errno(_("could not read from stdin"));
778 }
022349c3 779}
2013d850 780
022349c3
JT
781static const char *next_line(const char *str)
782{
783 const char *nl = strchrnul(str, '\n');
784 return nl + !!*nl;
785}
2013d850 786
022349c3
JT
787/*
788 * Return the position of the start of the last line. If len is 0, return -1.
789 */
0d2db00e 790static ssize_t last_line(const char *buf, size_t len)
022349c3 791{
0d2db00e 792 ssize_t i;
022349c3
JT
793 if (len == 0)
794 return -1;
795 if (len == 1)
796 return 0;
797 /*
798 * Skip the last character (in addition to the null terminator),
799 * because if the last character is a newline, it is considered as part
800 * of the last line anyway.
801 */
802 i = len - 2;
2013d850 803
022349c3
JT
804 for (; i >= 0; i--) {
805 if (buf[i] == '\n')
806 return i + 1;
807 }
808 return 0;
2013d850
CC
809}
810
811/*
97e9d0b7
LA
812 * Find the end of the log message as an offset from the start of the input
813 * (where callers of this function are interested in looking for a trailers
814 * block in the same input). We have to consider two categories of content that
815 * can come at the end of the input which we want to ignore (because they don't
816 * belong in the log message):
817 *
818 * (1) the "patch part" which begins with a "---" divider and has patch
819 * information (like the output of git-format-patch), and
820 *
821 * (2) any trailing comment lines, blank lines like in the output of "git
822 * commit -v", or stuff below the "cut" (scissor) line.
823 *
824 * As a formula, the situation looks like this:
825 *
826 * INPUT = LOG MESSAGE + IGNORED
827 *
828 * where IGNORED can be either of the two categories described above. It may be
829 * that there is nothing to ignore. Now it may be the case that the LOG MESSAGE
830 * contains a trailer block, but that's not the concern of this function.
2013d850 831 */
97e9d0b7 832static size_t find_end_of_log_message(const char *input, int no_divider)
2013d850 833{
97e9d0b7 834 size_t end;
022349c3 835 const char *s;
2013d850 836
97e9d0b7
LA
837 /* Assume the naive end of the input is already what we want. */
838 end = strlen(input);
839
840 if (no_divider)
841 return end;
842
843 /* Optionally skip over any patch part ("---" line and below). */
844 for (s = input; *s; s = next_line(s)) {
c188668e
JK
845 const char *v;
846
97e9d0b7
LA
847 if (skip_prefix(s, "---", &v) && isspace(*v)) {
848 end = s - input;
849 break;
850 }
2013d850
CC
851 }
852
97e9d0b7
LA
853 /* Skip over other ignorable bits. */
854 return end - ignored_log_message_bytes(input, end);
2013d850
CC
855}
856
857/*
022349c3
JT
858 * Return the position of the first trailer line or len if there are no
859 * trailers.
2013d850 860 */
de7c27a1 861static size_t find_trailer_block_start(const char *buf, size_t len)
2013d850 862{
022349c3 863 const char *s;
0d2db00e
JK
864 ssize_t end_of_title, l;
865 int only_spaces = 1;
14624506 866 int recognized_prefix = 0, trailer_lines = 0, non_trailer_lines = 0;
60ef86a1
JT
867 /*
868 * Number of possible continuation lines encountered. This will be
869 * reset to 0 if we encounter a trailer (since those lines are to be
870 * considered continuations of that trailer), and added to
871 * non_trailer_lines if we encounter a non-trailer (since those lines
872 * are to be considered non-trailers).
873 */
874 int possible_continuation_lines = 0;
5c99995d
CC
875
876 /* The first paragraph is the title and cannot be trailers */
022349c3
JT
877 for (s = buf; s < buf + len; s = next_line(s)) {
878 if (s[0] == comment_line_char)
5c99995d 879 continue;
022349c3 880 if (is_blank_line(s))
5c99995d
CC
881 break;
882 }
022349c3 883 end_of_title = s - buf;
2013d850
CC
884
885 /*
14624506
JT
886 * Get the start of the trailers by looking starting from the end for a
887 * blank line before a set of non-blank lines that (i) are all
888 * trailers, or (ii) contains at least one Git-generated trailer and
889 * consists of at least 25% trailers.
2013d850 890 */
022349c3
JT
891 for (l = last_line(buf, len);
892 l >= end_of_title;
893 l = last_line(buf, l)) {
894 const char *bol = buf + l;
14624506 895 const char **p;
0d2db00e 896 ssize_t separator_pos;
14624506 897
022349c3 898 if (bol[0] == comment_line_char) {
60ef86a1
JT
899 non_trailer_lines += possible_continuation_lines;
900 possible_continuation_lines = 0;
2013d850 901 continue;
60ef86a1 902 }
022349c3 903 if (is_blank_line(bol)) {
2013d850
CC
904 if (only_spaces)
905 continue;
60ef86a1 906 non_trailer_lines += possible_continuation_lines;
14624506
JT
907 if (recognized_prefix &&
908 trailer_lines * 3 >= non_trailer_lines)
022349c3
JT
909 return next_line(bol) - buf;
910 else if (trailer_lines && !non_trailer_lines)
911 return next_line(bol) - buf;
912 return len;
2013d850 913 }
14624506
JT
914 only_spaces = 0;
915
916 for (p = git_generated_prefixes; *p; p++) {
022349c3 917 if (starts_with(bol, *p)) {
14624506 918 trailer_lines++;
60ef86a1 919 possible_continuation_lines = 0;
14624506
JT
920 recognized_prefix = 1;
921 goto continue_outer_loop;
922 }
2013d850 923 }
14624506 924
022349c3
JT
925 separator_pos = find_separator(bol, separators);
926 if (separator_pos >= 1 && !isspace(bol[0])) {
14624506
JT
927 struct list_head *pos;
928
929 trailer_lines++;
60ef86a1 930 possible_continuation_lines = 0;
14624506
JT
931 if (recognized_prefix)
932 continue;
933 list_for_each(pos, &conf_head) {
934 struct arg_item *item;
935 item = list_entry(pos, struct arg_item, list);
022349c3 936 if (token_matches_item(bol, item,
14624506
JT
937 separator_pos)) {
938 recognized_prefix = 1;
939 break;
940 }
941 }
022349c3 942 } else if (isspace(bol[0]))
60ef86a1
JT
943 possible_continuation_lines++;
944 else {
14624506 945 non_trailer_lines++;
60ef86a1
JT
946 non_trailer_lines += possible_continuation_lines;
947 possible_continuation_lines = 0;
2013d850 948 }
14624506
JT
949continue_outer_loop:
950 ;
2013d850
CC
951 }
952
022349c3 953 return len;
61cfef4c
CC
954}
955
022349c3 956static int ends_with_blank_line(const char *buf, size_t len)
2013d850 957{
0d2db00e 958 ssize_t ll = last_line(buf, len);
022349c3
JT
959 if (ll < 0)
960 return 0;
961 return is_blank_line(buf + ll);
2013d850
CC
962}
963
00002396
JK
964static void unfold_value(struct strbuf *val)
965{
966 struct strbuf out = STRBUF_INIT;
967 size_t i;
968
969 strbuf_grow(&out, val->len);
970 i = 0;
971 while (i < val->len) {
972 char c = val->buf[i++];
973 if (c == '\n') {
974 /* Collapse continuation down to a single space. */
975 while (i < val->len && isspace(val->buf[i]))
976 i++;
977 strbuf_addch(&out, ' ');
978 } else {
979 strbuf_addch(&out, c);
980 }
981 }
982
983 /* Empty lines may have left us with whitespace cruft at the edges */
984 strbuf_trim(&out);
985
986 /* output goes back to val as if we modified it in-place */
987 strbuf_swap(&out, val);
988 strbuf_release(&out);
989}
990
c2a8edf9
LA
991/*
992 * Parse trailers in "str", populating the trailer info and "head"
993 * linked list structure.
994 */
995static void parse_trailers(struct trailer_info *info,
996 const char *str,
997 struct list_head *head,
998 const struct process_trailer_options *opts)
2013d850 999{
63ab3f34
JT
1000 struct strbuf tok = STRBUF_INIT;
1001 struct strbuf val = STRBUF_INIT;
a3b636e2 1002 size_t i;
2013d850 1003
c2a8edf9 1004 trailer_info_get(info, str, opts);
2013d850 1005
c2a8edf9 1006 for (i = 0; i < info->trailer_nr; i++) {
fdbf4510 1007 int separator_pos;
c2a8edf9 1008 char *trailer = info->trailers[i];
e8c352c3 1009 if (trailer[0] == comment_line_char)
60ef86a1 1010 continue;
e8c352c3 1011 separator_pos = find_separator(trailer, separators);
fdbf4510 1012 if (separator_pos >= 1) {
e8c352c3 1013 parse_trailer(&tok, &val, NULL, trailer,
fdbf4510 1014 separator_pos);
00002396
JK
1015 if (opts->unfold)
1016 unfold_value(&val);
e8c352c3
JT
1017 add_trailer_item(head,
1018 strbuf_detach(&tok, NULL),
1019 strbuf_detach(&val, NULL));
56c493ed 1020 } else if (!opts->only_trailers) {
e8c352c3 1021 strbuf_addstr(&val, trailer);
14624506
JT
1022 strbuf_strip_suffix(&val, "\n");
1023 add_trailer_item(head,
1024 NULL,
1025 strbuf_detach(&val, NULL));
2887103b 1026 }
2013d850 1027 }
2013d850 1028}
b1d78d77 1029
8966a394 1030static void free_all(struct list_head *head)
b1d78d77 1031{
8966a394
JT
1032 struct list_head *pos, *p;
1033 list_for_each_safe(pos, p, head) {
1034 list_del(pos);
1035 free_trailer_item(list_entry(pos, struct trailer_item, list));
b1d78d77
CC
1036 }
1037}
1038
076aa2cb 1039static struct tempfile *trailers_tempfile;
e1f89863
TK
1040
1041static FILE *create_in_place_tempfile(const char *file)
1042{
1043 struct stat st;
31c2c7a0 1044 struct strbuf filename_template = STRBUF_INIT;
e1f89863
TK
1045 const char *tail;
1046 FILE *outfile;
1047
1048 if (stat(file, &st))
1049 die_errno(_("could not stat %s"), file);
1050 if (!S_ISREG(st.st_mode))
1051 die(_("file %s is not a regular file"), file);
1052 if (!(st.st_mode & S_IWUSR))
1053 die(_("file %s is not writable by user"), file);
1054
1055 /* Create temporary file in the same directory as the original */
1056 tail = strrchr(file, '/');
afe8a907 1057 if (tail)
31c2c7a0
BW
1058 strbuf_add(&filename_template, file, tail - file + 1);
1059 strbuf_addstr(&filename_template, "git-interpret-trailers-XXXXXX");
e1f89863 1060
31c2c7a0
BW
1061 trailers_tempfile = xmks_tempfile_m(filename_template.buf, st.st_mode);
1062 strbuf_release(&filename_template);
076aa2cb 1063 outfile = fdopen_tempfile(trailers_tempfile, "w");
e1f89863
TK
1064 if (!outfile)
1065 die_errno(_("could not open temporary file"));
1066
1067 return outfile;
1068}
1069
8abc8980
JK
1070void process_trailers(const char *file,
1071 const struct process_trailer_options *opts,
51166b87 1072 struct list_head *new_trailer_head)
b1d78d77 1073{
8966a394 1074 LIST_HEAD(head);
022349c3 1075 struct strbuf sb = STRBUF_INIT;
c2a8edf9 1076 struct trailer_info info;
d0d2344a 1077 FILE *outfile = stdout;
b1d78d77 1078
e8c352c3 1079 ensure_configured();
b1d78d77 1080
022349c3 1081 read_input_file(&sb, file);
b1d78d77 1082
8abc8980 1083 if (opts->in_place)
e1f89863
TK
1084 outfile = create_in_place_tempfile(file);
1085
c2a8edf9 1086 parse_trailers(&info, sb.buf, &head, opts);
c2a8edf9 1087
b1d78d77 1088 /* Print the lines before the trailers */
c2a8edf9 1089 if (!opts->only_trailers)
de7c27a1 1090 fwrite(sb.buf, 1, info.trailer_block_start, outfile);
c2a8edf9
LA
1091
1092 if (!opts->only_trailers && !info.blank_line_before_trailer)
1093 fprintf(outfile, "\n");
1094
b1d78d77 1095
fdbdb64f 1096 if (!opts->only_input) {
94430d03 1097 LIST_HEAD(config_head);
fdbdb64f 1098 LIST_HEAD(arg_head);
94430d03
LA
1099 parse_trailers_from_config(&config_head);
1100 parse_trailers_from_command_line_args(&arg_head, new_trailer_head);
1101 list_splice(&config_head, &arg_head);
fdbdb64f
JK
1102 process_trailers_lists(&head, &arg_head);
1103 }
b1d78d77 1104
56c493ed 1105 print_all(outfile, &head, opts);
b1d78d77 1106
8966a394 1107 free_all(&head);
c2a8edf9 1108 trailer_info_release(&info);
b1d78d77
CC
1109
1110 /* Print the lines after the trailers as is */
56c493ed 1111 if (!opts->only_trailers)
de7c27a1 1112 fwrite(sb.buf + info.trailer_block_end, 1, sb.len - info.trailer_block_end, outfile);
b1d78d77 1113
8abc8980 1114 if (opts->in_place)
e1f89863
TK
1115 if (rename_tempfile(&trailers_tempfile, file))
1116 die_errno(_("could not rename temporary file to %s"), file);
1117
022349c3 1118 strbuf_release(&sb);
b1d78d77 1119}
e8c352c3 1120
00a21f5c
JK
1121void trailer_info_get(struct trailer_info *info, const char *str,
1122 const struct process_trailer_options *opts)
e8c352c3 1123{
de7c27a1 1124 size_t end_of_log_message = 0, trailer_block_start = 0;
e8c352c3
JT
1125 struct strbuf **trailer_lines, **ptr;
1126 char **trailer_strings = NULL;
1127 size_t nr = 0, alloc = 0;
1128 char **last = NULL;
1129
1130 ensure_configured();
1131
97e9d0b7 1132 end_of_log_message = find_end_of_log_message(str, opts->no_divider);
de7c27a1 1133 trailer_block_start = find_trailer_block_start(str, end_of_log_message);
e8c352c3 1134
de7c27a1
LA
1135 trailer_lines = strbuf_split_buf(str + trailer_block_start,
1136 end_of_log_message - trailer_block_start,
e8c352c3
JT
1137 '\n',
1138 0);
1139 for (ptr = trailer_lines; *ptr; ptr++) {
1140 if (last && isspace((*ptr)->buf[0])) {
1141 struct strbuf sb = STRBUF_INIT;
1142 strbuf_attach(&sb, *last, strlen(*last), strlen(*last));
1143 strbuf_addbuf(&sb, *ptr);
1144 *last = strbuf_detach(&sb, NULL);
1145 continue;
1146 }
1147 ALLOC_GROW(trailer_strings, nr + 1, alloc);
1148 trailer_strings[nr] = strbuf_detach(*ptr, NULL);
1149 last = find_separator(trailer_strings[nr], separators) >= 1
1150 ? &trailer_strings[nr]
1151 : NULL;
1152 nr++;
1153 }
1154 strbuf_list_free(trailer_lines);
1155
1156 info->blank_line_before_trailer = ends_with_blank_line(str,
de7c27a1
LA
1157 trailer_block_start);
1158 info->trailer_block_start = trailer_block_start;
1159 info->trailer_block_end = end_of_log_message;
e8c352c3
JT
1160 info->trailers = trailer_strings;
1161 info->trailer_nr = nr;
1162}
1163
1164void trailer_info_release(struct trailer_info *info)
1165{
a3b636e2 1166 size_t i;
e8c352c3
JT
1167 for (i = 0; i < info->trailer_nr; i++)
1168 free(info->trailers[i]);
1169 free(info->trailers);
1170}
a388b10f
JK
1171
1172static void format_trailer_info(struct strbuf *out,
1173 const struct trailer_info *info,
de7c27a1 1174 const char *msg,
a388b10f
JK
1175 const struct process_trailer_options *opts)
1176{
0b691d86 1177 size_t origlen = out->len;
a3b636e2 1178 size_t i;
58311c66
JK
1179
1180 /* If we want the whole block untouched, we can take the fast path. */
8b966a05 1181 if (!opts->only_trailers && !opts->unfold && !opts->filter &&
058761f1
ÆAB
1182 !opts->separator && !opts->key_only && !opts->value_only &&
1183 !opts->key_value_separator) {
de7c27a1
LA
1184 strbuf_add(out, msg + info->trailer_block_start,
1185 info->trailer_block_end - info->trailer_block_start);
58311c66
JK
1186 return;
1187 }
1188
1189 for (i = 0; i < info->trailer_nr; i++) {
1190 char *trailer = info->trailers[i];
0d2db00e 1191 ssize_t separator_pos = find_separator(trailer, separators);
58311c66
JK
1192
1193 if (separator_pos >= 1) {
1194 struct strbuf tok = STRBUF_INIT;
1195 struct strbuf val = STRBUF_INIT;
1196
1197 parse_trailer(&tok, &val, NULL, trailer, separator_pos);
250bea0c
AW
1198 if (!opts->filter || opts->filter(&tok, opts->filter_data)) {
1199 if (opts->unfold)
1200 unfold_value(&val);
0b691d86
AW
1201
1202 if (opts->separator && out->len != origlen)
1203 strbuf_addbuf(out, opts->separator);
d9b936db 1204 if (!opts->value_only)
9d87d5ae 1205 strbuf_addbuf(out, &tok);
058761f1
ÆAB
1206 if (!opts->key_only && !opts->value_only) {
1207 if (opts->key_value_separator)
1208 strbuf_addbuf(out, opts->key_value_separator);
1209 else
1210 strbuf_addstr(out, ": ");
1211 }
9d87d5ae
ÆAB
1212 if (!opts->key_only)
1213 strbuf_addbuf(out, &val);
0b691d86
AW
1214 if (!opts->separator)
1215 strbuf_addch(out, '\n');
250bea0c 1216 }
58311c66
JK
1217 strbuf_release(&tok);
1218 strbuf_release(&val);
1219
1220 } else if (!opts->only_trailers) {
0b691d86
AW
1221 if (opts->separator && out->len != origlen) {
1222 strbuf_addbuf(out, opts->separator);
1223 }
58311c66 1224 strbuf_addstr(out, trailer);
0b691d86
AW
1225 if (opts->separator) {
1226 strbuf_rtrim(out);
1227 }
58311c66
JK
1228 }
1229 }
1230
a388b10f
JK
1231}
1232
1233void format_trailers_from_commit(struct strbuf *out, const char *msg,
1234 const struct process_trailer_options *opts)
1235{
1236 struct trailer_info info;
1237
00a21f5c 1238 trailer_info_get(&info, msg, opts);
de7c27a1 1239 format_trailer_info(out, &info, msg, opts);
a388b10f
JK
1240 trailer_info_release(&info);
1241}
f0939a0e
JK
1242
1243void trailer_iterator_init(struct trailer_iterator *iter, const char *msg)
1244{
1245 struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
1246 strbuf_init(&iter->key, 0);
1247 strbuf_init(&iter->val, 0);
1248 opts.no_divider = 1;
13211ae2
LA
1249 trailer_info_get(&iter->internal.info, msg, &opts);
1250 iter->internal.cur = 0;
f0939a0e
JK
1251}
1252
1253int trailer_iterator_advance(struct trailer_iterator *iter)
1254{
13211ae2
LA
1255 while (iter->internal.cur < iter->internal.info.trailer_nr) {
1256 char *trailer = iter->internal.info.trailers[iter->internal.cur++];
f0939a0e
JK
1257 int separator_pos = find_separator(trailer, separators);
1258
1259 if (separator_pos < 1)
1260 continue; /* not a real trailer */
1261
1262 strbuf_reset(&iter->key);
1263 strbuf_reset(&iter->val);
1264 parse_trailer(&iter->key, &iter->val, NULL,
1265 trailer, separator_pos);
1266 unfold_value(&iter->val);
1267 return 1;
1268 }
1269 return 0;
1270}
1271
1272void trailer_iterator_release(struct trailer_iterator *iter)
1273{
13211ae2 1274 trailer_info_release(&iter->internal.info);
f0939a0e
JK
1275 strbuf_release(&iter->val);
1276 strbuf_release(&iter->key);
1277}