X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ftools%2Fsysdb%2Finput.c;h=898464af0b550118aa0367337a4e4b85460930c6;hp=52036028d2905d35555705ec026e2bc30f96c55e;hb=b6c730c2d0cf400127da5ca96b51abd4ad335c0c;hpb=a7596ce606438569d2d7799ec7d68831f79897da

diff --git a/src/tools/sysdb/input.c b/src/tools/sysdb/input.c
index 5203602..898464a 100644
--- a/src/tools/sysdb/input.c
+++ b/src/tools/sysdb/input.c
@@ -159,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 = "!-> ";
@@ -275,24 +275,44 @@ 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 *current_hist;
-	const char *hist_line = 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;
 
-	current_hist = current_history();
-	if (current_hist)
-		hist_line = current_hist->line;
+	hist = history_get(history_length);
+	if (hist)
+		prev = hist->line;
 
 	if (*query != ' ')
-		if ((! hist_line) || strcmp(hist_line, query))
+		if ((! prev) || strcmp(prev, query))
 			add_history(query);
 	free(query);
 	return 0;
 } /* sdb_input_exec_query */
 
+int
+sdb_input_reconnect(void)
+{
+	sdb_client_close(sysdb_input->client);
+	if (sdb_client_connect(sysdb_input->client, sysdb_input->user)) {
+		printf("Failed to reconnect to SysDBd.\n");
+		return -1;
+	}
+	printf("Successfully reconnected to SysDBd.\n");
+	return 0;
+} /* sdb_input_reconnect */
+
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */