git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: provide IP-related API on any OS
[dpdk.git]
/
lib
/
librte_cmdline
/
cmdline.c
diff --git
a/lib/librte_cmdline/cmdline.c
b/lib/librte_cmdline/cmdline.c
index
53cda84
..
a176d15
100644
(file)
--- a/
lib/librte_cmdline/cmdline.c
+++ b/
lib/librte_cmdline/cmdline.c
@@
-11,20
+11,15
@@
#include <stdarg.h>
#include <inttypes.h>
#include <fcntl.h>
#include <stdarg.h>
#include <inttypes.h>
#include <fcntl.h>
-#include <poll.h>
#include <errno.h>
#include <errno.h>
-#include <termios.h>
-#include <netinet/in.h>
#include <rte_string_fns.h>
#include <rte_string_fns.h>
-#include "cmdline_parse.h"
-#include "cmdline_rdline.h"
-#include "cmdline.h"
+#include "cmdline_private.h"
static void
cmdline_valid_buffer(struct rdline *rdl, const char *buf,
static void
cmdline_valid_buffer(struct rdline *rdl, const char *buf,
- __
attribute__((unused))
unsigned int size)
+ __
rte_unused
unsigned int size)
{
struct cmdline *cl = rdl->opaque;
int ret;
{
struct cmdline *cl = rdl->opaque;
int ret;
@@
-103,6
+98,12
@@
cmdline_new(cmdline_parse_ctx_t *ctx, const char *prompt, int s_in, int s_out)
return cl;
}
return cl;
}
+struct rdline*
+cmdline_get_rdline(struct cmdline *cl)
+{
+ return &cl->rdl;
+}
+
void
cmdline_free(struct cmdline *cl)
{
void
cmdline_free(struct cmdline *cl)
{
@@
-129,7
+130,7
@@
cmdline_printf(const struct cmdline *cl, const char *fmt, ...)
if (cl->s_out < 0)
return;
va_start(ap, 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);
}
va_end(ap);
}
@@
-181,7
+182,6
@@
cmdline_quit(struct cmdline *cl)
int
cmdline_poll(struct cmdline *cl)
{
int
cmdline_poll(struct cmdline *cl)
{
- struct pollfd pfd;
int status;
ssize_t read_status;
char c;
int status;
ssize_t read_status;
char c;
@@
-191,16
+191,12
@@
cmdline_poll(struct cmdline *cl)
else if (cl->rdl.status == RDLINE_EXITED)
return RDLINE_EXITED;
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;
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;
if (read_status < 0)
return read_status;
@@
-222,7
+218,7
@@
cmdline_interact(struct cmdline *cl)
c = -1;
while (1) {
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;
break;
if (cmdline_in(cl, &c, 1) < 0)
break;