[cowdancer] 02/03: If USECOLORS is auto, print resolved value too
James Clarke
jrtc27-guest at moszumanska.debian.org
Thu Sep 8 21:22:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
jrtc27-guest pushed a commit to branch master
in repository cowdancer.
commit 3cc71b1f933fca6a03ca3cc32a870dbc1c25400b
Author: James Clarke <jrtc27 at jrtc27.com>
Date: Thu Sep 8 21:44:36 2016 +0100
If USECOLORS is auto, print resolved value too
---
log.c | 13 +++++++++++++
log.h | 2 ++
parameter.c | 16 +++++++++++++---
3 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/log.c b/log.c
index 74b5ec6..a132af0 100644
--- a/log.c
+++ b/log.c
@@ -95,6 +95,19 @@ void log_set_filter_level(log_level filter_level_new)
log_use_colors log_get_use_colors(void)
{
+ if (use_colors == log_use_colors_auto)
+ {
+ if (term_supports_colors())
+ use_colors = log_use_colors_yes;
+ else
+ use_colors = log_use_colors_no;
+ }
+
+ return use_colors;
+}
+
+log_use_colors log_get_use_colors_unresolved(void)
+{
return use_colors_orig;
}
diff --git a/log.h b/log.h
index ec95d22..41e8875 100644
--- a/log.h
+++ b/log.h
@@ -47,6 +47,8 @@ void log_set_filter_level(log_level filter_level_new);
log_use_colors log_get_use_colors(void);
+log_use_colors log_get_use_colors_unresolved(void);
+
void log_set_use_colors(log_use_colors use_colors_new);
void log_perror(const char *s);
diff --git a/parameter.c b/parameter.c
index 28a64f9..1099f1b 100644
--- a/parameter.c
+++ b/parameter.c
@@ -294,10 +294,20 @@ int cpbuilder_dumpconfig(pbuilderconfig* pc)
break;
}
-#define DUMPUSECOLORS(S) printf(" use_colors: "S"\n");
+#define DUMPUSECOLORS(S) printf(" use_colors: "S"\n")
+#define DUMPUSECOLORSAUTO(S) DUMPUSECOLORS("auto ("S")")
#define CASEUSECOLORS(S) case log_use_colors_##S: DUMPUSECOLORS(#S); break;
- switch (log_get_use_colors()) {
- CASEUSECOLORS(auto);
+#define CASEUSECOLORSAUTO(S) case log_use_colors_##S: DUMPUSECOLORSAUTO(#S); break;
+ switch (log_get_use_colors_unresolved()) {
+ case log_use_colors_auto:
+ switch (log_get_use_colors()) {
+ CASEUSECOLORSAUTO(no);
+ CASEUSECOLORSAUTO(yes);
+ default:
+ DUMPUSECOLORSAUTO("?");
+ break;
+ }
+ break;
CASEUSECOLORS(no);
CASEUSECOLORS(yes);
default:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/cowdancer.git
More information about the Pbuilder-maint
mailing list