dmbcs/i-bash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bash-4.4 patch 9

Browse source
This commit is contained in:
Chet Ramey 2017-01-20 15:38:29 -05:00
commit e59fb114e9
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/readline/history.c
View file

@ -279,6 +279,7 @@ add_history (string)
const char *string; const char *string;
{ {
HIST_ENTRY *temp; HIST_ENTRY *temp;
int new_length;
if (history_stifled && (history_length == history_max_entries)) if (history_stifled && (history_length == history_max_entries))
{ {
@ -295,13 +296,9 @@ add_history (string)
/* Copy the rest of the entries, moving down one slot. Copy includes /* Copy the rest of the entries, moving down one slot. Copy includes
trailing NULL. */ trailing NULL. */
#if 0
for (i = 0; i < history_length; i++)
the_history[i] = the_history[i + 1];
#else
memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *)); memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *));
#endif
new_length = history_length;
history_base++; history_base++;
} }
else else
@ -315,7 +312,7 @@ add_history (string)
else else
history_size = DEFAULT_HISTORY_INITIAL_SIZE; history_size = DEFAULT_HISTORY_INITIAL_SIZE;
the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *)); the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *));
history_length = 1; new_length = 1;
} }
else else
{ {
@ -325,14 +322,15 @@ add_history (string)
the_history = (HIST_ENTRY **) the_history = (HIST_ENTRY **)
xrealloc (the_history, history_size * sizeof (HIST_ENTRY *)); xrealloc (the_history, history_size * sizeof (HIST_ENTRY *));
} }
history_length++; new_length = history_length + 1;
} }
} }
temp = alloc_history_entry ((char *)string, hist_inittime ()); temp = alloc_history_entry ((char *)string, hist_inittime ());
the_history[history_length] = (HIST_ENTRY *)NULL; the_history[new_length] = (HIST_ENTRY *)NULL;
the_history[history_length - 1] = temp; the_history[new_length - 1] = temp;
history_length = new_length;
} }
/* Change the time stamp of the most recent history entry to STRING. */ /* Change the time stamp of the most recent history entry to STRING. */

2
patchlevel.h
View file

@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 8 #define PATCHLEVEL 9
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */