Parsing tweaks

obsidian-level-maker · Jun 23, 2024 · 3af5087 · 3af5087
1 parent b7f1175
commit 3af5087
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 37 deletions.
diff --git a/source/lib_util.cc b/source/lib_util.cc
@@ -564,21 +564,6 @@ int StringPrefixCaseCompare(std::string_view A, std::string_view B)
     }
 }
 
-void StringRemoveCRLF(std::string *str)
-{
-    if (!str->empty())
-    {
-        if (str->back() == '\n')
-        {
-            str->pop_back();
-        }
-        if (!str->empty() && str->back() == '\r')
-        {
-            str->pop_back();
-        }
-    }
-}
-
 void StringReplaceChar(std::string *str, char old_ch, char new_ch)
 {
     // when 'new_ch' is zero, the character is simply removed

diff --git a/source/lib_util.h b/source/lib_util.h
@@ -112,7 +112,6 @@ int StringPrefixCompare(std::string_view A, std::string_view B);
 int StringCaseCompare(std::string_view A, std::string_view B);
 int StringPrefixCaseCompare(std::string_view A, std::string_view B);
 
-void StringRemoveCRLF(std::string *str);
 void StringReplaceChar(std::string *str, char old_ch, char new_ch);
 
 std::string StringFormat(std::string_view fmt, ...);

diff --git a/source/m_cookie.cc b/source/m_cookie.cc
@@ -194,9 +194,10 @@ bool Cookie_Load(std::string filename)
         buffer.clear();
         while ((c = fgetc(cookie_fp)) != EOF)
         {
-            buffer.push_back(c);
-            if (c == '\n')
+            if (c == '\n' || c == '\r')
                 break;
+            else
+                buffer.push_back(c);
         }
 
         if (!Cookie_ParseLine(buffer))

diff --git a/source/m_dialog.cc b/source/m_dialog.cc
@@ -809,14 +809,12 @@ void UI_GlossaryViewer::ReadGlossary()
         buffer.clear();
         while ((c = fgetc(gloss_file)) != EOF)
         {
-            buffer.push_back(c);
-            if (c == '\n')
+            if (c == '\n' || c == '\r')
                 break;
+            else
+                buffer.push_back(c);
         }
 
-        // remove any newline at the end (LF or CR/LF)
-        StringRemoveCRLF(&buffer);
-
         // remove any DEL characters (mainly to workaround an FLTK bug)
         StringReplaceChar(&buffer, 0x7f, 0);
 

diff --git a/source/m_options.cc b/source/m_options.cc
@@ -162,9 +162,10 @@ bool Options_Load(std::string filename)
         buffer.clear();
         while ((c = fgetc(option_fp)) != EOF)
         {
-            buffer.push_back(c);
-            if (c == '\n')
+            if (c == '\n' || c == '\r')
                 break;
+            else
+                buffer.push_back(c);
         }
 
         Options_ParseLine(buffer);

diff --git a/source/m_theme.cc b/source/m_theme.cc
@@ -317,9 +317,10 @@ bool Theme_Options_Load(std::string filename)
         buffer.clear();
         while ((c = fgetc(option_fp)) != EOF)
         {
-            buffer.push_back(c);
-            if (c == '\n')
+            if (c == '\n' || c == '\r')
                 break;
+            else
+                buffer.push_back(c);
         }
 
         if (!Theme_Options_ParseLine(buffer))

diff --git a/source/m_trans.cc b/source/m_trans.cc
@@ -1015,9 +1015,10 @@ void Trans_Read_PO_File(FILE *fp)
         buffer.clear();
         while ((c = fgetc(fp)) != EOF)
         {
-            buffer.push_back(c);
-            if (c == '\n')
+            if (c == '\n' || c == '\r')
                 break;
+            else
+                buffer.push_back(c);
         }
 
         po_state.line_number += 1;
@@ -1110,9 +1111,10 @@ void Trans_Init()
 
         while ((c = fgetc(trans_fp)) != EOF)
         {
-            buffer.push_back((char)c);
-            if (c == '\n')
+            if (c == '\n' || c == '\r')
                 break;
+            else
+                buffer.push_back(c);
         }
 
         Trans_ParseLangLine((char *)buffer.c_str());
@@ -1157,10 +1159,14 @@ void Trans_SetLanguage()
     {
         // if language has a territory field (like zh_TW or en_AU) then
         // try again with the plain language code.
-
         path = StringFormat("%s/language/%s.po", install_dir.c_str(), lang_plain.c_str());
     }
 
+    if (!FileExists(path))
+    {
+        FatalError("WTF: %s\n", path.c_str());
+    }
+
     FILE *fp = FileOpen(path, "rb");
     if (!fp)
     {

diff --git a/source/sys_debug.cc b/source/sys_debug.cc
@@ -347,14 +347,12 @@ void LogReadLines(log_display_func_t display_func, void *priv_data)
         buffer.clear();
         while ((c = fgetc(log_file)) != EOF)
         {
-            buffer.push_back(c);
-            if (c == '\n')
+            if (c == '\n' || c == '\r')
                 break;
+            else
+                buffer.push_back(c);
         }
 
-        // remove any newline at the end (LF or CR/LF)
-        StringRemoveCRLF(&buffer);
-
         // remove any DEL characters (mainly to workaround an FLTK bug)
         StringReplaceChar(&buffer, 0x7f, 0);