index 1128c388e8bbd827f63e63cb2cd2628137e146fd..9dfb6194d40b9db217ab66a519e3d6995bf69c8b 100644 (file)
#include <assert.h>
#include <ctype.h>
+#include <stdlib.h>
#include <string.h>
/*
*/
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 (sdb_client_eof(input->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);
if (result && *result)
printf("%s\n", result);
}
sdb_strbuf_destroy(recv_buf);
- return 0;
+ return status;
} /* sdb_command_print_reply */
char *
/* 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) {
+ if (data)
+ free(data);
return NULL;
+ }
}
sdb_strbuf_skip(input->input, 0, input->query_len);