frontend, proto: Include the response data type in query replies.

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

diff --git a/src/tools/sysdb/command.c b/src/tools/sysdb/command.c
index be41b15f9d92557588df6b9fefc326a261a80844..718309bfad693678f93e1017eb5e01578b1b3b5a 100644 (file)
--- a/src/tools/sysdb/command.c
+++ b/src/tools/sysdb/command.c
@@ -40,6 +40,7 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <stdlib.h>
 #include <string.h>
 
 /*
@@ -61,8 +62,10 @@ sdb_command_print_reply(sdb_client_t *client)
        if (sdb_client_recv(client, &rcode, recv_buf) < 0)
                rcode = UINT32_MAX;
 
-       if (sdb_client_eof(client))
+       if (sdb_client_eof(client)) {
+               sdb_strbuf_destroy(recv_buf);
                return -1;
+       }
 
        if (rcode == UINT32_MAX) {
                printf("ERROR: ");
@@ -72,6 +75,10 @@ sdb_command_print_reply(sdb_client_t *client)
                status = (int)rcode;
 
        result = sdb_strbuf_string(recv_buf);
+       /* At the moment, we don't care about the result type. We simply print the
+        * result without further parsing it. */
+       if (status == CONNECTION_DATA)
+               result += sizeof(uint32_t);
        if (result && *result)
                printf("%s\n", result);
        else if (rcode == UINT32_MAX) {
@@ -115,8 +122,11 @@ sdb_command_exec(sdb_input_t *input)
                 * 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)
+               if (sdb_command_print_reply(input->client) < 0) {
+                       if (data)
+                               free(data);
                        return NULL;
+               }
        }
 
        sdb_strbuf_skip(input->input, 0, input->query_len);