migrate to using the SAME Macro logger

Author: Charliechen114514

include/cfbox/error.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdio>
 #include <expected>
 #include <string>
 #include <string_view>
@@ -19,6 +20,13 @@ template <typename T> using Result = std::expected<T, Error>;
 
 } // namespace cfbox::base
 
+#ifndef CFBOX_ERR
+#    define CFBOX_ERR(cmd, fmt, ...) \
+        std::fprintf(stderr, "cfbox " cmd ": " fmt "\n" __VA_OPT__(,) __VA_ARGS__)
+#    define CFBOX_ERR_V(cmd, fmt, ...) \
+        std::fprintf(stderr, "cfbox %s: " fmt "\n", cmd __VA_OPT__(,) __VA_ARGS__)
+#endif
+
 #ifndef CFBOX_TRY
 #    define CFBOX_TRY(var, expr)                                        \
         auto var = (expr);                                              \

include/cfbox/io.hpp

@@ -19,7 +19,7 @@ struct FileCloser {
 using unique_file = std::unique_ptr<std::FILE, FileCloser>;
 
 [[nodiscard]] inline auto open_file(std::string_view path, const char* mode) -> base::Result<unique_file> {
-    auto* f = std::fopen(std::string{path}.c_str(), mode);
+    auto* f = std::fopen(path.data(), mode);
     if (!f) {
         return std::unexpected(base::Error{errno, "cannot open file: " + std::string{path}});
     }

include/cfbox/term.hpp

@@ -68,7 +68,13 @@ namespace detail {
 // Utility: wrap text with a color and reset
 inline auto colored(std::string_view text, std::string_view color_code) -> std::string {
     if (!color_enabled()) return std::string{text};
-    return std::string{color_code} + std::string{text} + std::string{reset()};
+    auto r = reset();
+    std::string result;
+    result.reserve(color_code.size() + text.size() + r.size());
+    result.append(color_code);
+    result.append(text);
+    result.append(r);
+    return result;
 }
 
 } // namespace cfbox::term

src/applets/ar.cpp

@@ -7,6 +7,7 @@
 #include <cfbox/args.hpp>
 #include <cfbox/help.hpp>
 #include <cfbox/io.hpp>
+#include <cfbox/error.hpp>
 
 namespace {
 constexpr cfbox::help::HelpEntry HELP = {
@@ -37,7 +38,7 @@ auto ar_main(int argc, char* argv[]) -> int {
 
     const auto& pos = parsed.positional();
     if (pos.empty()) {
-        std::fprintf(stderr, "cfbox ar: missing archive name\n");
+        CFBOX_ERR("ar", "missing archive name");
         return 1;
     }
 
@@ -65,7 +66,7 @@ auto ar_main(int argc, char* argv[]) -> int {
         }
         auto wresult = cfbox::io::write_all(archive, output);
         if (!wresult) {
-            std::fprintf(stderr, "cfbox ar: %s\n", wresult.error().msg.c_str());
+            CFBOX_ERR("ar", "%s", wresult.error().msg.c_str());
             return 1;
         }
         return 0;
@@ -74,12 +75,12 @@ auto ar_main(int argc, char* argv[]) -> int {
     if (list || extract) {
         auto input = cfbox::io::read_all(archive);
         if (!input) {
-            std::fprintf(stderr, "cfbox ar: %s\n", input.error().msg.c_str());
+            CFBOX_ERR("ar", "%s", input.error().msg.c_str());
             return 1;
         }
         const auto& data = *input;
         if (data.size() < 8 || data.substr(0, 8) != "!<arch>\n") {
-            std::fprintf(stderr, "cfbox ar: not a valid archive\n");
+            CFBOX_ERR("ar", "not a valid archive");
             return 1;
         }
         std::size_t offset = 8;
@@ -95,7 +96,7 @@ auto ar_main(int argc, char* argv[]) -> int {
             } else if (extract) {
                 auto content = data.substr(offset + 60, fsize);
                 if (!cfbox::io::write_all(name, content)) {
-                    std::fprintf(stderr, "cfbox ar: write failed: %s\n", name.c_str());
+                    CFBOX_ERR("ar", "write failed: %s", name.c_str());
                     return 1;
                 }
             }
@@ -105,6 +106,6 @@ auto ar_main(int argc, char* argv[]) -> int {
         return 0;
     }
 
-    std::fprintf(stderr, "cfbox ar: must specify -r, -t, or -x\n");
+    CFBOX_ERR("ar", "must specify -r, -t, or -x");
     return 1;
 }

src/applets/awk/awk_executor.cpp

@@ -5,6 +5,7 @@
 #include <sstream>
 
 #include <cfbox/regex.hpp>
+#include <cfbox/error.hpp>
 
 namespace cfbox::awk {
 
@@ -450,7 +451,7 @@ class Executor {
 
     auto process_file(const std::string& path, NodePtr prog) -> void {
         FILE* f = std::fopen(path.c_str(), "r");
-        if (!f) { std::fprintf(stderr, "cfbox awk: cannot open '%s'\n", path.c_str()); return; }
+        if (!f) { CFBOX_ERR("awk", "cannot open '%s'", path.c_str()); return; };
         st_.filename = path;
         char line[65536];
         while (std::fgets(line, sizeof(line), f)) {

src/applets/awk/awk_main.cpp

@@ -5,6 +5,7 @@
 #include "awk.hpp"
 #include <cfbox/args.hpp>
 #include <cfbox/help.hpp>
+#include <cfbox/error.hpp>
 
 namespace {
 constexpr cfbox::help::HelpEntry HELP = {
@@ -43,7 +44,7 @@ auto awk_main(int argc, char* argv[]) -> int {
 
     const auto& pos = parsed.positional();
     if (pos.empty()) {
-        std::fprintf(stderr, "cfbox awk: missing program\n");
+        CFBOX_ERR("awk", "missing program");
         return 1;
     }
 

src/applets/awk/awk_parser.cpp

@@ -1,5 +1,6 @@
 #include "awk.hpp"
 #include <cstdlib>
+#include <cfbox/error.hpp>
 
 namespace cfbox::awk {
 
@@ -30,8 +31,7 @@ class Parser {
     auto expect(TokType t) -> Token {
         auto tok = advance();
         if (tok.type != t) {
-            std::fprintf(stderr, "cfbox awk: expected token type %d, got '%s'\n",
-                         static_cast<int>(t), tok.text.c_str());
+            CFBOX_ERR("awk", "expected token type %d, got '%s'", static_cast<int>(t), tok.text.c_str());
         }
         return tok;
     }

src/applets/basename.cpp

@@ -4,6 +4,7 @@
 
 #include <cfbox/args.hpp>
 #include <cfbox/help.hpp>
+#include <cfbox/error.hpp>
 
 namespace {
 constexpr cfbox::help::HelpEntry HELP = {
@@ -56,7 +57,7 @@ auto basename_main(int argc, char* argv[]) -> int {
 
     const auto& pos = parsed.positional();
     if (pos.empty()) {
-        std::fprintf(stderr, "cfbox basename: missing operand\n");
+        CFBOX_ERR("basename", "missing operand");
         return 1;
     }
 

src/applets/cat.cpp

@@ -4,6 +4,7 @@
 #include <cfbox/args.hpp>
 #include <cfbox/help.hpp>
 #include <cfbox/io.hpp>
+#include <cfbox/error.hpp>
 
 namespace {
 
@@ -68,7 +69,7 @@ auto cat_file(std::string_view path, bool n_flag, bool b_flag, bool A_flag) -> i
 
     auto result = cfbox::io::open_file(path, "rb");
     if (!result) {
-        std::fprintf(stderr, "cfbox cat: %s\n", result.error().msg.c_str());
+        CFBOX_ERR("cat", "%s", result.error().msg.c_str());
         return 1;
     }
 

src/applets/chgrp.cpp

@@ -8,6 +8,7 @@
 
 #include <cfbox/args.hpp>
 #include <cfbox/help.hpp>
+#include <cfbox/error.hpp>
 
 namespace {
 
@@ -37,7 +38,7 @@ auto chgrp_main(int argc, char* argv[]) -> int {
     const auto& pos = parsed.positional();
 
     if (pos.size() < 2) {
-        std::fprintf(stderr, "cfbox chgrp: missing operand\n");
+        CFBOX_ERR("chgrp", "missing operand");
         return 2;
     }
 
@@ -52,7 +53,7 @@ auto chgrp_main(int argc, char* argv[]) -> int {
 
     auto chgrp_one = [&](const std::string& path) -> int {
         if (::chown(path.c_str(), static_cast<uid_t>(-1), gid) != 0) {
-            std::fprintf(stderr, "cfbox chgrp: %s: %s\n", path.c_str(), std::strerror(errno));
+            CFBOX_ERR("chgrp", "%s: %s", path.c_str(), std::strerror(errno));
             return 1;
         }
         if (verbose) std::printf("group of '%s' changed\n", path.c_str());