From 2a6e3f2d02951fea389db6767f5e4ed657964d80 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Mon, 25 Feb 2019 17:00:28 -0500 Subject: [PATCH] Output raw to standard error if it is not a terminal --- catgirl.1 | 3 +++ irc.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/catgirl.1 b/catgirl.1 index 2638d6f..b8c912a 100644 --- a/catgirl.1 +++ b/catgirl.1 @@ -90,6 +90,9 @@ the same as the nickname. Show raw IRC protocol in the .Sy window. +If standard error is not a terminal, +output raw IRC protocol +to standard error. . .It Fl w Ar pass Log in with diff --git a/irc.c b/irc.c index a8dc2dd..2ad6d19 100644 --- a/irc.c +++ b/irc.c @@ -111,6 +111,7 @@ void ircFmt(const char *format, ...) { va_end(ap); if (!buf) err(EX_OSERR, "vasprintf"); if (self.raw) { + if (!isatty(STDERR_FILENO)) fprintf(stderr, "<<< %.*s\n", len - 2, buf); uiFmt(TagRaw, UICold, "\3%d<<<\3 %.*s", IRCWhite, len - 2, buf); } ircWrite(buf, len); @@ -142,6 +143,7 @@ retry: while (NULL != (crlf = memmem(line, &buf[len] - line, "\r\n", 2))) { crlf[0] = '\0'; if (self.raw) { + if (!isatty(STDERR_FILENO)) fprintf(stderr, ">>> %s\n", line); uiFmt(TagRaw, UICold, "\3%d>>>\3 %s", IRCGray, line); } handle(line);