This commit is contained in:
Tim Waugh 2007-07-05 09:16:18 +00:00
parent b1304129de
commit 8515da7243

View File

@ -1,11 +1,11 @@
--- bash-3.2/execute_cmd.c.cond_rmatch 2007-01-19 16:29:03.000000000 +0000
+++ bash-3.2/execute_cmd.c 2007-01-19 16:29:25.000000000 +0000
--- bash-3.2/execute_cmd.c.cond-rmatch 2007-07-05 10:07:27.000000000 +0100
+++ bash-3.2/execute_cmd.c 2007-07-05 10:09:02.000000000 +0100
@@ -2560,7 +2560,7 @@
arg1 = cond_expand_word (cond->left->op, 0);
if (arg1 == 0)
arg1 = nullstr;
- arg2 = cond_expand_word (cond->right->op, patmatch||rmatch);
+ arg2 = cond_expand_word (cond->right->op, patmatch);
- arg2 = cond_expand_word (cond->right->op, rmatch ? 2 : (patmatch ? 1 : 0));
+ arg2 = cond_expand_word (cond->right->op, patmatch ? 1 : 0);
if (arg2 == 0)
arg2 = nullstr;