X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ftools%2Fsysdb%2Finput.c;h=2a2d1707101404169febb67d0ac643aaa98ec649;hp=9ed11eddd0e26309fab0bbda7333495ae86bd37c;hb=eeecbb1672352c4dc15af2ca345f2bb5cc5a5f66;hpb=da5a92e6334c4fc863c4704426666ab768721a67

diff --git a/src/tools/sysdb/input.c b/src/tools/sysdb/input.c
index 9ed11ed..2a2d170 100644
--- a/src/tools/sysdb/input.c
+++ b/src/tools/sysdb/input.c
@@ -159,14 +159,17 @@ input_readline(void)
 		return (ssize_t)(sdb_strbuf_len(sysdb_input->input) - len);
 	}
 
-	if (sysdb_input->query_len)
-		prompt = "sysdb-> ";
+	if (sysdb_input->have_input)
+		prompt = "     -> ";
+	if (sdb_client_eof(sysdb_input->client))
+		prompt = "!-> ";
 
 	rl_callback_handler_install(prompt, handle_input);
 	client_fd = sdb_client_sockfd(sysdb_input->client);
 	while ((sdb_strbuf_len(sysdb_input->input) == len)
 			&& (! sysdb_input->eof)) {
-		int n;
+		bool connected = !sdb_client_eof(sysdb_input->client);
+		int max_fd, n;
 
 		/* XXX: some versions of libedit don't properly reset the terminal in
 		 * rl_callback_read_char(); detect those versions */
@@ -174,9 +177,15 @@ input_readline(void)
 
 		FD_ZERO(&fds);
 		FD_SET(STDIN_FILENO, &fds);
-		FD_SET(client_fd, &fds);
+		max_fd = STDIN_FILENO;
 
-		n = select(client_fd + 1, &fds, NULL, NULL, /* timeout = */ NULL);
+		if (connected) {
+			FD_SET(client_fd, &fds);
+			if (client_fd > max_fd)
+				max_fd = client_fd;
+		}
+
+		n = select(max_fd + 1, &fds, NULL, NULL, /* timeout = */ NULL);
 		if (n < 0)
 			return (ssize_t)n;
 		else if (! n)
@@ -188,22 +197,23 @@ input_readline(void)
 			continue;
 		}
 
-		if (! FD_ISSET(client_fd, &fds))
+		if ((! connected) || (! FD_ISSET(client_fd, &fds)))
 			continue;
 
+		/* some response / error message from the server pending */
+		/* XXX: clear current line */
+		printf("\n");
+		sdb_command_print_reply(sysdb_input);
+
 		if (sdb_client_eof(sysdb_input->client)) {
-			/* XXX: try to reconnect */
-			printf("\n");
+			rl_callback_handler_remove();
+			/* XXX */
 			sdb_log(SDB_LOG_ERR, "Remote side closed the connection.");
-			/* return EOF */
+			/* return EOF -> restart scanner */
 			return 0;
 		}
-
-		/* some response / error message from the server pending */
-		/* XXX: clear current line */
-		printf("\n");
-		sdb_command_print_reply(sysdb_input->client);
-		rl_forced_update_display();
+		else
+			rl_forced_update_display();
 	}
 
 	/* new data available */
@@ -227,10 +237,29 @@ sdb_input_init(sdb_input_t *input)
 	return 0;
 } /* sdb_input_init */
 
+void
+sdb_input_reset(sdb_input_t *input)
+{
+	sdb_input_t reset = SDB_INPUT_INIT;
+
+	if (! input)
+		return;
+
+	if (input->client)
+		sdb_client_destroy(input->client);
+	if (input->user)
+		free(input->user);
+	if (input->input)
+		sdb_strbuf_destroy(input->input);
+
+	*input = reset;
+} /* sdb_input_reset */
+
 int
 sdb_input_mainloop(void)
 {
-	yylex();
+	while (! sysdb_input->eof)
+		yylex();
 	return 0;
 } /* sdb_input_mainloop */
 
@@ -264,24 +293,45 @@ 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;
 
-	HIST_ENTRY *current_hist;
-	const char *hist_line = 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)) {
+		sdb_log(SDB_LOG_ERR, "Failed to reconnect to SysDBd");
+		return -1;
+	}
+	sdb_log(SDB_LOG_INFO, "Successfully reconnected to SysDBd");
+	sdb_command_print_server_version(sysdb_input);
+	return 0;
+} /* sdb_input_reconnect */
+
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */