file ptr leak away and concurrency saftely

Author: Charliechen114514

src/applets/dmesg.cpp

@@ -7,6 +7,7 @@
 #include <cfbox/applet.hpp>
 #include <cfbox/args.hpp>
 #include <cfbox/help.hpp>
+#include <cfbox/io.hpp>
 
 namespace {
 
@@ -21,23 +22,21 @@ constexpr cfbox::help::HelpEntry HELP = {
 
 auto read_kmsg() -> std::vector<std::string> {
     std::vector<std::string> lines;
-    // Try /var/log/dmesg first (works without CAP_SYSLOG)
-    FILE* f = std::fopen("/var/log/dmesg", "r");
-    if (!f) f = std::fopen("/var/log/kern.log", "r");
+    cfbox::io::unique_file f(std::fopen("/var/log/dmesg", "r"));
+    if (!f) f.reset(std::fopen("/var/log/kern.log", "r"));
     if (!f) {
         std::fprintf(stderr, "cfbox dmesg: cannot open kernel log\n");
         return lines;
     }
 
     char buf[4096];
-    while (std::fgets(buf, sizeof(buf), f)) {
+    while (std::fgets(buf, sizeof(buf), f.get())) {
         auto len = std::strlen(buf);
         while (len > 0 && (buf[len - 1] == '\n' || buf[len - 1] == '\r')) {
             buf[--len] = '\0';
         }
         lines.emplace_back(buf);
     }
-    std::fclose(f);
     return lines;
 }
 

src/applets/init/init.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <chrono>
+#include <csignal>
 #include <cstdio>
 #include <string>
 #include <string_view>
@@ -54,9 +55,9 @@ struct InitState {
     RunLevel runlevel = RunLevel::SysInit;
     std::vector<InittabEntry> entries;
     std::vector<SpawnedProcess> children;
-    bool shutting_down = false;
-    bool sigchld_received = false;
-    bool sigint_received = false;
+    volatile sig_atomic_t shutting_down = 0;
+    volatile sig_atomic_t sigchld_received = 0;
+    volatile sig_atomic_t sigint_received = 0;
 };
 
 // --- Module interfaces ---

src/applets/init/init_shutdown.cpp

@@ -3,7 +3,6 @@
 #include <csignal>
 #include <cstdio>
 #include <cstring>
-#include <csignal>
 #include <unistd.h>
 #include <sys/reboot.h>
 #include <sys/mount.h>