[nits] more bug fixing

Author: tstack

src/CMakeLists.txt

@@ -700,7 +700,6 @@ add_library(
         highlighter.hh
         hotkeys.hh
         input_dispatcher.hh
-        itertools.similar.hh
         k_merge_tree.h
         lnav.events.hh
         lnav.exec-phase.hh

src/Makefile.am

@@ -309,7 +309,6 @@ noinst_HEADERS = \
 	hotkeys.hh \
 	init.sql \
 	input_dispatcher.hh \
-	itertools.similar.hh \
 	k_merge_tree.h \
 	line_buffer.hh \
 	listview_curses.hh \

src/base/auto_fd.cc

@@ -165,22 +165,23 @@ auto_fd::operator=(int fd)
 }
 
 Result<void, std::string>
-auto_fd::write_fully(string_fragment sf)
+auto_fd::write_fully(const unsigned char* data, size_t len)
 {
-    while (!sf.empty()) {
-        auto rc = write(this->af_fd, sf.data(), sf.length());
+    while (len > 0) {
+        auto rc = write(this->af_fd, data, len);
 
         if (rc < 0) {
             if (errno == EINTR) {
                 continue;
             }
             return Err(
                 fmt::format(FMT_STRING("failed to write {} bytes to FD {}"),
-                            sf.length(),
+                            len,
                             this->af_fd));
         }
 
-        sf = sf.substr(rc);
+        data += rc;
+        len -= rc;
     }
 
     return Ok();

src/base/auto_fd.hh

@@ -163,7 +163,27 @@ public:
      */
     void reset(int fd = -1);
 
-    Result<void, std::string> write_fully(string_fragment sf);
+    Result<void, std::string> write_fully(const unsigned char* data,
+                                          size_t len);
+
+    Result<void, std::string> write_fully(string_fragment sf)
+    {
+        return this->write_fully(sf.udata(), sf.length());
+    }
+
+    template<std::size_t N>
+    Result<void, std::string> write_fully(const unsigned char (&str)[N])
+    {
+        return this->write_fully(str, N);
+    }
+
+    template<typename T,
+             std::enable_if_t<std::is_integral_v<T>, bool> = true>
+    Result<void, std::string> write_fully(const T& value)
+    {
+        return this->write_fully(
+            reinterpret_cast<const unsigned char*>(&value), sizeof(value));
+    }
 
     void close_on_exec() const;
 

src/base/cell_container.cc

@@ -409,10 +409,13 @@ cell_container::cursor::get_text_length() const
         return sub;
     }
 
-    size_t retval = this->c_chunk->cc_data[this->c_offset + 1]
-        | (this->c_chunk->cc_data[this->c_offset + 2] << 8)
-        | (this->c_chunk->cc_data[this->c_offset + 3] << 16)
-        | (this->c_chunk->cc_data[this->c_offset + 4] << 24);
+    size_t retval
+        = static_cast<size_t>(this->c_chunk->cc_data[this->c_offset + 1])
+        | (static_cast<size_t>(this->c_chunk->cc_data[this->c_offset + 2]) << 8)
+        | (static_cast<size_t>(this->c_chunk->cc_data[this->c_offset + 3])
+           << 16)
+        | (static_cast<size_t>(this->c_chunk->cc_data[this->c_offset + 4])
+           << 24);
 
     return retval;
 }

src/itertools.similar.hh src/base/itertools.similar.hhsrc/itertools.similar.hh renamed to src/base/itertools.similar.hh

@@ -39,7 +39,7 @@
 
 namespace lnav::piper {
 
-const char HEADER_MAGIC[4] = {'L', 0, 'N', 1};
+const unsigned char HEADER_MAGIC[4] = {'L', 0, 'N', 1};
 
 const std::filesystem::path&
 storage_path()

src/base/piper.file.cc

@@ -75,7 +75,7 @@ struct header {
 const std::filesystem::path& storage_path();
 
 constexpr size_t HEADER_SIZE = 8;
-extern const char HEADER_MAGIC[4];
+extern const unsigned char HEADER_MAGIC[4];
 
 std::optional<auto_buffer> read_header(int fd, const char* first8);
 

src/base/piper.file.hh

@@ -37,6 +37,7 @@
 #include <date/ptz.h>
 
 #include "config.h"
+#include "itertools.similar.hh"
 #include "lnav_log.hh"
 
 namespace lnav {
@@ -87,8 +88,10 @@ strftime_rfc3339(char* buffer,
 }
 
 ssize_t
-strftime_rfc3339(
-    char* buffer, size_t buffer_size, std::chrono::microseconds micros, char sep)
+strftime_rfc3339(char* buffer,
+                 size_t buffer_size,
+                 std::chrono::microseconds micros,
+                 char sep)
 {
     struct tm gmtm;
     auto secs = std::chrono::duration_cast<std::chrono::seconds>(micros);
@@ -228,6 +231,39 @@ local_time_to_info(date::local_seconds secs)
     return TZ_POSIX_UTC.value().get_info(secs);
 }
 
+inline attr_line_t&
+symbol_reducer(const std::string& elem, attr_line_t& accum)
+{
+    return accum.append("\n   ").append(lnav::roles::symbol(elem));
+}
+
+Result<const date::time_zone*, lnav::console::user_message>
+locate_zone(string_fragment tz_name)
+{
+    try {
+        return Ok(date::locate_zone(tz_name.to_string_view()));
+    } catch (const std::runtime_error& e) {
+        attr_line_t note;
+
+        try {
+            note = (date::get_tzdb().zones
+                    | lnav::itertools::map(&date::time_zone::name)
+                    | lnav::itertools::similar_to(tz_name.to_string())
+                    | lnav::itertools::fold(symbol_reducer, attr_line_t{}))
+                       .add_header("did you mean one of the following?");
+        } catch (const std::runtime_error& e) {
+            log_error("unable to get timezones: %s", e.what());
+        }
+        auto um = lnav::console::user_message::error(
+                      attr_line_t().append_quoted(tz_name).append(
+                          " is not a valid timezone"))
+                      .with_reason(e.what())
+                      .with_note(note)
+                      .move();
+        return Err(um);
+    }
+}
+
 }  // namespace lnav
 
 static time_t BAD_DATE = -1;
@@ -283,8 +319,7 @@ tm2sec(const struct tm* t)
     if (secs < 0) {
         return BAD_DATE;
     } /* must have overflowed */
-    else
-    {
+    else {
 #ifdef HAVE_STRUCT_TM_TM_ZONE
         if (t->tm_zone) {
             secs -= t->tm_gmtoff;

src/base/time_util.cc

@@ -43,6 +43,8 @@
 #include "config.h"
 #include "date/date.h"
 #include "date/tz.h"
+#include "lnav.console.hh"
+#include "result.h"
 
 inline std::chrono::microseconds
 to_us(const timeval& tv)
@@ -91,6 +93,9 @@ struct duration_hasher {
     }
 };
 
+Result<const date::time_zone*, lnav::console::user_message>
+locate_zone(string_fragment tz_name);
+
 }  // namespace lnav
 
 tm* secs2tm(lnav::time64_t tim, tm* res);