kernel/src/arch/x86_64/CPU.cpp

@@ -6,9 +6,9 @@
 #include "memory/MemoryManager.h"
 #include "thread/Scheduler.h"
 #include <cpuid.h>
-#include <luna/CString.h>
 #include <luna/Check.h>
 #include <luna/Result.h>
+#include <luna/String.h>
 #include <luna/SystemError.h>
 #include <luna/Types.h>
 

kernel/src/arch/x86_64/MMU.cpp

@@ -1,7 +1,7 @@
 #include "arch/MMU.h"
 #include "memory/MemoryManager.h"
-#include <luna/CString.h>
 #include <luna/Result.h>
+#include <luna/String.h>
 #include <luna/SystemError.h>
 
 #pragma GCC push_options

kernel/src/arch/x86_64/Thread.cpp

@@ -1,5 +1,5 @@
 #include "thread/Thread.h"
-#include <luna/CString.h>
+#include <luna/String.h>
 
 bool is_in_kernel(Registers* regs)
 {

kernel/src/boot/Init.cpp

@@ -4,8 +4,8 @@
 #include "boot/bootboot.h"
 #include "memory/MemoryManager.h"
 #include "video/Framebuffer.h"
-#include <luna/CString.h>
 #include <luna/Result.h>
+#include <luna/String.h>
 
 extern const BOOTBOOT bootboot;
 

kernel/src/memory/Heap.cpp

@@ -6,10 +6,10 @@
 #include "memory/MemoryManager.h"
 #include <luna/Alignment.h>
 #include <luna/Alloc.h>
-#include <luna/CString.h>
 #include <luna/LinkedList.h>
 #include <luna/SafeArithmetic.h>
 #include <luna/ScopeGuard.h>
+#include <luna/String.h>
 #include <luna/SystemError.h>
 
 namespace std

kernel/src/memory/MemoryManager.cpp

@@ -6,8 +6,8 @@
 #include "memory/MemoryMap.h"
 #include <luna/Alignment.h>
 #include <luna/Bitmap.h>
-#include <luna/CString.h>
 #include <luna/ScopeGuard.h>
+#include <luna/String.h>
 #include <luna/SystemError.h>
 #include <luna/Types.h>
 

kernel/src/video/TextConsole.cpp

@@ -1,9 +1,9 @@
 #include "video/TextConsole.h"
 #include "boot/bootboot.h"
 #include "video/Framebuffer.h"
-#include <luna/CString.h>
 #include <luna/Format.h>
 #include <luna/Result.h>
+#include <luna/String.h>
 #include <stdarg.h>
 
 extern const BOOTBOOT bootboot;

luna/CMakeLists.txt

@@ -3,7 +3,7 @@
 set(FREESTANDING_SOURCES
     src/Format.cpp
     src/NumberParsing.cpp
-    src/CString.cpp
+    src/String.cpp
     src/Units.cpp
     src/SystemError.cpp
     src/Bitmap.cpp

luna/include/luna/OwnedStringView.h

@@ -22,12 +22,6 @@ class OwnedStringView
         return m_length;
     }
 
-    const char& operator[](usize index) const
-    {
-        expect(index < m_length, "OwnedStringView: index out of range");
-        return m_string[index];
-    }
-
   private:
     char* m_string{nullptr};
     usize m_length{0};

luna/include/luna/String.h

@@ -8,6 +8,4 @@ extern "C"
     int memcmp(const void* a, const void* b, usize n);
     void* memmove(void* dest, const void* src, usize n);
     usize strlen(const char* str);
-
-    char* strdup(const char* str);
 }

luna/src/Alloc.cpp

@@ -7,7 +7,7 @@
 [[nodiscard]] void* raw_malloc(usize size)
 {
 #ifdef USE_FREESTANDING
-    char* const rc = new (std::nothrow) char[size];
+    char* const rc = new char[size];
     return (void*)rc;
 #else
     return malloc(size);

luna/src/Bitmap.cpp

@@ -1,6 +1,6 @@
 #include <luna/Bitmap.h>
-#include <luna/CString.h>
 #include <luna/Check.h>
+#include <luna/String.h>
 
 Bitmap::Bitmap()
 {

luna/src/OwnedStringView.cpp

@@ -1,6 +1,6 @@
 #include <luna/Alloc.h>
-#include <luna/CString.h>
 #include <luna/OwnedStringView.h>
+#include <luna/String.h>
 
 OwnedStringView::OwnedStringView()
 {
@@ -23,14 +23,14 @@ OwnedStringView::OwnedStringView(char* c_str)
 
 OwnedStringView::~OwnedStringView()
 {
-    if (m_string) raw_free(m_string);
+    if (m_string) destroy_array(m_string);
 }
 
 Result<OwnedStringView> OwnedStringView::clone() const
 {
-    char* const c_str = strdup(m_string);
+    char* buf = TRY(make_array<char>(m_length + 1));
 
-    if (!c_str) return err(ENOMEM);
+    memcpy(buf, m_string, m_length + 1);
 
-    return OwnedStringView{c_str};
+    return OwnedStringView{buf};
 }

luna/src/String.cpp

@@ -1,5 +1,4 @@
-#include <luna/Alloc.h>
+#include <luna/String.h>
-#include <luna/CString.h>
 
 extern "C"
 {
@@ -45,16 +44,4 @@ extern "C"
             ;
         return (usize)(i - str);
     }
-
-    char* strdup(const char* str)
-    {
-        const usize len = strlen(str);
-
-        char* dest = (char*)raw_malloc(len + 1);
-        if (!dest) return nullptr;
-
-        memcpy(dest, str, len + 1);
-
-        return dest;
-    }
 }