apps: Switch to C++

apps/CMakeLists.txt

@@ -1,14 +1,14 @@
 function(luna_app SOURCE_FILE APP_NAME)
     add_executable(${APP_NAME} ${SOURCE_FILE})
-    target_compile_options(${APP_NAME} PRIVATE -Os -Wall -Wextra -pedantic -Werror)
+    target_compile_options(${APP_NAME} PRIVATE -Os -Wall -Wextra -pedantic -Werror -Wno-write-strings)
     add_dependencies(${APP_NAME} libc)
     target_include_directories(${APP_NAME} PRIVATE ${LUNA_BASE}/usr/include)
     install(TARGETS ${APP_NAME} DESTINATION ${LUNA_ROOT}/initrd/bin)
 endfunction()
 
-luna_app(init.c init)
-luna_app(cat.c cat)
-luna_app(edit.c edit)
-luna_app(sh.c sh)
-luna_app(date.c date)
-luna_app(ls.c ls)
+luna_app(init.cpp init)
+luna_app(cat.cpp cat)
+luna_app(edit.cpp edit)
+luna_app(sh.cpp sh)
+luna_app(date.cpp date)
+luna_app(ls.cpp ls)

apps/sh.cpp

@@ -1,3 +1,5 @@
+#include <luna/Vector.h>
+
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -6,36 +8,31 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-static char** split_command_into_argv(const char* cmd)
+static Result<Vector<char*>> split_command_into_argv(const char* cmd)
 {
-    size_t argc = 1;
     char* str = strdup(cmd);
-    char** arr = calloc(sizeof(char*), argc);
+
+    Vector<char*> result;
 
     char* segment = strtok(str, " \n");
-    arr[argc - 1] = segment;
-    if (segment == NULL) return arr;
+    TRY(result.try_append(segment));
 
-    argc++;
-    arr = realloc(arr, sizeof(char*) * argc);
+    if (segment == NULL) return result;
 
     for (;;)
     {
         char* segment = strtok(NULL, " \n");
-        arr[argc - 1] = segment;
+        TRY(result.try_append(segment));
 
-        if (segment == NULL) break;
-
-        argc++;
-        arr = realloc(arr, sizeof(char*) * argc);
+        if (segment == NULL) return result;
     }
 
-    return arr;
+    return result;
 }
 
 static char* join_path(const char* str1, const char* str2)
 {
-    char* buf = malloc(strlen(str1) + strlen(str2) + 1);
+    char* buf = (char*)malloc(strlen(str1) + strlen(str2) + 1);
     strlcpy(buf, str1, strlen(str1) + 1);
     strncat(buf, str2, strlen(str2));
     return buf;
@@ -96,9 +93,18 @@ int main()
 
         if (child == 0)
         {
-            char** argv = split_command_into_argv(command);
+            auto maybe_argv = split_command_into_argv(command);
+            if (maybe_argv.has_error())
+            {
+                errno = maybe_argv.error();
+                perror("failed to parse command");
+                return 1;
+            }
+
+            auto argv = maybe_argv.release_value();
+
             if (argv[0] == NULL) return 0;
-            sh_execvp(argv);
+            sh_execvp(argv.data());
             perror(argv[0]);
             return 1;
         }

libc/CMakeLists.txt

@@ -62,3 +62,4 @@ add_custom_command(
 )
 
 file(WRITE "${LUNA_BASE}/usr/lib/libm.a" "INPUT(libc.a)")
+file(WRITE "${LUNA_BASE}/usr/lib/libstdc++.a" "INPUT(libc.a)")

libluna/CMakeLists.txt

@@ -27,6 +27,7 @@ set(FREESTANDING_SOURCES
 set(SOURCES
     ${FREESTANDING_SOURCES}
     src/Check.cpp
+    src/CppABI.cpp
 )
 
 add_library(luna-freestanding ${FREESTANDING_SOURCES})

libluna/src/CppABI.cpp

@@ -0,0 +1,6 @@
+extern "C"
+{
+    void __gxx_personality_v0()
+    {
+    }
+}