2009-12-27 11:22:38 +00:00
|
|
|
diff -up bash-4.1-rc1/execute_cmd.c.cond_rmatch bash-4.1-rc1/execute_cmd.c
|
|
|
|
--- bash-4.1-rc1/execute_cmd.c.cond_rmatch 2009-12-26 22:49:09.000000000 +0100
|
|
|
|
+++ bash-4.1-rc1/execute_cmd.c 2009-12-26 22:54:11.000000000 +0100
|
|
|
|
@@ -3278,8 +3278,7 @@ execute_cond_node (cond)
|
2007-01-19 16:35:30 +00:00
|
|
|
arg1 = nullstr;
|
2009-12-27 11:22:38 +00:00
|
|
|
if (ignore)
|
|
|
|
comsub_ignore_return++;
|
2008-06-05 15:43:36 +00:00
|
|
|
- arg2 = cond_expand_word (cond->right->op,
|
|
|
|
- (rmatch && shell_compatibility_level > 31) ? 2 : (patmatch ? 1 : 0));
|
2007-07-05 09:16:18 +00:00
|
|
|
+ arg2 = cond_expand_word (cond->right->op, patmatch ? 1 : 0);
|
2009-12-27 11:22:38 +00:00
|
|
|
if (ignore)
|
|
|
|
comsub_ignore_return--;
|
2007-01-19 16:35:30 +00:00
|
|
|
if (arg2 == 0)
|