# [PATCH 2/3] Move color option parsing out of diff.c and into color.[ch] 3 messages from 2006-09-07 to 2006-09-08. Participants: Jeff King, Junio C Hamano. Thread: https://gitlist.dev/t/5504 ## Jeff King, 2006-09-07 06:35 Subject: [PATCH 2/3] Move color option parsing out of diff.c and into color.[ch] Message-ID: <20060907063559.GB17083@coredump.intra.peff.net> URL: https://gitlist.dev/e/20060907063559.GB17083%40coredump.intra.peff.net In-Reply-To: <2ec783f6a8e8a901f7c30947e8c0eb50f71bc185.1157610743.git.peff@peff.net> ``` The intent is to lib-ify colorizing code so it can be reused. --- Makefile | 3 + color.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ color.h | 11 ++++ diff.c | 136 ++--------------------------------------------------- 4 files changed, 175 insertions(+), 133 deletions(-) diff --git a/Makefile b/Makefile index 7b3114f..78748cb 100644 --- a/Makefile +++ b/Makefile @@ -251,7 +251,8 @@ LIB_OBJS = \ tag.o tree.o usage.o config.o environment.o ctype.o copy.o \ fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \ write_or_die.o trace.o \ - alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) + alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \ + color.o BUILTIN_OBJS = \ builtin-add.o \ diff --git a/color.c b/color.c new file mode 100644 index 0000000..563ef70 --- /dev/null +++ b/color.c @@ -0,0 +1,158 @@ +#include "color.h" +#include "cache.h" +#include "git-compat-util.h" + +#include + +#define COLOR_RESET "\033[m" + +static int +parse_color(const char *name, int len) +{ + static const char * const color_names[] = { + "normal", "black", "red", "green", "yellow", + "blue", "magenta", "cyan", "white" + }; + char *end; + int i; + for (i = 0; i < ARRAY_SIZE(color_names); i++) { + const char *str = color_names[i]; + if (!strncasecmp(name, str, len) && !str[len]) + return i - 1; + } + i = strtol(name, &end, 10); + if (*name && !*end && i >= -1 && i <= 255) + return i; + return -2; +} + +static int +parse_attr(const char *name, int len) +{ + static const int attr_values[] = { 1, 2, 4, 5, 7 }; + static const char * const attr_names[] = { + "bold", "dim", "ul", "blink", "reverse" + }; + int i; + for (i = 0; i < ARRAY_SIZE(attr_names); i++) { + const char *str = attr_names[i]; + if (!strncasecmp(name, str, len) && !str[len]) + return attr_values[i]; + } + return -1; +} + +void +color_parse(const char *value, const char *var, char *dst) +{ + const char *ptr = value; + int attr = -1; + int fg = -2; + int bg = -2; + + if (!strcasecmp(value, "reset")) { + strcpy(dst, "\033[m"); + return; + } + + /* [fg [bg]] [attr] */ + while (*ptr) { + const char *word = ptr; + int val, len = 0; + + while (word[len] && !isspace(word[len])) + len++; + + ptr = word + len; + while (*ptr && isspace(*ptr)) + ptr++; + + val = parse_color(word, len); + if (val >= -1) { + if (fg == -2) { + fg = val; + continue; + } + if (bg == -2) { + bg = val; + continue; + } + goto bad; + } + val = parse_attr(word, len); + if (val < 0 || attr != -1) + goto bad; + attr = val; + } + + if (attr >= 0 || fg >= 0 || bg >= 0) { + int sep = 0; + + *dst++ = '\033'; + *dst++ = '['; + if (attr >= 0) { + *dst++ = '0' + attr; + sep++; + } + if (fg >= 0) { + if (sep++) + *dst++ = ';'; + if (fg < 8) { + *dst++ = '3'; + *dst++ = '0' + fg; + } else { + dst += sprintf(dst, "38;5;%d", fg); + } + } + if (bg >= 0) { + if (sep++) + *dst++ = ';'; + if (bg < 8) { + *dst++ = '4'; + *dst++ = '0' + bg; + } else { + dst += sprintf(dst, "48;5;%d", bg); + } + } + *dst++ = 'm'; + } + *dst = 0; + return; +bad: + die("bad config value '%s' for variable '%s'", value, var); +} + +int +git_config_colorbool(const char *var, const char *value) +{ + if (!value) + return 1; + if (!strcasecmp(value, "auto")) { + if (isatty(1) || (pager_in_use && pager_use_color)) { + char *term = getenv("TERM"); + if (term && strcmp(term, "dumb")) + return 1; + } + return 0; + } + if (!strcasecmp(value, "never")) + return 0; + if (!strcasecmp(value, "always")) + return 1; + return git_config_bool(var, value); +} + +int +color_printf(const char *color, const char *fmt, ...) { + va_list args; + int r; + + if (*color) + printf("%s", color); + va_start(args, fmt); + r = vprintf(fmt, args); + va_end(args); + if (*color) + printf("%s", COLOR_RESET); + return r; +} diff --git a/color.h b/color.h new file mode 100644 index 0000000..37a737a --- /dev/null +++ b/color.h @@ -0,0 +1,11 @@ +#ifndef COLOR_H +#define COLOR_H + +/* "\033[1;38;5;2xx;48;5;2xxm\0" is 23 bytes */ +#define COLOR_MAXLEN 24 + +int git_config_colorbool(const char *var, const char *value); +void color_parse(const char *var, const char *value, char *dst); +int color_printf(const char *color, const char *fmt, ...); + +#endif /* COLOR_H */ diff --git a/diff.c b/diff.c index a3ebc62..8178c11 100644 --- a/diff.c +++ b/diff.c @@ -10,6 +10,7 @@ #include "diff.h" #include "diffcore.h" #include "delta.h" #include "xdiff-interface.h" +#include "color.h" static int use_size_cache; @@ -17,8 +18,7 @@ static int diff_detect_rename_default; static int diff_rename_limit_default = -1; static int diff_use_color_default; -/* "\033[1;38;5;2xx;48;5;2xxm\0" is 23 bytes */ -static char diff_colors[][24] = { +static char diff_colors[][COLOR_MAXLEN] = { "\033[m", /* reset */ "", /* normal */ "\033[1m", /* bold */ @@ -45,119 +45,6 @@ static int parse_diff_color_slot(const c die("bad config variable '%s'", var); } -static int parse_color(const char *name, int len) -{ - static const char * const color_names[] = { - "normal", "black", "red", "green", "yellow", - "blue", "magenta", "cyan", "white" - }; - char *end; - int i; - for (i = 0; i < ARRAY_SIZE(color_names); i++) { - const char *str = color_names[i]; - if (!strncasecmp(name, str, len) && !str[len]) - return i - 1; - } - i = strtol(name, &end, 10); - if (*name && !*end && i >= -1 && i <= 255) - return i; - return -2; -} - -static int parse_attr(const char *name, int len) -{ - static const int attr_values[] = { 1, 2, 4, 5, 7 }; - static const char * const attr_names[] = { - "bold", "dim", "ul", "blink", "reverse" - }; - int i; - for (i = 0; i < ARRAY_SIZE(attr_names); i++) { - const char *str = attr_names[i]; - if (!strncasecmp(name, str, len) && !str[len]) - return attr_values[i]; - } - return -1; -} - -static void parse_diff_color_value(const char *value, const char *var, char *dst) -{ - const char *ptr = value; - int attr = -1; - int fg = -2; - int bg = -2; - - if (!strcasecmp(value, "reset")) { - strcpy(dst, "\033[m"); - return; - } - - /* [fg [bg]] [attr] */ - while (*ptr) { - const char *word = ptr; - int val, len = 0; - - while (word[len] && !isspace(word[len])) - len++; - - ptr = word + len; - while (*ptr && isspace(*ptr)) - ptr++; - - val = parse_color(word, len); - if (val >= -1) { - if (fg == -2) { - fg = val; - continue; - } - if (bg == -2) { - bg = val; - continue; - } - goto bad; - } - val = parse_attr(word, len); - if (val < 0 || attr != -1) - goto bad; - attr = val; - } - - if (attr >= 0 || fg >= 0 || bg >= 0) { - int sep = 0; - - *dst++ = '\033'; - *dst++ = '['; - if (attr >= 0) { - *dst++ = '0' + attr; - sep++; - } - if (fg >= 0) { - if (sep++) - *dst++ = ';'; - if (fg < 8) { - *dst++ = '3'; - *dst++ = '0' + fg; - } else { - dst += sprintf(dst, "38;5;%d", fg); - } - } - if (bg >= 0) { - if (sep++) - *dst++ = ';'; - if (bg < 8) { - *dst++ = '4'; - *dst++ = '0' + bg; - } else { - dst += sprintf(dst, "48;5;%d", bg); - } - } - *dst++ = 'm'; - } - *dst = 0; - return; -bad: - die("bad config value '%s' for variable '%s'", value, var); -} - /* * These are to give UI layer defaults. * The core-level commands such as git-diff-files should @@ -171,22 +58,7 @@ int git_diff_ui_config(const char *var, return 0; } if (!strcmp(var, "diff.color")) { - if (!value) - diff_use_color_default = 1; /* bool */ - else if (!strcasecmp(value, "auto")) { - diff_use_color_default = 0; - if (isatty(1) || (pager_in_use && pager_use_color)) { - char *term = getenv("TERM"); - if (term && strcmp(term, "dumb")) - diff_use_color_default = 1; - } - } - else if (!strcasecmp(value, "never")) - diff_use_color_default = 0; - else if (!strcasecmp(value, "always")) - diff_use_color_default = 1; - else - diff_use_color_default = git_config_bool(var, value); + diff_use_color_default = git_config_colorbool(var, value); return 0; } if (!strcmp(var, "diff.renames")) { @@ -201,7 +73,7 @@ int git_diff_ui_config(const char *var, } if (!strncmp(var, "diff.color.", 11)) { int slot = parse_diff_color_slot(var, 11); - parse_diff_color_value(value, var, diff_colors[slot]); + color_parse(value, var, diff_colors[slot]); return 0; } return git_default_config(var, value); -- 1.4.2.ge490e-dirty ``` ## Junio C Hamano, 2006-09-07 23:56 Subject: Re: [PATCH 2/3] Move color option parsing out of diff.c and into color.[ch] Message-ID: <7vfyf3s01w.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vfyf3s01w.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20060907063559.GB17083@coredump.intra.peff.net> ``` Jeff King writes: > +#include > + > +#define COLOR_RESET "\033[m" > + > +static int > +parse_color(const char *name, int len) > +{ Style (applies to all functions you moved to this new file). Some school of programming teach us to start the function name at the beginning of the line, separate from its type. They say that would make "grep '^parse_color'" to work better. That happens to be the way I was taught (actually it was a bit more strange that return type was to be indented by one TAB, so it looked like this: static int parse_color(const char *name, int len) ). But git style is the kernel style, and I refrain from doing that myself. static int parse_color(const char *name, int len) { ... > +int > +git_config_colorbool(const char *var, const char *value) > +{ > + if (!value) > + return 1; > + if (!strcasecmp(value, "auto")) { > + if (isatty(1) || (pager_in_use && pager_use_color)) { > + char *term = getenv("TERM"); > + if (term && strcmp(term, "dumb")) > + return 1; > + } > + return 0; > + } > + if (!strcasecmp(value, "never")) > + return 0; > + if (!strcasecmp(value, "always")) > + return 1; > + return git_config_bool(var, value); > +} > +int > +color_printf(const char *color, const char *fmt, ...) { Style. int color_printf(const char *color, const char *fmt, ...) { ... ``` ## Jeff King, 2006-09-08 00:11 Subject: Re: [PATCH 2/3] Move color option parsing out of diff.c and into color.[ch] Message-ID: <20060908001132.GA18649@coredump.intra.peff.net> URL: https://gitlist.dev/e/20060908001132.GA18649%40coredump.intra.peff.net In-Reply-To: <7vfyf3s01w.fsf@assigned-by-dhcp.cox.net> ``` On Thu, Sep 07, 2006 at 04:56:43PM -0700, Junio C Hamano wrote: > Some school of programming teach us to start the function name > at the beginning of the line, separate from its type. They say > that would make "grep '^parse_color'" to work better. Hmm. I don't like that style either, I was just using it because I thought that was the git style (which must have been caused by seeing some other function(s) with the same style -- but grepping through, it looks like there are very few functions using it). I'll fix the patches, but will wait to resend until I hear other comments. -Peff ```