cmdline (merge-intel): replace harcoded return values with defines

[libcmdline.git] / src / lib / cmdline.c

diff --git a/src/lib/cmdline.c b/src/lib/cmdline.c
index 5e7f009..3e52be3 100644 (file)
--- a/src/lib/cmdline.c
+++ b/src/lib/cmdline.c
@@ -66,23 +66,14 @@
 #include <stdarg.h>
 #include <inttypes.h>
 #include <fcntl.h>
-
-#include <sys/socket.h>
+#include <termios.h>
 #include <netinet/in.h>
-#include <sys/socket.h>
-#include <sys/un.h>
 
 #include "cmdline_parse.h"
 #include "cmdline_rdline.h"
 #include "cmdline.h"
 
-
-#define PROMPT_SUFFIX "> "
-
-
-/**********************/
-
-void
+static void
 cmdline_valid_buffer(struct rdline *rdl, const char *buf,
                     __attribute__((unused)) unsigned int size)
 {
@@ -97,7 +88,7 @@ cmdline_valid_buffer(struct rdline *rdl, const char *buf,
                cmdline_printf(cl, "Bad arguments\n");
 }
 
-int
+static int
 cmdline_complete_buffer(struct rdline *rdl, const char *buf,
                        char *dstbuf, unsigned int dstsize,
                        int *state)
@@ -175,11 +166,10 @@ cmdline_in(struct cmdline *cl, const char *buf, int size)
        int ret = 0;
        int i, same;
 
-       /* XXX use defines instead of hardcoded values */
        for (i=0; i<size; i++) {
                ret = rdline_char_in(&cl->rdl, buf[i]);
 
-               if (ret == 1) {
+               if (ret == RDLINE_RES_VALIDATED) {
                        buffer = rdline_get_buffer(&cl->rdl);
                        history = rdline_get_history_item(&cl->rdl, 0);
                        if (history) {
@@ -192,8 +182,23 @@ cmdline_in(struct cmdline *cl, const char *buf, int size)
                                rdline_add_history(&cl->rdl, buffer);
                        rdline_newline(&cl->rdl, cl->prompt);
                }
-               else if (ret == -2)
+               else if (ret == RDLINE_RES_EOF)
                        return -1;
        }
        return i;
 }
+
+void
+cmdline_interact(struct cmdline *cl)
+{
+       char c;
+
+       c = -1;
+       while (1) {
+               read(cl->s_in, &c, 1);
+               if (cmdline_in(cl, &c, 1) < 0) {
+                       break;
+               }
+       }
+       cmdline_free(cl);
+}