From 59fdd98954f316ba6b7037ec1fcb03fcf092dc38 Mon Sep 17 00:00:00 2001
From: Thomas Lykkeberg <thomas.lykkeberg@space-inventor.com>
Date: Mon, 11 May 2026 14:42:44 +0200
Subject: [PATCH] Reworked the stdbuf2 client part of the CSH. This is to
 prevent the extra LF being emitted when the stdbuf is empty on the particular
 module. This should also fix the issue of a missing LF at the last packet
 coming in from the CSP layer, which could happen if the connection is lost
 during the stdbuf2 execution.

---
 src/stdbuf_client.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/stdbuf_client.c b/src/stdbuf_client.c
index 22cd5822..9acc260b 100644
--- a/src/stdbuf_client.c
+++ b/src/stdbuf_client.c
@@ -196,13 +196,16 @@ static int stdbuf_v2(unsigned int node, unsigned int timeout, char * logfile) {
 
     #define LF '\n' /* ASCII 10d */
     #define CR '\r' /* ASCII 13d */
+    bool lf_missing = false;
+    int ignore __attribute__((unused));
     while ((packet = csp_read(conn, timeout))) {
         int again = packet->data[0];
-        int ignore __attribute__((unused));
-        ignore = write(fileno(stdout), &packet->data[1], packet->length - 1);
-        if (again == 0 && packet->data[packet->length - 1] != LF) {
-            /* If this was the last packet and there was no LF we will add one here to flush the stdout file */
-            ignore = write(fileno(stdout), "\n", 1);
+        if (packet->length > 1) {
+            ignore = write(fileno(stdout), &packet->data[1], packet->length - 1);
+            lf_missing = false;
+            if (packet->data[packet->length - 1] != LF) {
+                lf_missing = true;
+            }
         }
         if (log_f) {
             int i = 1;
@@ -230,6 +233,16 @@ static int stdbuf_v2(unsigned int node, unsigned int timeout, char * logfile) {
         }
     }
 
+    /**
+     * We might have something lingering in the stdout due to a missing Line Feed.
+     * This could be caused if we experienced a time out during reception of stdbuf
+     * packets in the while-loop, or if the last packet did not contain a Line Feed
+     * as its last character. We then need to flush the stdout by injecting a LF.
+     */
+    if (lf_missing) {
+        ignore = write(fileno(stdout), "\n", 1);
+    }
+
     csp_close(conn);
 
     return SLASH_SUCCESS;