commit bash-20210115 snapshot

This commit is contained in:
Chet Ramey
2021-01-19 17:12:43 -05:00
parent a9cf0031ef
commit 3aec0ec30f
11 changed files with 187 additions and 24 deletions
+8 -7
View File
@@ -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. */