From 9ba3434aa5434e509300a3722b0479fd30480b44 Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Tue, 4 May 2021 14:26:34 -0400 Subject: [PATCH] Readline-8.1 patch 1: fix version comparisons in startup files --- bind.c | 15 ++++++++------- patchlevel | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bind.c b/bind.c index 87596dc..7610378 100644 --- a/bind.c +++ b/bind.c @@ -1234,7 +1234,7 @@ parser_if (char *args) #endif /* VI_MODE */ else if (_rl_strnicmp (args, "version", 7) == 0) { - int rlversion, versionarg, op, previ, major, minor; + int rlversion, versionarg, op, previ, major, minor, opresult; _rl_parsing_conditionalized_out = 1; rlversion = RL_VERSION_MAJOR*10 + RL_VERSION_MINOR; @@ -1294,24 +1294,25 @@ parser_if (char *args) switch (op) { case OP_EQ: - _rl_parsing_conditionalized_out = rlversion == versionarg; + opresult = rlversion == versionarg; break; case OP_NE: - _rl_parsing_conditionalized_out = rlversion != versionarg; + opresult = rlversion != versionarg; break; case OP_GT: - _rl_parsing_conditionalized_out = rlversion > versionarg; + opresult = rlversion > versionarg; break; case OP_GE: - _rl_parsing_conditionalized_out = rlversion >= versionarg; + opresult = rlversion >= versionarg; break; case OP_LT: - _rl_parsing_conditionalized_out = rlversion < versionarg; + opresult = rlversion < versionarg; break; case OP_LE: - _rl_parsing_conditionalized_out = rlversion <= versionarg; + opresult = rlversion <= versionarg; break; } + _rl_parsing_conditionalized_out = 1 - opresult; } /* Check to see if the first word in ARGS is the same as the value stored in rl_readline_name. */ diff --git a/patchlevel b/patchlevel index d8c9df7..fdf4740 100644 --- a/patchlevel +++ b/patchlevel @@ -1,3 +1,3 @@ # Do not edit -- exists only for use by patch -0 +1 -- 2.31.1