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 c79259e401c0786bb80336601208b058180e23e9..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>
 
 /*
@@ -52,6 +53,7 @@ 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)
@@ -60,12 +62,23 @@ 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)
+       if (rcode == UINT32_MAX) {
                printf("ERROR: ");
+               status = -1;
+       }
+       else
+               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) {
@@ -74,7 +87,7 @@ sdb_command_print_reply(sdb_client_t *client)
        }
 
        sdb_strbuf_destroy(recv_buf);
-       return 0;
+       return status;
 } /* sdb_command_print_reply */
 
 char *
@@ -103,8 +116,17 @@ sdb_command_exec(sdb_input_t *input)
                /* ignore errors; we'll only hide the command from the caller */
 
                sdb_client_send(input->client, CONNECTION_QUERY, query_len, query);
-               if (sdb_command_print_reply(input->client))
+
+               /* 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) {
+                       if (data)
+                               free(data);
                        return NULL;
+               }
        }
 
        sdb_strbuf_skip(input->input, 0, input->query_len);