Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into merge

Conflicts:
	Makefile.flags
	scripts/basic/fixdep.c

1 files changed, 102 insertions, 8 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 1b97e8609..c89c829ed 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1359,7 +1359,9 @@ static void load_history(line_input_t *st_parm)
 
                 /* fill temp_h[], retaining only last MAX_HISTORY lines */
                 memset(temp_h, 0, sizeof(temp_h));
-                st_parm->cnt_history_in_file = idx = 0;
+                idx = 0;
+                if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
+                        st_parm->cnt_history_in_file = 0;
                 while ((line = xmalloc_fgetline(fp)) != NULL) {
                         if (line[0] == '\0') {
                                 free(line);
@@ -1367,7 +1369,8 @@ static void load_history(line_input_t *st_parm)
                         }
                         free(temp_h[idx]);
                         temp_h[idx] = line;
-                        st_parm->cnt_history_in_file++;
+                        if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
+                                st_parm->cnt_history_in_file++;
                         idx++;
                         if (idx == st_parm->max_history)
                                 idx = 0;
@@ -1397,15 +1400,62 @@ static void load_history(line_input_t *st_parm)
                         st_parm->history[i++] = line;
                 }
                 st_parm->cnt_history = i;
+                if (ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
+                        st_parm->cnt_history_in_file = i;
         }
 }
 
-/* state->flags is already checked to be nonzero */
+#  if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
+void save_history(line_input_t *st)
+{
+        FILE *fp;
+
+        if (!st->hist_file)
+                return;
+        if (st->cnt_history <= st->cnt_history_in_file)
+                return;
+
+        fp = fopen(st->hist_file, "a");
+        if (fp) {
+                int i, fd;
+                char *new_name;
+                line_input_t *st_temp;
+
+                for (i = st->cnt_history_in_file; i < st->cnt_history; i++)
+                        fprintf(fp, "%s\n", st->history[i]);
+                fclose(fp);
+
+                /* we may have concurrently written entries from others.
+                 * load them */
+                st_temp = new_line_input_t(st->flags);
+                st_temp->hist_file = st->hist_file;
+                st_temp->max_history = st->max_history;
+                load_history(st_temp);
+
+                /* write out temp file and replace hist_file atomically */
+                new_name = xasprintf("%s.%u.new", st->hist_file, (int) getpid());
+                fd = open(new_name, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+                if (fd >= 0) {
+                        fp = xfdopen_for_write(fd);
+                        for (i = 0; i < st_temp->cnt_history; i++)
+                                fprintf(fp, "%s\n", st_temp->history[i]);
+                        fclose(fp);
+                        if (rename(new_name, st->hist_file) == 0)
+                                st->cnt_history_in_file = st_temp->cnt_history;
+                }
+                free(new_name);
+                free_line_input_t(st_temp);
+        }
+}
+#  else
 static void save_history(char *str)
 {
         int fd;
         int len, len2;
 
+        if (!state->hist_file)
+                return;
+
         fd = open(state->hist_file, O_WRONLY | O_CREAT | O_APPEND, 0600);
         if (fd < 0)
                 return;
@@ -1433,7 +1483,7 @@ static void save_history(char *str)
 
                 /* write out temp file and replace hist_file atomically */
                 new_name = xasprintf("%s.%u.new", state->hist_file, (int) getpid());
-                fd = open(state->hist_file, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+                fd = open(new_name, O_WRONLY | O_CREAT | O_TRUNC, 0600);
                 if (fd >= 0) {
                         FILE *fp;
                         int i;
@@ -1449,6 +1499,7 @@ static void save_history(char *str)
                 free_line_input_t(st_temp);
         }
 }
+#  endif
 # else
 #  define load_history(a) ((void)0)
 #  define save_history(a) ((void)0)
@@ -1477,15 +1528,18 @@ static void remember_in_history(char *str)
                 for (i = 0; i < state->max_history-1; i++)
                         state->history[i] = state->history[i+1];
                 /* i == state->max_history-1 */
+# if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
+                if (state->cnt_history_in_file)
+                        state->cnt_history_in_file--;
+# endif
         }
         /* i <= state->max_history-1 */
         state->history[i++] = xstrdup(str);
         /* i <= state->max_history */
         state->cur_history = i;
         state->cnt_history = i;
-# if MAX_HISTORY > 0 && ENABLE_FEATURE_EDITING_SAVEHISTORY
-        if ((state->flags & SAVE_HISTORY) && state->hist_file)
-                save_history(str);
+# if ENABLE_FEATURE_EDITING_SAVEHISTORY && !ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
+        save_history(str);
 # endif
         IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines++;)
 }
@@ -2147,7 +2201,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         state = st ? st : (line_input_t*) &const_int_0;
 #if MAX_HISTORY > 0
 # if ENABLE_FEATURE_EDITING_SAVEHISTORY
-        if ((state->flags & SAVE_HISTORY) && state->hist_file)
+        if (state->hist_file)
                 if (state->cnt_history == 0)
                         load_history(state);
 # endif
@@ -2467,6 +2521,44 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                                 vi_cmdmode = 1;
                                 input_backward(1);
                         }
+                        /* Handle a few ESC-<key> combinations the same way
+                         * standard readline bindings (IOW: bash) do.
+                         * Often, Alt-<key> generates ESC-<key>.
+                         */
+                        ic = lineedit_read_key(read_key_buffer, timeout);
+                        switch (ic) {
+                                //case KEYCODE_LEFT: - bash doesn't do this
+                                case 'b':
+                                        ctrl_left();
+                                        break;
+                                //case KEYCODE_RIGHT: - bash doesn't do this
+                                case 'f':
+                                        ctrl_right();
+                                        break;
+                                //case KEYCODE_DELETE: - bash doesn't do this
+                                case 'd':  /* Alt-D */
+                                {
+                                        /* Delete word forward */
+                                        int nc, sc = cursor;
+                                        ctrl_right();
+                                        nc = cursor;
+                                        input_backward(cursor - sc);
+                                        while (--nc >= cursor)
+                                                input_delete(1);
+                                        break;
+                                }
+                                case '\b':   /* Alt-Backspace(?) */
+                                case '\x7f': /* Alt-Backspace(?) */
+                                //case 'w': - bash doesn't do this
+                                {
+                                        /* Delete word backward */
+                                        int sc = cursor;
+                                        ctrl_left();
+                                        while (sc-- > cursor)
+                                                input_delete(1);
+                                        break;
+                                }
+                        }
                         break;
 #endif /* FEATURE_COMMAND_EDITING_VI */
 
@@ -2495,9 +2587,11 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                         input_backward(1);
                         break;
                 case KEYCODE_CTRL_LEFT:
+                case KEYCODE_ALT_LEFT: /* bash doesn't do it */
                         ctrl_left();
                         break;
                 case KEYCODE_CTRL_RIGHT:
+                case KEYCODE_ALT_RIGHT: /* bash doesn't do it */
                         ctrl_right();
                         break;
                 case KEYCODE_HOME: