[headless] completely read stdin in headless mode before running commands

src/lnav.cc

@@ -2515,14 +2515,16 @@ string execute_sql(string sql, string &alt_msg)
             vis_bookmarks &bm =
             lnav_data.ld_views[LNV_LOG].get_bookmarks();
 
-            if (dls.dls_headers.size() == 1 && !bm[&BM_QUERY].empty()) {
+            if (!(lnav_data.ld_flags & LNF_HEADLESS) &&
+                    dls.dls_headers.size() == 1 && !bm[&BM_QUERY].empty()) {
                 retval = "";
                 alt_msg = HELP_MSG_2(
                   y, Y,
                   "to move forward/backward through query results "
                   "in the log view");
             }
-            else if (dls.dls_rows.size() == 1) {
+            else if (!(lnav_data.ld_flags & LNF_HEADLESS) &&
+                    dls.dls_rows.size() == 1) {
                 string row;
 
                 hs.text_value_for_line(lnav_data.ld_views[LNV_DB], 1, row, true);
@@ -3610,6 +3612,23 @@ static void gather_pipers(void)
     }
 }
 
+static void wait_for_pipers(void)
+{
+    for (;;) {
+        gather_pipers();
+        if (lnav_data.ld_pipers.empty()) {
+            log_debug("all pipers finished");
+            break;
+        }
+        else {
+            usleep(10000);
+            rebuild_indexes(false);
+        }
+        log_debug("%d pipers still active",
+                lnav_data.ld_pipers.size());
+    }
+}
+
 static void looper(void)
 {
     try {
@@ -4616,24 +4635,15 @@ int main(int argc, char *argv[])
                 alerter::singleton().enabled(false);
 
                 lnav_data.ld_view_stack.push(&lnav_data.ld_views[LNV_LOG]);
+                // Read all of stdin
+                wait_for_pipers();
                 rebuild_indexes(true);
 
                 lnav_data.ld_views[LNV_LOG].set_top(vis_line_t(0));
 
+                log_info("Executing initial commands");
                 execute_init_commands(msgs);
-                for (;;) {
-                    gather_pipers();
-                    if (lnav_data.ld_pipers.empty()) {
-                        log_debug("all pipers finished");
-                        break;
-                    }
-                    else {
-                        usleep(10000);
-                        rebuild_indexes(false);
-                    }
-                    log_debug("%d pipers still active",
-                            lnav_data.ld_pipers.size());
-                }
+                wait_for_pipers();
                 rebuild_indexes(false);
 
                 for (msg_iter = msgs.begin();
@@ -4653,11 +4663,18 @@ int main(int argc, char *argv[])
                     !lnav_data.ld_stdout_used) {
                     bool suppress_empty_lines = false;
                     list_overlay_source *los;
+                    unsigned long view_index;
                     vis_line_t y;
 
                     tc = lnav_data.ld_view_stack.top();
-                    if (tc == &lnav_data.ld_views[LNV_DB]) {
-                        suppress_empty_lines = true;
+                    view_index = tc - lnav_data.ld_views;
+                    switch (view_index) {
+                        case LNV_DB:
+                        case LNV_HISTOGRAM:
+                            suppress_empty_lines = true;
+                            break;
+                        default:
+                            break;
                     }
 
                     los = tc->get_overlay_source();

test/test_sql.sh

@@ -390,3 +390,23 @@ llline,jgline
 9,1
 9,8
 EOF
+
+
+cat ${test_dir}/logfile_syslog.0 | run_test ${lnav_test} -n \
+    -c ";select * from syslog_log where log_procname = 'automount'"
+
+check_output "querying against stdin is not working?" <<EOF
+log_line log_part         log_time        log_idle_msecs log_level log_mark log_hostname log_pid log_procname
+       0 p.0      2015-11-03 09:23:38.000              0 error            0 veridian     7998    automount
+       1 p.0      2015-11-03 09:23:38.000              0 info             0 veridian     16442   automount
+       2 p.0      2015-11-03 09:23:38.000              0 error            0 veridian     7999    automount
+EOF
+
+
+cat ${test_dir}/logfile_syslog.0 | run_test ${lnav_test} -n \
+    -c ";select * from syslog_log where log_procname = 'sudo'"
+
+check_output "single result is not working?" <<EOF
+log_line log_part         log_time        log_idle_msecs log_level log_mark log_hostname log_pid log_procname
+       3 p.0      2015-11-03 09:47:02.000        1404000 info             0 veridian      <NULL> sudo
+EOF