cmdline (merge-intel): support ctrl-w in librte_cmdline

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

diff --git a/src/lib/cmdline_cirbuf.c b/src/lib/cmdline_cirbuf.c
index 133b32e..4046947 100644 (file)
--- a/src/lib/cmdline_cirbuf.c
+++ b/src/lib/cmdline_cirbuf.c
@@ -92,10 +92,13 @@ cirbuf_add_buf_head(struct cirbuf *cbuf, const char *c, unsigned int n)
                memcpy(cbuf->buf + cbuf->start - n + e, c, n);
        }
        else {
-               dprintf("s[%d] -> d[%d] (%d)\n", + n - (cbuf->start + e), 0, cbuf->start + e);
-               dprintf("s[%d] -> d[%d] (%d)\n", cbuf->maxlen - n + (cbuf->start + e), 0, n - (cbuf->start + e));
+               dprintf("s[%d] -> d[%d] (%d)\n", + n - (cbuf->start + e), 0,
+                       cbuf->start + e);
+               dprintf("s[%d] -> d[%d] (%d)\n", cbuf->maxlen - n +
+                       (cbuf->start + e), 0, n - (cbuf->start + e));
                memcpy(cbuf->buf, c  + n - (cbuf->start + e) , cbuf->start + e);
-               memcpy(cbuf->buf + cbuf->maxlen - n + (cbuf->start + e), c, n - (cbuf->start + e));
+               memcpy(cbuf->buf + cbuf->maxlen - n + (cbuf->start + e), c,
+                      n - (cbuf->start + e));
        }
        cbuf->len += n;
        cbuf->start += (cbuf->maxlen - n + e);
@@ -120,10 +123,14 @@ cirbuf_add_buf_tail(struct cirbuf *cbuf, const char *c, unsigned int n)
                memcpy(cbuf->buf + cbuf->end + !e, c, n);
        }
        else {
-               dprintf("s[%d] -> d[%d] (%d)\n", cbuf->end + !e, 0, cbuf->maxlen - cbuf->end - 1 + e);
-               dprintf("s[%d] -> d[%d] (%d)\n", cbuf->maxlen - cbuf->end - 1 + e, 0, n - cbuf->maxlen + cbuf->end + 1 - e);
-               memcpy(cbuf->buf + cbuf->end + !e, c, cbuf->maxlen - cbuf->end - 1 + e);
-               memcpy(cbuf->buf, c + cbuf->maxlen - cbuf->end - 1 + e, n - cbuf->maxlen + cbuf->end + 1 - e);
+               dprintf("s[%d] -> d[%d] (%d)\n", cbuf->end + !e, 0,
+                       cbuf->maxlen - cbuf->end - 1 + e);
+               dprintf("s[%d] -> d[%d] (%d)\n", cbuf->maxlen - cbuf->end - 1 +
+                       e, 0, n - cbuf->maxlen + cbuf->end + 1 - e);
+               memcpy(cbuf->buf + cbuf->end + !e, c, cbuf->maxlen -
+                      cbuf->end - 1 + e);
+               memcpy(cbuf->buf, c + cbuf->maxlen - cbuf->end - 1 + e,
+                      n - cbuf->maxlen + cbuf->end + 1 - e);
        }
        cbuf->len += n;
        cbuf->end += n - e;
@@ -355,7 +362,9 @@ cirbuf_del_tail(struct cirbuf * cbuf)
 int
 cirbuf_get_buf_head(struct cirbuf *cbuf, char *c, unsigned int size)
 {
-       unsigned int n = (size < CIRBUF_GET_LEN(cbuf)) ? size : CIRBUF_GET_LEN(cbuf);
+       unsigned int n;
+
+       n = (size < CIRBUF_GET_LEN(cbuf)) ? size : CIRBUF_GET_LEN(cbuf);
 
        if (!n)
                return 0;
@@ -365,10 +374,13 @@ cirbuf_get_buf_head(struct cirbuf *cbuf, char *c, unsigned int size)
                memcpy(c, cbuf->buf + cbuf->start , n);
        }
        else {
-               dprintf("s[%d] -> d[%d] (%d)\n", cbuf->start, 0, cbuf->maxlen - cbuf->start);
-               dprintf("s[%d] -> d[%d] (%d)\n", 0, cbuf->maxlen - cbuf->start, n - cbuf->maxlen + cbuf->start);
+               dprintf("s[%d] -> d[%d] (%d)\n", cbuf->start, 0,
+                       cbuf->maxlen - cbuf->start);
+               dprintf("s[%d] -> d[%d] (%d)\n", 0,cbuf->maxlen - cbuf->start,
+                       n - cbuf->maxlen + cbuf->start);
                memcpy(c, cbuf->buf + cbuf->start , cbuf->maxlen - cbuf->start);
-               memcpy(c + cbuf->maxlen - cbuf->start, cbuf->buf, n - cbuf->maxlen + cbuf->start);
+               memcpy(c + cbuf->maxlen - cbuf->start, cbuf->buf,
+                      n - cbuf->maxlen + cbuf->start);
        }
        return n;
 }
@@ -378,7 +390,9 @@ cirbuf_get_buf_head(struct cirbuf *cbuf, char *c, unsigned int size)
 int
 cirbuf_get_buf_tail(struct cirbuf *cbuf, char *c, unsigned int size)
 {
-       unsigned int n = (size < CIRBUF_GET_LEN(cbuf)) ? size : CIRBUF_GET_LEN(cbuf);
+       unsigned int n;
+
+       n = (size < CIRBUF_GET_LEN(cbuf)) ? size : CIRBUF_GET_LEN(cbuf);
 
        if (!n)
                return 0;
@@ -388,11 +402,15 @@ cirbuf_get_buf_tail(struct cirbuf *cbuf, char *c, unsigned int size)
                memcpy(c, cbuf->buf + cbuf->end - n + 1, n);
        }
        else {
-               dprintf("s[%d] -> d[%d] (%d)\n", 0,  cbuf->maxlen - cbuf->start, cbuf->end + 1);
-               dprintf("s[%d] -> d[%d] (%d)\n", cbuf->maxlen - n + cbuf->end + 1, 0, n - cbuf->end - 1);
-
-               memcpy(c + cbuf->maxlen - cbuf->start, cbuf->buf, cbuf->end + 1);
-               memcpy(c, cbuf->buf + cbuf->maxlen - n + cbuf->end +1, n - cbuf->end - 1);
+               dprintf("s[%d] -> d[%d] (%d)\n", 0,
+                       cbuf->maxlen - cbuf->start, cbuf->end + 1);
+               dprintf("s[%d] -> d[%d] (%d)\n",
+                       cbuf->maxlen - n + cbuf->end + 1, 0, n - cbuf->end - 1);
+
+               memcpy(c + cbuf->maxlen - cbuf->start,
+                      cbuf->buf, cbuf->end + 1);
+               memcpy(c, cbuf->buf + cbuf->maxlen - n + cbuf->end +1,
+                      n - cbuf->end - 1);
        }
        return n;
 }