X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ftools%2Fsysdb%2Finput.h;h=6002c1f3d5464f992c01bae48aa38b55819a0eae;hb=8efdf07be8a00287bc3d929cde8aa7562b4910be;hp=7fd8d587de8961f70a2107048ca782ed53a39659;hpb=a006a526f16e790dbeae6ef96ed61f506310b66f;p=sysdb.git

diff --git a/src/tools/sysdb/input.h b/src/tools/sysdb/input.h
index 7fd8d58..6002c1f 100644
--- a/src/tools/sysdb/input.h
+++ b/src/tools/sysdb/input.h
@@ -33,13 +33,53 @@
 
 typedef struct {
 	sdb_client_t *client;
+	char *user;
 
 	sdb_strbuf_t *input;
 	size_t tokenizer_pos;
 	size_t query_len;
+
+	/* indicates that we've had non-empty input */
+	bool have_input;
+
+	bool interactive;
+	bool eof;
 } sdb_input_t;
 
-#define SDB_INPUT_INIT { NULL, NULL, 0, 0 }
+#define SDB_INPUT_INIT { NULL, NULL, NULL, 0, 0, 0, 1, 0 }
+
+/*
+ * sysdb_input:
+ * Input object to be used by the 'sysdb' command line tool.
+ */
+extern sdb_input_t *sysdb_input;
+
+/*
+ * sdb_input_init:
+ * Initialize the input handler.
+ */
+int
+sdb_input_init(sdb_input_t *input);
+
+/*
+ * sdb_input_reset:
+ * Reset the input handler and free all dynamically allocated memory. The
+ * input handler object itself will not be freed.
+ */
+void
+sdb_input_reset(sdb_input_t *input);
+
+/*
+ * sdb_input_mainloop:
+ * Wait for and handle all user and server input until end-of-file is read
+ * from the user (on the standard input channel).
+ *
+ * Returns:
+ *  - 0 on success
+ *  - a negative value else
+ */
+int
+sdb_input_mainloop(void);
 
 /*
  * sdb_input_readline:
@@ -53,15 +93,23 @@ typedef struct {
  *  - A negative value in case of an error.
  */
 ssize_t
-sdb_input_readline(sdb_input_t *input, char *buf,
-		int *n_chars, size_t max_chars);
+sdb_input_readline(char *buf, size_t *n_chars, size_t max_chars);
 
 /*
- * scanner
+ * sdb_input_exec_query:
+ * Execute the query currently stored in the input buffer. Waits for the
+ * server's reply and prints errors or returned data to standard output.
  */
+int
+sdb_input_exec_query(void);
 
-void
-sdb_input_set(sdb_input_t *new_input);
+/*
+ * sdb_input_reconnect:
+ * Let the client reconnect to the server using the settings stored in
+ * sysdb_input.
+ */
+int
+sdb_input_reconnect(void);
 
 #endif /* SYSDB_INPUT_H */