tutorials: root_of_trust: reduce redundant code using strlcpy in remaining apps

Author: pqcfox

examples/tutorials/root_of_trust/encryption_service_milestone_one/main.c

@@ -7,6 +7,7 @@
 #include "libtock/tock.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <libtock-sync/interface/console.h>
 #include <libtock/kernel/ipc.h>
@@ -63,12 +64,8 @@ static int setup_logging() {
 static int log_to_screen(const char* message) {
   returncode_t ret;
 
-  // Copy up to the log buffer's size of the message, with room for a null byte.
-  uint16_t len = strnlen(message, sizeof(log_buf) - 1);
-  memcpy(log_buf, message, len);
-
-  // Add the null byte.
-  log_buf[len] = '\0';
+  // Load the log buffer with our message
+  strlcpy(log_buf, message, LOG_WIDTH);
 
   // Start the logging process.
   ret = ipc_notify_service(screen_service);

examples/tutorials/root_of_trust/encryption_service_milestone_three/main.c

@@ -7,6 +7,7 @@
 #include "libtock/tock.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <libtock-sync/interface/console.h>
 #include <libtock/kernel/ipc.h>
@@ -66,12 +67,8 @@ static int setup_logging() {
 static int log_to_screen(const char* message) {
   returncode_t ret;
 
-  // Copy up to the log buffer's size of the message, with room for a null byte.
-  uint16_t len = strnlen(message, sizeof(log_buf) - 1);
-  memcpy(log_buf, message, len);
-
-  // Add the null byte.
-  log_buf[len] = '\0';
+  // Load the log buffer with our message
+  strlcpy(log_buf, message, LOG_WIDTH);
 
   // Start the logging process.
   ret = ipc_notify_service(screen_service);

examples/tutorials/root_of_trust/encryption_service_milestone_two/main.c

@@ -7,6 +7,7 @@
 #include "libtock/tock.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <libtock-sync/interface/console.h>
 #include <libtock/kernel/ipc.h>
@@ -63,12 +64,8 @@ static int setup_logging() {
 static int log_to_screen(const char* message) {
   returncode_t ret;
 
-  // Copy up to the log buffer's size of the message, with room for a null byte.
-  uint16_t len = strnlen(message, sizeof(log_buf) - 1);
-  memcpy(log_buf, message, len);
-
-  // Add the null byte.
-  log_buf[len] = '\0';
+  // Load the log buffer with our message
+  strlcpy(log_buf, message, LOG_WIDTH);
 
   // Start the logging process.
   ret = ipc_notify_service(screen_service);

examples/tutorials/root_of_trust/suspicious_service_milestone_one/main.c

@@ -6,6 +6,7 @@
 #include "libtock/tock.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <libtock/kernel/ipc.h>
 
@@ -64,12 +65,8 @@ static int setup_logging() {
 static int log_to_screen(const char* message) {
   returncode_t ret;
 
-  // Copy up to the log buffer's size of the message, with room for a null byte.
-  uint16_t len = strnlen(message, sizeof(log_buf) - 1);
-  memcpy(log_buf, message, len);
-
-  // Add the null byte.
-  log_buf[len] = '\0';
+  // Load the log buffer with our message
+  strlcpy(log_buf, message, LOG_WIDTH);
 
   // Start the logging process.
   ret = ipc_notify_service(screen_service);