[:goto] handle zero relative time

Related to #1615

Author: tstack

src/lnav_commands.cc

@@ -826,7 +826,7 @@ com_goto(exec_context& ec, std::string cmdline, std::vector<std::string>& args)
 
     std::string retval;
 
-    std::string all_args = remaining_args(cmdline, args);
+    std::string all_args = trim(remaining_args(cmdline, args));
     auto* tc = *lnav_data.ld_view_stack.top();
     std::optional<vis_line_t> dst_vl;
     auto is_location = false;
@@ -867,7 +867,7 @@ com_goto(exec_context& ec, std::string cmdline, std::vector<std::string>& args)
         }
     }
 
-    if (dst_vl) {
+    if (all_args.empty() || dst_vl) {
     } else if (parse_res.isOk()) {
         if (ttt == nullptr) {
             return ec.make_error(
@@ -892,9 +892,13 @@ com_goto(exec_context& ec, std::string cmdline, std::vector<std::string>& args)
         }
 
         do {
+            auto orig_tv = tv;
             auto tm = rt.adjust(tv);
 
             tv = tm.to_timeval();
+            if (tv == orig_tv) {
+                break;
+            }
             auto new_vl_opt = ttt->row_for_time(tv);
             if (!new_vl_opt) {
                 break;

src/logfile_sub_source.cc

@@ -201,8 +201,8 @@ struct filtered_logline_cmp {
     {
         auto cl_lhs = llss_controller.lss_index[lhs].value();
         auto cl_rhs = llss_controller.lss_index[rhs].value();
-        auto ll_lhs = this->llss_controller.find_line(cl_lhs);
-        auto ll_rhs = this->llss_controller.find_line(cl_rhs);
+        const auto* ll_lhs = this->llss_controller.find_line(cl_lhs);
+        const auto* ll_rhs = this->llss_controller.find_line(cl_rhs);
 
         if (ll_lhs == nullptr) {
             return true;
@@ -865,36 +865,8 @@ struct logline_cmp {
         return (*ll_lhs) < (*ll_rhs);
     }
 
-    bool operator()(const uint32_t& lhs, const uint32_t& rhs) const
-    {
-        auto cl_lhs = llss_controller.lss_index[lhs].value();
-        auto cl_rhs = llss_controller.lss_index[rhs].value();
-        const auto* ll_lhs = this->llss_controller.find_line(cl_lhs);
-        const auto* ll_rhs = this->llss_controller.find_line(cl_rhs);
-
-        return (*ll_lhs) < (*ll_rhs);
-    }
-#if 0
-        bool operator()(const indexed_content &lhs, const indexed_content &rhs)
-        {
-            logline *ll_lhs = this->llss_controller.find_line(lhs.ic_value);
-            logline *ll_rhs = this->llss_controller.find_line(rhs.ic_value);
-
-            return (*ll_lhs) < (*ll_rhs);
-        }
-#endif
-
-#if 0
-    bool operator()(const content_line_t& lhs, const time_t& rhs) const
-    {
-        logline* ll_lhs = this->llss_controller.find_line(lhs);
-
-        return *ll_lhs < rhs;
-    }
-#endif
-
     bool operator()(const logfile_sub_source::indexed_content& lhs,
-                    const struct timeval& rhs) const
+                    const timeval& rhs) const
     {
         const auto* ll_lhs = this->llss_controller.find_line(lhs.value());
 

test/expected/Makefile.am

@@ -62,6 +62,8 @@ dist_noinst_DATA = \
     test_cmds.sh_015ffe79a08f4c9f0cd1cb84c6afa4398f879fc7.out \
     test_cmds.sh_017b495b95218b7c083951e2dba331cfec6e90be.err \
     test_cmds.sh_017b495b95218b7c083951e2dba331cfec6e90be.out \
+    test_cmds.sh_0205bbf13f286f7f4b700dabcd38f698ed853d0f.err \
+    test_cmds.sh_0205bbf13f286f7f4b700dabcd38f698ed853d0f.out \
     test_cmds.sh_0b1e4b1523dfca71927b1fe721c74490c51361d1.err \
     test_cmds.sh_0b1e4b1523dfca71927b1fe721c74490c51361d1.out \
     test_cmds.sh_0b41fe57743ba0be088037d9ba29bc465e7c9bf9.err \

test/expected/test_cmds.sh_0205bbf13f286f7f4b700dabcd38f698ed853d0f.err

@@ -0,0 +1,2 @@
+192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7"
+192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"

test/expected/test_cmds.sh_0205bbf13f286f7f4b700dabcd38f698ed853d0f.out

@@ -4,6 +4,11 @@ export TZ=UTC
 export YES_COLOR=1
 export DUMP_CRASH=1
 
+run_cap_test ${lnav_test} -n \
+    -c ":goto 1" \
+    -c ":goto 0s" \
+    ${test_dir}/logfile_access_log.0
+
 run_cap_test ${lnav_test} -nN \
     -c ":goto -1"