![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/tools/sysdb/main.c b/src/tools/sysdb/main.c
index 0639e5f74829042a4e3a8532b97f6ee74d853236..331cfa25e640912ac79ac6b37c44d3a91f374323 100644 (file)
--- a/src/tools/sysdb/main.c
+++ b/src/tools/sysdb/main.c
# include "config.h"
#endif /* HAVE_CONFIG_H */
+#include "tools/sysdb/command.h"
+#include "tools/sysdb/input.h"
+
#include "client/sysdb.h"
#include "client/sock.h"
#include "utils/error.h"
+#include "utils/llist.h"
#include "utils/strbuf.h"
#include <errno.h>
# define DEFAULT_SOCKET "unix:"LOCALSTATEDIR"/run/sysdbd.sock"
#endif
-static void
-exit_usage(char *name, int status)
-{
- printf(
-"Usage: %s <options>\n"
-
-"\nOptions:\n"
-" -h display this help and exit\n"
-" -V display the version number and copyright\n"
-
-"\nSysDB client "SDB_CLIENT_VERSION_STRING SDB_CLIENT_VERSION_EXTRA", "
-PACKAGE_URL"\n", basename(name));
- exit(status);
-} /* exit_usage */
-
-static void
-exit_version(void)
-{
- printf("SysDB version "SDB_CLIENT_VERSION_STRING
- SDB_CLIENT_VERSION_EXTRA", built "BUILD_DATE"\n"
- "using libsysdbclient version %s%s\n"
- "Copyright (C) 2012-2013 "PACKAGE_MAINTAINER"\n"
-
- "\nThis is free software under the terms of the BSD license, see "
- "the source for\ncopying conditions. There is NO WARRANTY; not "
- "even for MERCHANTABILITY or\nFITNESS FOR A PARTICULAR "
- "PURPOSE.\n", sdb_client_version_string(),
- sdb_client_version_extra());
- exit(0);
-} /* exit_version */
-
static const char *
get_current_user(void)
{
return result->pw_dir;
} /* get_homedir */
+static void
+exit_usage(char *name, int status)
+{
+ printf(
+"Usage: %s <options>\n"
+
+"\nOptions:\n"
+" -H HOST the host to connect to\n"
+" default: "DEFAULT_SOCKET"\n"
+" -U USER the username to connect as\n"
+" default: %s\n"
+" -c CMD execute the specified command and then exit\n"
+"\n"
+" -h display this help and exit\n"
+" -V display the version number and copyright\n"
+
+"\nSysDB client "SDB_CLIENT_VERSION_STRING SDB_CLIENT_VERSION_EXTRA", "
+PACKAGE_URL"\n", basename(name), get_current_user());
+ exit(status);
+} /* exit_usage */
+
+static void
+exit_version(void)
+{
+ printf("SysDB version "SDB_CLIENT_VERSION_STRING
+ SDB_CLIENT_VERSION_EXTRA", built "BUILD_DATE"\n"
+ "using libsysdbclient version %s%s\n"
+ "Copyright (C) 2012-2014 "PACKAGE_MAINTAINER"\n"
+
+ "\nThis is free software under the terms of the BSD license, see "
+ "the source for\ncopying conditions. There is NO WARRANTY; not "
+ "even for MERCHANTABILITY or\nFITNESS FOR A PARTICULAR "
+ "PURPOSE.\n", sdb_client_version_string(),
+ sdb_client_version_extra());
+ exit(0);
+} /* exit_version */
+
+static int
+execute_commands(sdb_client_t *client, sdb_llist_t *commands)
+{
+ sdb_llist_iter_t *iter;
+ int status = 0;
+
+ iter = sdb_llist_get_iter(commands);
+ if (! iter) {
+ sdb_log(SDB_LOG_ERR, "Failed to iterate commands");
+ return 1;
+ }
+
+ while (sdb_llist_iter_has_next(iter)) {
+ sdb_object_t *obj = sdb_llist_iter_get_next(iter);
+
+ if (sdb_client_send(client, CONNECTION_QUERY,
+ (uint32_t)strlen(obj->name), obj->name) <= 0) {
+ sdb_log(SDB_LOG_ERR, "Failed to send command '%s' to server",
+ obj->name);
+ status = 1;
+ break;
+ }
+
+ /* Wait for server replies. We might get any number of log messages
+ * but eventually see the reply to the query, which is either DATA or
+ * ERROR. */
+ while (42) {
+ status = sdb_command_print_reply(client);
+ if (status < 0) {
+ sdb_log(SDB_LOG_ERR, "Failed to read reply from server");
+ break;
+ }
+
+ if ((status == CONNECTION_DATA) || (status == CONNECTION_ERROR))
+ break;
+ if (status == CONNECTION_OK) {
+ /* pre 0.4 versions used OK instead of DATA */
+ sdb_log(SDB_LOG_WARNING, "Received unexpected OK status from "
+ "server in response to a QUERY (expected DATA); "
+ "assuming we're talking to an old server");
+ break;
+ }
+ }
+
+ if ((status != CONNECTION_OK) && (status != CONNECTION_DATA))
+ break; /* error */
+ }
+
+ sdb_llist_iter_destroy(iter);
+ return status;
+} /* execute_commands */
+
int
main(int argc, char **argv)
{
- sdb_client_t *client;
-
const char *host = NULL;
const char *user = NULL;
const char *homedir;
char hist_file[1024] = "";
- sdb_strbuf_t *buf;
+ sdb_input_t input = SDB_INPUT_INIT;
+ sdb_llist_t *commands = NULL;
while (42) {
- int opt = getopt(argc, argv, "H:U:hV");
+ int opt = getopt(argc, argv, "H:U:c:hV");
if (-1 == opt)
break;
user = optarg;
break;
+ case 'c':
+ {
+ sdb_object_t *obj;
+
+ if (! commands)
+ commands = sdb_llist_create();
+ if (! commands) {
+ sdb_log(SDB_LOG_ERR, "Failed to create list object");
+ exit(1);
+ }
+
+ if (! (obj = sdb_object_create_T(optarg, sdb_object_t))) {
+ sdb_log(SDB_LOG_ERR, "Failed to create object");
+ exit(1);
+ }
+ if (sdb_llist_append(commands, obj)) {
+ sdb_log(SDB_LOG_ERR, "Failed to append command to list");
+ sdb_object_deref(obj);
+ exit(1);
+ }
+ sdb_object_deref(obj);
+ }
+ break;
+
case 'h':
exit_usage(argv[0], 0);
break;
exit(1);
}
- client = sdb_client_create(host);
- if (! client) {
+ input.client = sdb_client_create(host);
+ if (! input.client) {
sdb_log(SDB_LOG_ERR, "Failed to create client object");
exit(1);
}
- if (sdb_client_connect(client, user)) {
+ if (sdb_client_connect(input.client, user)) {
sdb_log(SDB_LOG_ERR, "Failed to connect to SysDBd");
- sdb_client_destroy(client);
+ sdb_client_destroy(input.client);
exit(1);
}
+ if (commands) {
+ int status = execute_commands(input.client, commands);
+ sdb_llist_destroy(commands);
+ sdb_client_destroy(input.client);
+ if ((status != CONNECTION_OK) && (status != CONNECTION_DATA))
+ exit(1);
+ exit(0);
+ }
+
sdb_log(SDB_LOG_INFO, "SysDB client "SDB_CLIENT_VERSION_STRING
- SDB_CLIENT_VERSION_EXTRA"\n");
+ SDB_CLIENT_VERSION_EXTRA" (libsysdbclient %s%s)\n",
+ sdb_client_version_string(), sdb_client_version_extra());
using_history();
}
}
- buf = sdb_strbuf_create(1024);
-
- while (42) {
- const char *prompt = "sysdb=> ";
- const char *query;
- char *input;
-
- if (sdb_strbuf_len(buf))
- prompt = "sysdb-> ";
-
- input = readline(prompt);
-
- if (! input)
- break;
-
- sdb_strbuf_append(buf, input);
- free(input);
-
- query = sdb_strbuf_string(buf);
- if (! strchr(query, (int)';'))
- continue;
+ input.input = sdb_strbuf_create(2048);
+ sdb_input_init(&input);
+ sdb_input_mainloop();
- /* XXX */
- sdb_strbuf_clear(buf);
+ sdb_client_shutdown(input.client, SHUT_WR);
+ while (! sdb_client_eof(input.client)) {
+ /* wait for remaining data to arrive */
+ sdb_command_print_reply(input.client);
}
if (hist_file[0] != '\0') {
}
}
- sdb_client_destroy(client);
+ sdb_client_destroy(input.client);
+ sdb_strbuf_destroy(input.input);
return 0;
} /* main */