apps/init.cpp

@@ -100,12 +100,9 @@ static Result<void> load_service(StringView path)
 
     while (true)
     {
-        auto line = TRY(file->read_line());
+        auto line = TRY(file->read_line(false));
         if (line.is_empty()) break;
 
-        line.trim("\n");
-        if (line.is_empty()) continue;
-
         auto parts = TRY(line.split_once('='));
         if (parts.size() < 2 || parts[0].is_empty() || parts[1].is_empty())
         {

libluna/include/luna/String.h

@@ -32,8 +32,6 @@ class String
         return view().split_once(delim);
     }
 
-    void trim(StringView delim);
-
     static Result<String> format(const String& fmt, ...);
     static Result<String> format(StringView fmt, ...);
 

libluna/src/String.cpp

@@ -80,25 +80,6 @@ Result<Vector<String>> String::split(StringView delim) const
     return view().split(delim);
 }
 
-void String::trim(StringView delim)
-{
-    isize i = (isize)m_length;
-
-    while (i--)
-    {
-        char c = chars()[i];
-        if (!strchr(delim.chars(), c)) break;
-    }
-
-    i++;
-
-    if (m_inline) m_inline_storage[i] = '\0';
-    else
-        m_string[i] = '\0';
-
-    m_length = (usize)i;
-}
-
 const char& String::operator[](usize index) const
 {
     expect(index < m_length, "index out of range");

libos/include/os/File.h

@@ -33,7 +33,7 @@ namespace os
         Result<void> write(StringView str);
         Result<void> write(const Buffer& buf);
 
-        Result<String> read_line();
+        Result<String> read_line(bool keep_newline = true);
 
         Result<void> read(Buffer& buf, usize size);
 

libos/src/File.cpp

@@ -108,7 +108,7 @@ namespace os
         return {};
     }
 
-    Result<String> File::read_line()
+    Result<String> File::read_line(bool keep_newline)
     {
         Vector<char> data;
 
@@ -121,7 +121,11 @@ namespace os
 
             TRY(data.try_append((char)current));
 
-            if (current == '\n') break;
+            if (current == '\n')
+            {
+                if (!keep_newline) data.try_pop();
+                break;
+            }
         }
 
         if (!data.size()) return String {};