rdline: don't display prompt if stopped by user

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

diff --git a/src/lib/cmdline_rdline.c b/src/lib/cmdline_rdline.c
index 8d07b02..785a23c 100644 (file)
--- a/src/lib/cmdline_rdline.c
+++ b/src/lib/cmdline_rdline.c
@@ -107,7 +107,7 @@ rdline_init(struct rdline *rdl,
        rdl->validate = validate;
        rdl->complete = complete;
        rdl->help = help;
-       rdl->status = RDLINE_INIT;
+       rdl->status = RDLINE_STOPPED;
 #ifndef NO_RDLINE_HISTORY
        cirbuf_init(&rdl->history, rdl->history_buf, 0, RDLINE_HISTORY_BUF_SIZE);
 #endif /* !NO_RDLINE_HISTORY */
@@ -135,7 +135,7 @@ rdline_newline(struct rdline *rdl, const char *prompt)
 void
 rdline_stop(struct rdline *rdl)
 {
-       rdl->status = RDLINE_INIT;
+       rdl->status = RDLINE_STOPPED;
 }
 
 void
@@ -214,26 +214,30 @@ rdline_parse_char(struct rdline *rdl, char c)
 #ifndef NO_PAGER
        /* display asynchrounous printf if any */
        if (rdl->pager_buf != NULL) {
-               if (cmd == VT100_STD_CHAR && c == 'q') {
-                       rdline_asyncpager_reset(rdl);
-                       if (rdl->pager_cb != NULL) {
-                               rdl->pager_cb(rdl, rdl->pager_arg);
-                               rdl->pager_cb = NULL;
-                       }
-                       if (rdl->pager_buf == NULL)
-                               return RDLINE_RES_VALIDATED;
-               }
 
-               if (rdline_pager_next_page(rdl) == 0) {
+               /* user ask to exit pager, or last page is displayed*/
+               if ((cmd == VT100_STD_CHAR && c == 'q') ||
+                   rdline_pager_next_page(rdl) == 0) {
+                       int ret;
+
+                       ret = rdl->pager_ret;
                        rdline_asyncpager_reset(rdl);
                        if (rdl->pager_cb != NULL) {
                                rdl->pager_cb(rdl, rdl->pager_arg);
                                rdl->pager_cb = NULL;
                        }
-                       if (rdl->pager_buf == NULL)
-                               return RDLINE_RES_VALIDATED;
+                       /* maybe the pager was reloaded in the
+                        * callback */
+                       if (rdl->pager_buf != NULL)
+                               return RDLINE_RES_SUCCESS;
+
+                       /* else, redisplay prompt and return the saved status */
+                       rdline_redisplay(rdl);
+                       return ret;
                }
-               /* async printf was called in cb() */
+
+               /* Some pages remain, lines were displayed in
+                * rdline_pager_next_page() */
                return RDLINE_RES_SUCCESS;
        }
 #endif
@@ -470,8 +474,7 @@ rdline_parse_char(struct rdline *rdl, char c)
                                cirbuf_add_tail(&rdl->left, tmp);
                        }
                        cirbuf_align_left(&rdl->left);
-                       rdl->left_buf[CIRBUF_GET_LEN(&rdl->left)] = '\n';
-                       rdl->left_buf[CIRBUF_GET_LEN(&rdl->left) + 1] = '\0';
+                       rdl->left_buf[CIRBUF_GET_LEN(&rdl->left)] = '\0';
                        rdline_printf(rdl, "\r\n");
 #ifndef NO_RDLINE_HISTORY
                        if (rdl->history_cur_line != -1)
@@ -479,19 +482,23 @@ rdline_parse_char(struct rdline *rdl, char c)
 #endif
 
                        if (rdl->validate)
-                               rdl->validate(rdl, rdl->left_buf, CIRBUF_GET_LEN(&rdl->left)+2);
+                               rdl->validate(rdl, rdl->left_buf,
+                                             CIRBUF_GET_LEN(&rdl->left)+2);
 #ifndef NO_PAGER
                        /* user may have stopped rdline */
                        if (rdl->status == RDLINE_EXITED) {
                                rdline_asyncpager_reset(rdl);
                                return RDLINE_RES_EXITED;
                        }
-                       if (rdl->pager_buf != NULL)
+                       /* there is something in pager buffer, save
+                        * return value that will be return once
+                        * paging is finished */
+                       if (rdl->pager_buf != NULL) {
+                               rdl->pager_ret = RDLINE_RES_VALIDATED;
                                return RDLINE_RES_SUCCESS;
-                       else
-                               rdline_asyncpager_reset(rdl);
+                       }
 
-                       rdl->status = RDLINE_INIT;
+                       rdline_asyncpager_reset(rdl);
 #else
                        if (rdl->status == RDLINE_EXITED)
                                return RDLINE_RES_EXITED;
@@ -784,6 +791,9 @@ rdline_asyncpager_reset(struct rdline *rdl)
        rdl->pager_lines = 0;
        rdl->pager_len = 0;
        rdl->pager_off = 0;
+       rdl->pager_cb = NULL;
+       rdl->pager_arg = NULL;
+       rdl->pager_ret = RDLINE_RES_SUCCESS;
 }
 
 /* Return the offset of the i-th occurence of char c in string s. If