index 77f3c8346498c430be10fcbafcf1ab9a06ee5cc2..718309bfad693678f93e1017eb5e01578b1b3b5a 100644 (file)
#include <assert.h>
#include <ctype.h>
+#include <stdlib.h>
#include <string.h>
/*
if (! recv_buf)
return -1;
- if (sdb_client_recv(client, &rcode, recv_buf) < 0) {
+ if (sdb_client_recv(client, &rcode, recv_buf) < 0)
rcode = UINT32_MAX;
- status = -1;
- }
- if (sdb_client_eof(client))
+ if (sdb_client_eof(client)) {
+ sdb_strbuf_destroy(recv_buf);
return -1;
+ }
- if (rcode == CONNECTION_ERROR)
- status = 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) {
/* 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) < 0)
+
+ /* 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);