aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2024-07-18 06:41:44 +0000
committerDaniel Eklöf <daniel@ekloef.se>2024-07-18 06:44:30 +0000
commit36e4435bbfbb1a10724e0161f0ca1c0b8bf1bc7c (patch)
tree869b466ff816067793205f83b2e9a734e983f52c
parentwayland: use wl_shm v2 if available (diff)
log: respect the NO_COLOR environment variable
http://no-color.org/ Closes #1771
-rw-r--r--CHANGELOG.md3
-rw-r--r--log.c8
2 files changed, 10 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7308eda1..7b0e30ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,11 +65,14 @@
* Support for SGR 21 (double underline).
* Support for `XTPUSHCOLORS`, `XTPOPCOLORS` and `XTREPORTCOLORS`,
i.e. color palette stack ([#856][856]).
+* Log output now respects the [`NO_COLOR`](http://no-color.org/)
+ environment variable ([#1771][1771]).
[1707]: https://codeberg.org/dnkl/foot/issues/1707
[1738]: https://codeberg.org/dnkl/foot/issues/1738
[828]: https://codeberg.org/dnkl/foot/issues/828
[856]: https://codeberg.org/dnkl/foot/issues/856
+[1771]: https://codeberg.org/dnkl/foot/issues/1771
### Changed
diff --git a/log.c b/log.c
index d19adaca..ebf411ec 100644
--- a/log.c
+++ b/log.c
@@ -40,7 +40,13 @@ log_init(enum log_colorize _colorize, bool _do_syslog,
[LOG_FACILITY_DAEMON] = LOG_DAEMON,
};
- colorize = _colorize == LOG_COLORIZE_ALWAYS || (_colorize == LOG_COLORIZE_AUTO && isatty(STDERR_FILENO));
+ /* Don't use colors if NO_COLOR is defined and not empty */
+ const char *no_color_str = getenv("NO_COLOR");
+ const bool no_color = no_color_str != NULL && no_color_str[0] != '\0';
+
+ colorize = _colorize == LOG_COLORIZE_ALWAYS
+ || (_colorize == LOG_COLORIZE_AUTO
+ && !no_color && isatty(STDERR_FILENO));
do_syslog = _do_syslog;
log_level = _log_level;