vcs.maemo.org Git - busybox-power/blob - debian/patches/hotfixes/busybox-1.20.0-lineedit.patch

   1 --- busybox-1.20.0/libbb/lineedit.c
   2 +++ busybox-1.20.0-lineedit/libbb/lineedit.c
   3 @@ -1352,8 +1352,7 @@ static void load_history(line_input_t *s
   4                 /* fill temp_h[], retaining only last MAX_HISTORY lines */
   5                 memset(temp_h, 0, sizeof(temp_h));
   6                 idx = 0;
   7 -               if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
   8 -                       st_parm->cnt_history_in_file = 0;
   9 +               st_parm->cnt_history_in_file = 0;
  10                 while ((line = xmalloc_fgetline(fp)) != NULL) {
  11                         if (line[0] == '\0') {
  12                                 free(line);
  13 @@ -1361,8 +1360,7 @@ static void load_history(line_input_t *s
  14                         }
  15                         free(temp_h[idx]);
  16                         temp_h[idx] = line;
  17 -                       if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
  18 -                               st_parm->cnt_history_in_file++;
  19 +                       st_parm->cnt_history_in_file++;
  20                         idx++;
  21                         if (idx == st_parm->max_history)
  22                                 idx = 0;