mirror of
https://github.com/git/git.git
synced 2024-11-15 16:03:16 +01:00
c93ca46cf5
'git column's '--nl' option can be used to specify a "string to be printed at the end of each line" (quoting the man page), but this option and its mandatory argument has been parsed as OPT_INTEGER since the introduction of the command in 7e29b8254f (Add column layout skeleton and git-column, 2012-04-21). Consequently, any non-number argument is rejected by parse-options, and any number other than 0 leads to segfault: $ printf "%s\n" one two |git column --mode=plain --nl=foo error: option `nl' expects a numerical value $ printf "%s\n" one two |git column --mode=plain --nl=42 Segmentation fault (core dumped) $ printf "%s\n" one two |git column --mode=plain --nl=0 one two Parse this option as OPT_STRING. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
60 lines
1.9 KiB
C
60 lines
1.9 KiB
C
#include "builtin.h"
|
|
#include "cache.h"
|
|
#include "config.h"
|
|
#include "strbuf.h"
|
|
#include "parse-options.h"
|
|
#include "string-list.h"
|
|
#include "column.h"
|
|
|
|
static const char * const builtin_column_usage[] = {
|
|
N_("git column [<options>]"),
|
|
NULL
|
|
};
|
|
static unsigned int colopts;
|
|
|
|
static int column_config(const char *var, const char *value, void *cb)
|
|
{
|
|
return git_column_config(var, value, cb, &colopts);
|
|
}
|
|
|
|
int cmd_column(int argc, const char **argv, const char *prefix)
|
|
{
|
|
struct string_list list = STRING_LIST_INIT_DUP;
|
|
struct strbuf sb = STRBUF_INIT;
|
|
struct column_options copts;
|
|
const char *command = NULL, *real_command = NULL;
|
|
struct option options[] = {
|
|
OPT_STRING(0, "command", &real_command, N_("name"), N_("lookup config vars")),
|
|
OPT_COLUMN(0, "mode", &colopts, N_("layout to use")),
|
|
OPT_INTEGER(0, "raw-mode", &colopts, N_("layout to use")),
|
|
OPT_INTEGER(0, "width", &copts.width, N_("maximum width")),
|
|
OPT_STRING(0, "indent", &copts.indent, N_("string"), N_("padding space on left border")),
|
|
OPT_STRING(0, "nl", &copts.nl, N_("string"), N_("padding space on right border")),
|
|
OPT_INTEGER(0, "padding", &copts.padding, N_("padding space between columns")),
|
|
OPT_END()
|
|
};
|
|
|
|
/* This one is special and must be the first one */
|
|
if (argc > 1 && starts_with(argv[1], "--command=")) {
|
|
command = argv[1] + 10;
|
|
git_config(column_config, (void *)command);
|
|
} else
|
|
git_config(column_config, NULL);
|
|
|
|
memset(&copts, 0, sizeof(copts));
|
|
copts.padding = 1;
|
|
argc = parse_options(argc, argv, prefix, options, builtin_column_usage, 0);
|
|
if (argc)
|
|
usage_with_options(builtin_column_usage, options);
|
|
if (real_command || command) {
|
|
if (!real_command || !command || strcmp(real_command, command))
|
|
die(_("--command must be the first argument"));
|
|
}
|
|
finalize_colopts(&colopts, -1);
|
|
while (!strbuf_getline(&sb, stdin))
|
|
string_list_append(&list, sb.buf);
|
|
|
|
print_columns(&list, colopts, &copts);
|
|
return 0;
|
|
}
|