net/mlx5: fix tunnel offload object allocation

[dpdk.git] / lib / librte_cmdline / cmdline.c

diff --git a/lib/librte_cmdline/cmdline.c b/lib/librte_cmdline/cmdline.c
index 41f50cc..79ea5f9 100644 (file)
--- a/lib/librte_cmdline/cmdline.c
+++ b/lib/librte_cmdline/cmdline.c
@@ -11,13 +11,16 @@
 #include <stdarg.h>
 #include <inttypes.h>
 #include <fcntl.h>
-#include <poll.h>
 #include <errno.h>
 #include <netinet/in.h>
 
 #include <rte_string_fns.h>
 
-#include "cmdline.h"
+#include "cmdline_private.h"
+
+#ifdef RTE_EXEC_ENV_WINDOWS
+#define write _write
+#endif
 
 static void
 cmdline_valid_buffer(struct rdline *rdl, const char *buf,
@@ -132,7 +135,7 @@ cmdline_printf(const struct cmdline *cl, const char *fmt, ...)
        if (cl->s_out < 0)
                return;
        va_start(ap, fmt);
-       vdprintf(cl->s_out, fmt, ap);
+       cmdline_vdprintf(cl->s_out, fmt, ap);
        va_end(ap);
 }
 
@@ -184,7 +187,6 @@ cmdline_quit(struct cmdline *cl)
 int
 cmdline_poll(struct cmdline *cl)
 {
-       struct pollfd pfd;
        int status;
        ssize_t read_status;
        char c;
@@ -194,16 +196,12 @@ cmdline_poll(struct cmdline *cl)
        else if (cl->rdl.status == RDLINE_EXITED)
                return RDLINE_EXITED;
 
-       pfd.fd = cl->s_in;
-       pfd.events = POLLIN;
-       pfd.revents = 0;
-
-       status = poll(&pfd, 1, 0);
+       status = cmdline_poll_char(cl);
        if (status < 0)
                return status;
        else if (status > 0) {
                c = -1;
-               read_status = read(cl->s_in, &c, 1);
+               read_status = cmdline_read_char(cl, &c);
                if (read_status < 0)
                        return read_status;
 
@@ -225,7 +223,7 @@ cmdline_interact(struct cmdline *cl)
 
        c = -1;
        while (1) {
-               if (read(cl->s_in, &c, 1) <= 0)
+               if (cmdline_read_char(cl, &c) <= 0)
                        break;
                if (cmdline_in(cl, &c, 1) < 0)
                        break;