sysdb: When handling a reply, base further actions on the response code.

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

diff --git a/src/tools/sysdb/command.c b/src/tools/sysdb/command.c
index 0abf381e95527234d8e2ef8aa608e25d3446c9ad..be41b15f9d92557588df6b9fefc326a261a80844 100644 (file)
--- a/src/tools/sysdb/command.c
+++ b/src/tools/sysdb/command.c
@@ -47,21 +47,30 @@
  */
 
 int
-sdb_command_print_reply(sdb_input_t *input)
+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(input->client, &rcode, recv_buf) < 0)
+       if (sdb_client_recv(client, &rcode, recv_buf) < 0)
                rcode = UINT32_MAX;
 
-       if (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);
@@ -71,7 +80,7 @@ sdb_command_print_reply(sdb_input_t *input)
        }
 
        sdb_strbuf_destroy(recv_buf);
-       return 0;
+       return status;
 } /* sdb_command_print_reply */
 
 char *
@@ -100,7 +109,13 @@ 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))
+
+               /* 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;
        }