X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ftools%2Fsysdb%2Fcommand.c;h=f948d3aed65a5c18c78565819bdfac522b1cbe37;hp=b568aaec3289f0b5dd29c1db48d1d232e7ab2288;hb=d81ce0f57da8db0d0e5fe74c29d112a81a5f068b;hpb=f2d160c71a5458ae9789861f772853afb471dbe8

diff --git a/src/tools/sysdb/command.c b/src/tools/sysdb/command.c
index b568aae..f948d3a 100644
--- a/src/tools/sysdb/command.c
+++ b/src/tools/sysdb/command.c
@@ -33,21 +33,27 @@
 #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
+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;
 
@@ -63,11 +69,15 @@ sdb_command_exec(sdb_input_t *input)
 
 	if (query_len) {
 		sdb_strbuf_t *recv_buf;
+		const char *result;
 		uint32_t rcode = 0;
 
 		recv_buf = sdb_strbuf_create(1024);
 		if (! recv_buf)
-			return -1;
+			return NULL;
+
+		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)
@@ -75,7 +85,13 @@ sdb_command_exec(sdb_input_t *input)
 
 		if (rcode == UINT32_MAX)
 			printf("ERROR: ");
-		printf("%s\n", sdb_strbuf_string(recv_buf));
+		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);
 	}
@@ -83,7 +99,7 @@ sdb_command_exec(sdb_input_t *input)
 	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 : */