From: Nguyễn Thái Ngọc Duy Date: Wed, 09 Feb 2011 12:24:35 GMT Subject: [PATCH 07/16] parseopt: OPT_COLUMN to set struct column_layout.mode Message-ID: <1297254284-3729-8-git-send-email-pclouds@gmail.com> In-Reply-To: <1297254284-3729-1-git-send-email-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- column.c | 15 +++++++++++++++ column.h | 3 +++ parse-options.h | 2 ++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/column.c b/column.c index 615a698..c08a885 100644 --- a/column.c +++ b/column.c @@ -270,3 +270,18 @@ int git_config_column(const char *var, const char *value, int stdout_is_tty) return 0; } + +int parseopt_column_callback(const struct option *opt, const char *arg, int unset) +{ + int *mode = opt->value; + if (unset) { + *mode = COL_MODE_PLAIN; + return 0; + } + if (!arg) { + if (!MODE(*mode)) + *mode |= COL_MODE_COLUMN; + return 0; + } + return parse_column_option(arg, strlen(arg), mode); +} diff --git a/column.h b/column.h index 0749793..99ec848 100644 --- a/column.h +++ b/column.h @@ -12,4 +12,7 @@ extern int term_columns(void); extern void display_columns(const struct string_list *list, int mode, int width, int padding, const char *indent); extern int git_config_column(const char *var, const char *value, int stdout_is_tty); +struct option; +extern int parseopt_column_callback(const struct option *opt, const char *arg, int unset); + #endif diff --git a/parse-options.h b/parse-options.h index 31ec5d2..2fed453 100644 --- a/parse-options.h +++ b/parse-options.h @@ -145,6 +145,8 @@ struct option { #define OPT_COLOR_FLAG(s, l, v, h) \ { OPTION_CALLBACK, (s), (l), (v), "when", (h), PARSE_OPT_OPTARG, \ parse_opt_color_flag_cb, (intptr_t)"always" } +#define OPT_COLUMN(s, l, v, h) \ + { OPTION_CALLBACK, (s), (l), (v), "style", (h), PARSE_OPT_OPTARG, parseopt_column_callback } /* parse_options() will filter out the processed options and leave the -- 1.7.2.2