rtapi: RTAI ends every message that lacks the newline too

The RTAI kernel handler and rtapi_print_msg() in RTAI user space follow the same rule as uspace: every rtapi_print_msg() message is a line, and rtapi_print() prints like printf. printk() shows a message without the newline only when the next one comes. The kernel handler now gives rt_printk() the text as an argument instead of as the format. Hannes Diethelm pointed out both on #4697.

Author: grandixximo

src/rtapi/rtai_rtapi.c

@@ -433,10 +433,19 @@ int rtapi_snprintf(char *buf, unsigned long int size, const char *fmt, ...)
 
 #define BUFFERLEN 1024
 
+/* Every rtapi_print_msg() message is one line: end one that lacks the
+   newline. rtapi_print() (RTAPI_MSG_ALL) prints like printf. */
 void default_rtapi_msg_handler(msg_level_t level, const char *fmt, va_list ap) {
     char buf[BUFFERLEN];
-    rtapi_vsnprintf(buf, BUFFERLEN, fmt, ap);
-    rt_printk(buf);
+    size_t n;
+    /* leave room for the newline */
+    rtapi_vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+    n = strlen(buf);
+    if (level != RTAPI_MSG_ALL && n > 0 && buf[n - 1] != '\n') {
+        buf[n] = '\n';
+        buf[n + 1] = '\0';
+    }
+    rt_printk("%s", buf);
 }
 static rtapi_msg_handler_t rtapi_msg_handler = default_rtapi_msg_handler;
 

src/rtapi/rtai_ulapi.c

@@ -269,9 +269,18 @@ void rtapi_print_msg(msg_level_t level, const char *fmt, ...)
     va_list args;
 
     if ((level <= msg_level) && (msg_level != RTAPI_MSG_NONE)) {
+	/* one message is one line: end one that lacks the newline */
+	char *msg;
+	int n;
 	va_start(args, fmt);
-	vfprintf(stderr, fmt, args);
+	n = vasprintf(&msg, fmt, args);
 	va_end(args);
+	if (n < 0)
+	    return;
+	fputs(msg, stderr);
+	if (level != RTAPI_MSG_ALL && n > 0 && msg[n - 1] != '\n')
+	    fputc('\n', stderr);
+	free(msg);
     }
 }