git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH 4/5] config.c: introduce 'git_config_color' to parse ANSI colors
Date: Wed, 25 Apr 2018 21:25:27 -0700	[thread overview]
Message-ID: <9af7952db38403dc7ed7aed1fea66d12c3cd5361.1524716420.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1524716420.git.me@ttaylorr.com>

In preparation for adding `--type=color` to the `git-config(1)` builtin,
let's introduce a color parsing utility, `git_config_color` in a similar
fashion to `git_config_<type>`.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
---
 config.c | 10 ++++++++++
 config.h |  1 +
 2 files changed, 11 insertions(+)

diff --git a/config.c b/config.c
index 62c56099bf..d14813bef7 100644
--- a/config.c
+++ b/config.c
@@ -16,6 +16,7 @@
 #include "string-list.h"
 #include "utf8.h"
 #include "dir.h"
+#include "color.h"
 
 struct config_source {
 	struct config_source *prev;
@@ -1000,6 +1001,15 @@ int git_config_expiry_date(timestamp_t *timestamp, const char *var, const char *
 	return 0;
 }
 
+int git_config_color(char *dest, const char *var, const char *value)
+{
+	if (!value)
+		return config_error_nonbool(var);
+	if (color_parse(value, dest) < 0)
+		return -1;
+	return 0;
+}
+
 static int git_default_core_config(const char *var, const char *value)
 {
 	/* This needs a better name */
diff --git a/config.h b/config.h
index ef70a9cac1..0e060779d9 100644
--- a/config.h
+++ b/config.h
@@ -59,6 +59,7 @@ extern int git_config_bool(const char *, const char *);
 extern int git_config_string(const char **, const char *, const char *);
 extern int git_config_pathname(const char **, const char *, const char *);
 extern int git_config_expiry_date(timestamp_t *, const char *, const char *);
+extern int git_config_color(char *, const char *, const char *);
 extern int git_config_set_in_file_gently(const char *, const char *, const char *);
 extern void git_config_set_in_file(const char *, const char *, const char *);
 extern int git_config_set_gently(const char *, const char *);
-- 
2.17.0


  parent reply	other threads:[~2018-04-26  4:25 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-26  4:25 [PATCH 0/5] builtin/config.c: combined series '--type', '--default' Taylor Blau
2018-04-26  4:25 ` [PATCH 1/5] builtin/config.c: treat type specifiers singularly Taylor Blau
2018-04-26  4:25 ` [PATCH 2/5] builtin/config.c: support `--type=<type>` as preferred alias for `--type` Taylor Blau
2018-04-26  5:25   ` Junio C Hamano
2018-04-26  6:00     ` Taylor Blau
2018-04-27  6:06       ` Eric Sunshine
2018-04-26  4:25 ` [PATCH 3/5] builtin/config: introduce `--default` Taylor Blau
2018-04-26  4:25 ` Taylor Blau [this message]
2018-04-26  4:25 ` [PATCH 5/5] builtin/config: introduce `color` type specifier Taylor Blau
2018-04-26  5:32   ` Junio C Hamano
2018-04-26  6:01     ` Taylor Blau
2018-04-26  5:58 ` [PATCH v2 0/5] builtin/config.c: combined series '--type', '--default' Taylor Blau
2018-04-26  5:58   ` [PATCH v2 1/5] builtin/config.c: treat type specifiers singularly Taylor Blau
2018-04-26  5:58   ` [PATCH v2 2/5] builtin/config.c: support `--type=<type>` as preferred alias for `--<type>` Taylor Blau
2018-04-26  9:49     ` Junio C Hamano
2018-04-27  5:57     ` Eric Sunshine
2018-04-26  5:58   ` [PATCH v2 3/5] builtin/config: introduce `--default` Taylor Blau
2018-04-26  5:58   ` [PATCH v2 4/5] config.c: introduce 'git_config_color' to parse ANSI colors Taylor Blau
2018-04-26  5:58   ` [PATCH v2 5/5] builtin/config: introduce `color` type specifier Taylor Blau
2018-04-27  6:22     ` Eric Sunshine

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9af7952db38403dc7ed7aed1fea66d12c3cd5361.1524716420.git.me@ttaylorr.com \
    --to=me@ttaylorr.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).