From d35181b5d6922331be62f4c0ef4499df943d8763 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Tue, 1 Jun 2021 20:35:40 +0200
Subject: [PATCH] ignore lines that contain only whitespace.

---
 src/orderfile.c   | 72 +++++++++++++++++++++++++----------------------
 src/util/parser.c |  2 +-
 src/util/parser.h |  1 +
 3 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/src/orderfile.c b/src/orderfile.c
index 582d1fc56..11efa31a9 100644
--- a/src/orderfile.c
+++ b/src/orderfile.c
@@ -95,51 +95,55 @@ static void handle_unit(void *userData, int no) {
 
 static void handle_order(void *userData, const char *str) {
     parser_state *state = (parser_state *)userData;
-    const char * tok, *input = str;
+    const char * tok, *input;
     char buffer[64];
     const struct locale *lang;
-    param_t p;
     faction * f = state->f;
 
     lang = f ? f->locale : default_locale;
+    ltrim(&str);
+    if (*str == 0) return;
+    input = str;
     tok = parse_token(&input, buffer, sizeof(buffer));
-    p = findparam(tok, lang);
-    if (p == P_FACTION || p == P_GAMENAME) {
-        tok = parse_token(&input, buffer, sizeof(buffer));
-        if (tok) {
-            int no = atoi36(tok);
+    if (tok) {
+        param_t p = findparam(tok, lang);
+        if (p == P_FACTION || p == P_GAMENAME) {
             tok = parse_token(&input, buffer, sizeof(buffer));
-            handle_faction(userData, no, tok);
+            if (tok) {
+                int no = atoi36(tok);
+                tok = parse_token(&input, buffer, sizeof(buffer));
+                handle_faction(userData, no, tok);
+            }
+            else {
+                /* TODO: log_error() */
+            }
         }
-        else {
-            /* TODO: log_error() */
+        else if (p == P_UNIT) {
+            tok = parse_token(&input, buffer, sizeof(buffer));
+            if (tok) {
+                int no = atoi36(tok);
+                handle_unit(userData, no);
+            }
         }
-    }
-    else if (p == P_UNIT) {
-        tok = parse_token(&input, buffer, sizeof(buffer));
-        if (tok) {
-            int no = atoi36(tok);
-            handle_unit(userData, no);
+        else if (p == P_NEXT) {
+            state->f = NULL;
+            state->u = NULL;
+            state->next_order = NULL;
         }
-    }
-    else if (p == P_NEXT) {
-        state->f = NULL;
-        state->u = NULL;
-        state->next_order = NULL;
-    }
-    else if (p == P_REGION) {
-        state->u = NULL;
-        state->next_order = NULL;
-    }
-    else if (state->u) {
-        unit * u = state->u;
-        order * ord = parse_order(str, lang);
-        if (ord) {
-            *state->next_order = ord;
-            state->next_order = &ord->next;
+        else if (p == P_REGION) {
+            state->u = NULL;
+            state->next_order = NULL;
         }
-        else {
-            ADDMSG(&u->faction->msgs, msg_message("parse_error", "unit command", u, str));
+        else if (state->u) {
+            unit *u = state->u;
+            order *ord = parse_order(str, lang);
+            if (ord) {
+                *state->next_order = ord;
+                state->next_order = &ord->next;
+            }
+            else {
+                ADDMSG(&u->faction->msgs, msg_message("parse_error", "unit command", u, str));
+            }
         }
     }
 }
diff --git a/src/util/parser.c b/src/util/parser.c
index 794c1b856..506e8ce59 100644
--- a/src/util/parser.c
+++ b/src/util/parser.c
@@ -26,7 +26,7 @@ static parse_state *states;
 
 #define TRIMMED(wc) (iswspace(wc) || iswcntrl(wc) || (wc) == 160 || (wc) == 8199 || (wc) == 8239)
 
-static int ltrim(const char **str_p)
+int ltrim(const char **str_p)
 {
     int ret = 0;
     wint_t wc;
diff --git a/src/util/parser.h b/src/util/parser.h
index a08133775..5ac418789 100644
--- a/src/util/parser.h
+++ b/src/util/parser.h
@@ -22,6 +22,7 @@ extern "C" {
     int getint(void);
     int getid(void);
     unsigned int atoip(const char *s);
+    int ltrim(const char **str_p);
 
 #ifdef __cplusplus
 }