git: 92e978439f0c - main - cal: don't print terminal control characters unless stdout is a TTY
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 13 Jan 2023 21:30:32 UTC
The branch main has been updated by asomers:
URL: https://cgit.FreeBSD.org/src/commit/?id=92e978439f0c3139775ad96d412959f5a74b17b6
commit 92e978439f0c3139775ad96d412959f5a74b17b6
Author: Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2023-01-13 20:19:03 +0000
Commit: Alan Somers <asomers@FreeBSD.org>
CommitDate: 2023-01-13 21:30:00 +0000
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
---
usr.bin/ncal/ncal.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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