lirc: Don't log responses to STDOUT.

In wait_for_response, we were simply logging anything received
to STDOUT. This was done for the benefit of the associated
IRC client, where we would want to see these things. However,
when used as a library in other applications, we don't necessarily
want these going to STDOUT!

Instead, use a log callback (specifically, a new verbose log level),
as most of the expected responses will be NOTICE messages. That way,
they can still get printed out where desired, but won't get logged
to STDOUT if not desired.

The included client has been updated so that received data should
still be logged to its STDOUT mostly as before.

Author: InterLinked1

client.c

@@ -123,6 +123,11 @@ static void __client_log(enum irc_log_level level, int sublevel, const char *fil
 			print_time(fd);
 			dprintf(fd, "[%sINFO %s] %s:%d %s() %s", COLOR_CYAN, COLOR_RESET, file, line, func, msg);
 			break;
+		case IRC_LOG_VERBOSE:
+			/* irc.c guarantees this is newline terminated, so we can safely prefix with CR
+			 * to ensure we overwrite the prompt, without worrying about overwriting something we just wrote. */
+			dprintf(fd, "\r%s", msg);
+			break;
 		case IRC_LOG_DEBUG:
 			if (debug_level >= sublevel) {
 				print_time(fd);

irc.c

@@ -88,6 +88,7 @@ void irc_log_callback(void (*callback)(enum irc_log_level level, int sublevel, c
 #define irc_err(fmt, ...) __irc_log(IRC_LOG_ERR, 0, __FILE__, __LINE__, __FUNCTION__, fmt, ## __VA_ARGS__)
 #define irc_warn(fmt, ...) __irc_log(IRC_LOG_WARN, 0, __FILE__, __LINE__, __FUNCTION__, fmt, ## __VA_ARGS__)
 #define irc_info(fmt, ...) __irc_log(IRC_LOG_INFO, 0, __FILE__, __LINE__, __FUNCTION__, fmt, ## __VA_ARGS__)
+#define irc_verbose(fmt, ...) __irc_log(IRC_LOG_VERBOSE, 0, __FILE__, __LINE__, __FUNCTION__, fmt, ## __VA_ARGS__)
 #define irc_debug(level, fmt, ...) __irc_log(IRC_LOG_DEBUG, level, __FILE__, __LINE__, __FUNCTION__, fmt, ## __VA_ARGS__)
 
 static void __attribute__ ((format (gnu_printf, 6, 7))) __irc_log(enum irc_log_level level, int sublevel, const char *file, int line, const char *func, const char *fmt, ...)
@@ -709,7 +710,9 @@ static int wait_for_response(struct irc_client *client, char *buf, size_t len, i
 		}
 		/* NUL terminate so we can use strstr */
 		buf[bytes] = '\0'; /* Safe */
-		printf("%s", buf); /* Print out whatever we received */
+		/* Print out whatever we receive, typically these are NOTICE messages.
+		 * If it already has a newline, don't add one, but if it doesn't, do. */
+		irc_verbose("%s%s", buf, strchr(buf, '\n') ? "" : "\n");
 		if (strstr(buf, s)) {
 			return 0;
 		}

irc.h

@@ -12,7 +12,7 @@
 
 #define LIRC_VERSION_MAJOR 1
 #define LIRC_VERSION_MINOR 1
-#define LIRC_VERSION_PATCH 0
+#define LIRC_VERSION_PATCH 1
 
 /*! \brief Maximum length of an IRC message, including trailing CR LF */
 #define IRC_MAX_MSG_LEN 512
@@ -81,6 +81,7 @@ enum irc_log_level {
 	IRC_LOG_ERR,
 	IRC_LOG_WARN,
 	IRC_LOG_INFO,
+	IRC_LOG_VERBOSE,
 	IRC_LOG_DEBUG,
 };