X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ftools%2Fsysdb%2Fcommand.c;h=be41b15f9d92557588df6b9fefc326a261a80844;hp=3b64def385ebd64251bbd07dc4f79fe500353da8;hb=1f2aedf19e878c5cbf6d5bc5793ee3621fa7854c;hpb=a006a526f16e790dbeae6ef96ed61f506310b66f

diff --git a/src/tools/sysdb/command.c b/src/tools/sysdb/command.c
index 3b64def..be41b15 100644
--- a/src/tools/sysdb/command.c
+++ b/src/tools/sysdb/command.c
@@ -33,58 +33,96 @@
 #include "tools/sysdb/input.h"
 
 #include "frontend/proto.h"
+#include "utils/error.h"
 #include "utils/strbuf.h"
 
+#include <errno.h>
+
 #include <assert.h>
 #include <ctype.h>
+#include <string.h>
 
 /*
  * public API
  */
 
 int
+sdb_command_print_reply(sdb_client_t *client)
+{
+	sdb_strbuf_t *recv_buf;
+	const char *result;
+	uint32_t rcode = 0;
+	int status = 0;
+
+	recv_buf = sdb_strbuf_create(1024);
+	if (! recv_buf)
+		return -1;
+
+	if (sdb_client_recv(client, &rcode, recv_buf) < 0)
+		rcode = UINT32_MAX;
+
+	if (sdb_client_eof(client))
+		return -1;
+
+	if (rcode == UINT32_MAX) {
+		printf("ERROR: ");
+		status = -1;
+	}
+	else
+		status = (int)rcode;
+
+	result = sdb_strbuf_string(recv_buf);
+	if (result && *result)
+		printf("%s\n", result);
+	else if (rcode == UINT32_MAX) {
+		char errbuf[1024];
+		printf("%s\n", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+	}
+
+	sdb_strbuf_destroy(recv_buf);
+	return status;
+} /* sdb_command_print_reply */
+
+char *
 sdb_command_exec(sdb_input_t *input)
 {
 	const char *query;
 	uint32_t query_len;
 
+	char *data = NULL;
+
 	query = sdb_strbuf_string(input->input);
 	query_len = (uint32_t)input->query_len;
 
 	assert(input->query_len <= input->tokenizer_pos);
 
-	/* removing leading and trailing whitespace */
-	while (isspace((int)*query) && query_len) {
+	/* removing leading and trailing newlines */
+	while (query_len && (*query == '\n')) {
 		++query;
 		--query_len;
 	}
-	while (query_len && (isspace((int)query[query_len - 1])
-				|| (query[query_len - 1] == ';')))
+	while (query_len && (query[query_len - 1]) == '\n')
 		--query_len;
 
 	if (query_len) {
-		sdb_strbuf_t *recv_buf;
-		uint32_t rcode = 0;
-
-		recv_buf = sdb_strbuf_create(1024);
-		if (! recv_buf)
-			return -1;
+		data = strndup(query, query_len);
+		/* ignore errors; we'll only hide the command from the caller */
 
 		sdb_client_send(input->client, CONNECTION_QUERY, query_len, query);
-		if (sdb_client_recv(input->client, &rcode, recv_buf) < 0)
-			rcode = UINT32_MAX;
-
-		if (rcode == UINT32_MAX)
-			printf("ERROR: ");
-		printf("%s\n", sdb_strbuf_string(recv_buf));
 
-		sdb_strbuf_destroy(recv_buf);
+		/* The server will send back *something*, either error/log messages
+		 * and/or the reply to the query. Here, we don't care about what it
+		 * sends back. We'll wait for the first reply and then return to the
+		 * main loop which will handle any subsequent replies, including
+		 * eventually the reply to the query (if it's not the first reply). */
+		if (sdb_command_print_reply(input->client) < 0)
+			return NULL;
 	}
 
 	sdb_strbuf_skip(input->input, 0, input->query_len);
 	input->tokenizer_pos -= input->query_len;
 	input->query_len = 0;
-	return 0;
+	return data;
 } /* sdb_command_exec */
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */