From 7aaa661d31d0a6b12f5efab1f2b9d1729efca308 Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Tue, 22 Nov 2011 20:00:53 -0500 Subject: [PATCH] Bash-4.2 patch 9 --- builtins/fc.def | 14 +++++++++++--- patchlevel.h | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/builtins/fc.def b/builtins/fc.def index 257029d..9b298cb 100644 --- a/builtins/fc.def +++ b/builtins/fc.def @@ -304,7 +304,7 @@ fc_builtin (list) last_hist = i - rh - hist_last_line_added; /* XXX */ - if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0) + if (i == last_hist && hlist[last_hist] == 0) while (last_hist >= 0 && hlist[last_hist] == 0) last_hist--; if (last_hist < 0) @@ -475,7 +475,7 @@ fc_gethnum (command, hlist) HIST_ENTRY **hlist; { int sign, n, clen, rh; - register int i, j; + register int i, j, last_hist; register char *s; sign = 1; @@ -495,7 +495,15 @@ fc_gethnum (command, hlist) has been enabled (interactive or not) should use it in the last_hist calculation as if it were on. */ rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); - i -= rh + hist_last_line_added; + last_hist = i - rh - hist_last_line_added; + + if (i == last_hist && hlist[last_hist] == 0) + while (last_hist >= 0 && hlist[last_hist] == 0) + last_hist--; + if (last_hist < 0) + return (-1); + + i = last_hist; /* No specification defaults to most recent command. */ if (command == NULL) diff --git a/patchlevel.h b/patchlevel.h index 2352c1c..e7410c4 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -25,6 +25,6 @@ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ -#define PATCHLEVEL 8 +#define PATCHLEVEL 9 #endif /* _PATCHLEVEL_H_ */ -- 2.7.4