index f9195a644057ee9b2c849f4f764f4ef6bacd65d4..6c3114d8e692274d8223c7601c3082d5174b5fe2 100644 (file)
sdb_strbuf_skip(input->input, 0, input->query_len);
input->tokenizer_pos -= input->query_len;
input->query_len = 0;
+ input->have_input = 0;
} /* clear_query */
/*
while (query_len && (query[query_len - 1]) == '\n')
--query_len;
- if (sdb_client_eof(input->client)) {
- sdb_client_close(input->client);
- if (sdb_client_connect(input->client, input->user)) {
- printf("Failed to reconnect to SysDBd.\n");
- clear_query(input);
- return NULL;
- }
- printf("Successfully reconnected to SysDBd.\n");
- }
-
if (query_len) {
data = strndup(query, query_len);
/* ignore errors; we'll only hide the command from the caller */
+ }
- sdb_client_send(input->client, SDB_CONNECTION_QUERY, query_len, query);
-
- /* 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). */
- /* TODO: wait for the actual reply instead */
- if (sdb_command_print_reply(input->client) < 0) {
- if (data)
- free(data);
- data = NULL;
+ if (sdb_client_eof(input->client)) {
+ if (sdb_input_reconnect()) {
+ clear_query(input);
+ return data;
}
}
+ else if (! query_len)
+ return NULL;
+
+ sdb_client_send(input->client, SDB_CONNECTION_QUERY, query_len, query);
+ /* 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). */
+ sdb_command_print_reply(input->client);
clear_query(input);
return data;
} /* sdb_command_exec */