commit bash-20140124 snapshot

This commit is contained in:
Chet Ramey
2014-02-04 09:33:06 -05:00
parent 4a2c75c650
commit c61bfbfd13
96 changed files with 12481 additions and 4060 deletions
+10 -6
View File
@@ -3504,7 +3504,9 @@ execute_cond_node (cond)
{
int result, invert, patmatch, rmatch, mflags, ignore;
char *arg1, *arg2;
char *t1, *t2;
#if 0
char *t1, *t2;
#endif
invert = (cond->flags & CMD_INVERT_RETURN);
ignore = (cond->flags & CMD_IGNORE_RETURN);
@@ -3582,13 +3584,15 @@ char *t1, *t2;
#if defined (ARRAY_VARS)
mflags |= SHMAT_SUBEXP;
#endif
#if 0
t1 = strescape(arg1);
t2 = strescape(arg2);
itrace("execute_cond_node: sh_regmatch on `%s' and `%s'", t1, t2);
free(t1);
free(t2);
t1 = strescape(arg1);
t2 = strescape(arg2);
itrace("execute_cond_node: sh_regmatch on `%s' and `%s'", t1, t2);
free(t1);
free(t2);
#endif
result = sh_regmatch (arg1, arg2, mflags);
}
else