WIP: Refactor

input.c

@@ -255,16 +255,20 @@ inputresult_T input_interactive(struct xwcsbuf_T *buf, void *inputinfo)
 
     // FIXME
 
-    wchar_t *line;
+#if YASH_ENABLE_HISTORY
+    size_t oldbuflen = buf->length;
+#endif
     inputresult_T result;
 
 #if YASH_ENABLE_LINEEDIT
     /* read a line using line editing */
     if (info->fileinfo->fd == STDIN_FILENO
             && shopt_lineedit != SHOPT_NOLINEEDIT) {
+        wchar_t *line;
         result = le_readline(prompt, true, &line);
         switch (result) {
             case INPUT_OK:
+                wb_catfree(buf, line);
                 goto success;
             case INPUT_EOF:
             case INPUT_INTERRUPTED:
@@ -279,10 +283,7 @@ inputresult_T input_interactive(struct xwcsbuf_T *buf, void *inputinfo)
     print_prompt(prompt.main);
     print_prompt(prompt.styler);
 
-    xwcsbuf_T linebuf;
-    wb_init(&linebuf);
-    result = input_file(&linebuf, info->fileinfo);
-    line = wb_towcs(&linebuf);
+    result = input_file(buf, info->fileinfo);
 
     print_prompt(PROMPT_RESET);
 
@@ -292,9 +293,8 @@ inputresult_T input_interactive(struct xwcsbuf_T *buf, void *inputinfo)
     if (info->prompttype == 1)
         info->prompttype = 2;
 #if YASH_ENABLE_HISTORY
-    add_history(line);
+    add_history(&buf->contents[oldbuflen]);
 #endif
-    wb_catfree(buf, line);
 #if YASH_ENABLE_LINEEDIT
 done:
 #endif