aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/ncal
diff options
context:
space:
mode:
authorAlan Somers <asomers@FreeBSD.org>2023-01-13 20:19:03 +0000
committerAlan Somers <asomers@FreeBSD.org>2023-01-13 21:30:00 +0000
commit92e978439f0c3139775ad96d412959f5a74b17b6 (patch)
tree8817ee6b28fa6a6401583bb3f0ba975c898fcb07 /usr.bin/ncal
parenteb1795782cfc43523345f78737cc22277cea5056 (diff)
downloadsrc-92e978439f0c3139775ad96d412959f5a74b17b6.tar.gz
src-92e978439f0c3139775ad96d412959f5a74b17b6.zip
cal: don't print terminal control characters unless stdout is a TTY
A similar change was made in svn r223931, but it was incomplete, working only when the utility was invoked as "ncal". Fix the same issue when invoking as "cal". PR: 268936 Reported by: Ray Bellis <ray@bellis.me.uk> MFC after: 2 weeks Sponsored by: Axcient Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D38045
Diffstat (limited to 'usr.bin/ncal')
-rw-r--r--usr.bin/ncal/ncal.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 8f94264efcd2..5a6c33ce759d 100644
--- a/usr.bin/ncal/ncal.c
+++ b/usr.bin/ncal/ncal.c
@@ -930,7 +930,8 @@ mkmonthb(int y, int m, int jd_flag, struct monthlines *mlines)
dt.d = j - jan1 + 1;
else
sdateb(j, &dt);
- if (j == highlightdate && !flag_nohighlight)
+ if (j == highlightdate && !flag_nohighlight
+ && isatty(STDOUT_FILENO))
highlight(mlines->lines[i] + k,
ds + dt.d * dw, dw, &l);
else