| author | Stefan Teleman <stefan.teleman@oracle.com> |
| Wed, 24 Sep 2014 14:44:19 -0700 | |
| branch | s11u2-sru-backport |
| changeset 3333 | 4af2ab639479 |
| parent 2745 | c2e0dae26655 |
| permissions | -rw-r--r-- |
|
2745
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
- in maybe_append_history, change check for history_lines_this_session |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
so that we append the lines to the file if it's equal to the value |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
returned by where_history(). This means that without this change, |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
the history won't be appended if all the lines in the history list |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
were added in the current session since the last time the history |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
file was read or written. Fixes bug reported by Bruce Korb |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
<[email protected]> |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
|
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
http://lists.gnu.org/archive/html/bug-bash/2010-08/msg00101.html |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
|
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
--- bashhist.c 2009-08-14 12:33:02.000000000 -0700 |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
+++ bashhist.c 2013-08-26 02:05:33.384872000 -0700 |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
@@ -372,7 +372,7 @@ maybe_append_history (filename) |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
struct stat buf; |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
|
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
result = EXECUTION_SUCCESS; |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
- if (history_lines_this_session && (history_lines_this_session < where_history ())) |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
+ if (history_lines_this_session && (history_lines_this_session <= where_history ())) |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
{
|
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
/* If the filename was supplied, then create it if necessary. */ |
|
c2e0dae26655
17013247 BASH env setting does not work on initial login
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
if (stat (filename, &buf) == -1 && errno == ENOENT) |