index 30e6419e334d1b105749db8861826f2adf5f2883..505124cae243b8e974c1790f8d04290e38f6c4c4 100644 (file)
#include "tools/sysdb/input.h"
#include "frontend/proto.h"
+#include "utils/error.h"
#include "utils/strbuf.h"
+#include <errno.h>
+
#include <assert.h>
#include <ctype.h>
#include <string.h>
* public API
*/
+int
+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(client, &rcode, recv_buf) < 0)
+ rcode = UINT32_MAX;
+
+ if (sdb_client_eof(client)) {
+ sdb_strbuf_destroy(recv_buf);
+ 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);
+ else if (rcode == UINT32_MAX) {
+ char errbuf[1024];
+ printf("%s\n", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ }
+
+ sdb_strbuf_destroy(recv_buf);
+ return status;
+} /* sdb_command_print_reply */
+
char *
sdb_command_exec(sdb_input_t *input)
{
--query_len;
if (query_len) {
- sdb_strbuf_t *recv_buf;
- uint32_t rcode = 0;
-
- recv_buf = sdb_strbuf_create(1024);
- if (! recv_buf)
- return NULL;
-
data = strndup(query, query_len);
/* ignore errors; we'll only hide the command from the caller */
sdb_client_send(input->client, CONNECTION_QUERY, query_len, query);
- if (sdb_client_recv(input->client, &rcode, recv_buf) < 0)
- rcode = UINT32_MAX;
-
- if (rcode == UINT32_MAX)
- printf("ERROR: ");
- printf("%s\n", sdb_strbuf_string(recv_buf));
- sdb_strbuf_destroy(recv_buf);
+ /* 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;
}
sdb_strbuf_skip(input->input, 0, input->query_len);