summaryrefslogtreecommitdiffstats
path: root/misc-utils
diff options
context:
space:
mode:
authorOndrej Oprala2014-01-23 13:03:45 +0100
committerKarel Zak2014-03-11 09:38:09 +0100
commitd0c9ddc3cc18f0f374a0d13516dacbda2e3a1a0c (patch)
treee3022408c0a770a666be7ff829e3f9291883cf59 /misc-utils
parenttests: check commands needed for running a test exist (diff)
downloadkernel-qcow2-util-linux-d0c9ddc3cc18f0f374a0d13516dacbda2e3a1a0c.tar.gz
kernel-qcow2-util-linux-d0c9ddc3cc18f0f374a0d13516dacbda2e3a1a0c.tar.xz
kernel-qcow2-util-linux-d0c9ddc3cc18f0f374a0d13516dacbda2e3a1a0c.zip
lib/colors: check for /etc/terminal-colors.d/[util].disable
[kzak@redhat.com: - move paths to pathnames.h, - use static path buffer] Signed-off-by: Ondrej Oprala <ooprala@redhat.com> Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils')
-rw-r--r--misc-utils/cal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 747694d75..81375fe19 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -266,7 +266,7 @@ int main(int argc, char **argv)
static struct cal_control ctl = {
.weekstart = SUNDAY,
.num_months = NUM_MONTHS,
- .colormode = UL_COLORMODE_AUTO,
+ .colormode = UL_COLORMODE_UNDEF,
.weektype = WEEK_NUM_DISABLED,
.day_width = DAY_LEN,
.gutter_width = 2,
@@ -469,7 +469,7 @@ int main(int argc, char **argv)
headers_init(&ctl);
- if (!colors_init(ctl.colormode)) {
+ if (!colors_init(ctl.colormode, "cal")) {
ctl.req.day = 0;
ctl.weektype &= ~WEEK_NUM_MASK;
}