koffi 2.12.3 → 2.12.4

package/src/core/base/base.hh

@@ -3975,6 +3975,16 @@ public:
     operator FmtArg() const { return FmtCustom(*this); }
 };
 
+class FmtEscape {
+    Span<const char> str;
+
+public:
+    FmtEscape(Span<const char> str) : str(str) {}
+
+    void Format(FunctionRef<void(Span<const char>)> append) const;
+    operator FmtArg() const { return FmtCustom(*this); }
+};
+
 class FmtUrlSafe {
     Span<const char> str;
     const char *passthrough;
@@ -4627,8 +4637,15 @@ const char *GetUserCachePath(const char *name, Allocator *alloc); // Can return
 const char *GetSystemConfigPath(const char *name, Allocator *alloc);
 const char *GetTemporaryDirectory();
 
-const char *FindConfigFile(Span<const char *const> names, Allocator *alloc,
-                           HeapArray<const char *> *out_possibilities = nullptr);
+enum class FindConfigFlag {
+    IgnoreAppDir = 1 << 0
+};
+
+const char *FindConfigFile(const char *directory, Span<const char *const> names,
+                           Allocator *alloc, HeapArray<const char *> *out_possibilities = nullptr);
+static inline const char *FindConfigFile(Span<const char *const> names, Allocator *alloc,
+                                         HeapArray<const char *> *out_possibilities = nullptr)
+    { return FindConfigFile(nullptr, names, alloc, out_possibilities); }
 
 const char *CreateUniqueFile(Span<const char> directory, const char *prefix, const char *extension,
                              Allocator *alloc, int *out_fd = nullptr);
@@ -5498,8 +5515,6 @@ bool OptionToEnum(Span<const OptionDesc> options, Span<const char> str, T *out_v
 template <typename T>
 bool OptionToEnumI(Span<const char *const> options, Span<const char> str, T *out_value)
 {
-    static_assert(std::is_enum<T>::value);
-
     for (Size i = 0; i < options.len; i++) {
         const char *opt = options[i];
 
@@ -5515,8 +5530,6 @@ bool OptionToEnumI(Span<const char *const> options, Span<const char> str, T *out
 template <typename T>
 bool OptionToEnumI(Span<const OptionDesc> options, Span<const char> str, T *out_value)
 {
-    static_assert(std::is_enum<T>::value);
-
     for (Size i = 0; i < options.len; i++) {
         const OptionDesc &desc = options[i];
 
@@ -5593,6 +5606,11 @@ bool OptionToFlagI(Span<const OptionDesc> options, Span<const char> str, T *out_
 // Console prompter (simplified readline)
 // ------------------------------------------------------------------------
 
+struct PromptChoice {
+    char c;
+    const char *str;
+};
+
 class ConsolePrompter {
     int prompt_columns = 0;
 
@@ -5620,15 +5638,16 @@ public:
     ConsolePrompter();
 
     bool Read(Span<const char> *out_str = nullptr);
-    bool ReadYN(bool *out_value);
+    Size ReadEnum(Span<const PromptChoice> choices, Size value = 0);
 
     void Commit();
 
 private:
     bool ReadRaw(Span<const char> *out_str);
-    bool ReadRawYN(bool *out_value);
     bool ReadBuffered(Span<const char> *out_str);
-    bool ReadBufferedYN(bool *out_value);
+
+    Size ReadRawEnum(Span<const PromptChoice> choices, Size value);
+    Size ReadBufferedEnum(Span<const PromptChoice> choices);
 
     void ChangeEntry(Size new_idx);
 
@@ -5639,6 +5658,8 @@ private:
 
     void Delete(Size start, Size end);
 
+    void FormatChoices(Span<const PromptChoice> choices, Size value);
+
     void RenderRaw();
     void RenderBuffered();
 
@@ -5653,13 +5674,15 @@ private:
 const char *Prompt(const char *prompt, const char *default_value, const char *mask, Allocator *alloc);
 static inline const char *Prompt(const char *prompt, Allocator *alloc)
     { return Prompt(prompt, nullptr, nullptr, alloc); }
-bool PromptYN(const char *prompt, bool *out_value);
+
+Size PromptEnum(const char *prompt, Span<const PromptChoice> choices, Size value = 0);
+Size PromptEnum(const char *prompt, Span<const char *const> strings, Size value = 0);
 
 // ------------------------------------------------------------------------
 // Mime types
 // ------------------------------------------------------------------------
 
-const char *GetMimeType(Span<const char> extension, const char *default_typ = "application/octet-stream");
+const char *GetMimeType(Span<const char> extension, const char *default_type = "application/octet-stream");
 
 bool CanCompressFile(const char *filename);
 
@@ -5672,4 +5695,14 @@ int ComputeCharacterWidth(int32_t uc);
 bool IsXidStart(int32_t uc);
 bool IsXidContinue(int32_t uc);
 
+// ------------------------------------------------------------------------
+// CRC
+// ------------------------------------------------------------------------
+
+uint32_t CRC32(uint32_t state, Span<const uint8_t> buf);
+uint32_t CRC32C(uint32_t state, Span<const uint8_t> buf);
+
+uint64_t CRC64xz(uint64_t state, Span<const uint8_t> buf);
+uint64_t CRC64nvme(uint64_t state, Span<const uint8_t> buf);
+
 }