sysdb: Only try to reconnect before executing a command or on an empty line.

[sysdb.git] / src / tools / sysdb / input.c

diff --git a/src/tools/sysdb/input.c b/src/tools/sysdb/input.c
index a88b2266147de67a659cd383e802a0a61701f7ce..898464af0b550118aa0367337a4e4b85460930c6 100644 (file)
--- a/src/tools/sysdb/input.c
+++ b/src/tools/sysdb/input.c
@@ -133,9 +133,6 @@ handle_input(char *line)
                return;
        }
 
-       if (sdb_client_eof(sysdb_input->client))
-               sdb_input_reconnect();
-
        sdb_strbuf_append(sysdb_input->input, "%s\n", line);
        free(line);
 
@@ -162,7 +159,7 @@ input_readline(void)
                return (ssize_t)(sdb_strbuf_len(sysdb_input->input) - len);
        }
 
-       if (sysdb_input->query_len)
+       if (sysdb_input->have_input)
                prompt = "sysdb-> ";
        if (sdb_client_eof(sysdb_input->client))
                prompt = "!-> ";
@@ -278,11 +275,19 @@ sdb_input_readline(char *buf, size_t *n_chars, size_t max_chars)
 int
 sdb_input_exec_query(void)
 {
-       char *query = sdb_command_exec(sysdb_input);
+       char *query = NULL;
 
        HIST_ENTRY *hist;
        const char *prev = NULL;
 
+       if (! sysdb_input->have_input) {
+               /* empty line */
+               if (sdb_client_eof(sysdb_input->client))
+                       sdb_input_reconnect();
+               return 0;
+       }
+
+       query = sdb_command_exec(sysdb_input);
        if (! query)
                return -1;