diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2011-11-21 20:51:19 -0500 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2011-11-21 20:51:19 -0500 |
| commit | 0001803f0b9523c94fa2ede48eaecb047fef4524 (patch) | |
| tree | f334332811e033ff966d94f6268f0629a94304b3 /test.c | |
| parent | 89a92869e56aba4e4cab2d639c00a86f0545c862 (diff) | |
| download | android_external_bash-0001803f0b9523c94fa2ede48eaecb047fef4524.tar.gz android_external_bash-0001803f0b9523c94fa2ede48eaecb047fef4524.tar.bz2 android_external_bash-0001803f0b9523c94fa2ede48eaecb047fef4524.zip | |
Bash-4.1 distribution source
Diffstat (limited to 'test.c')
| -rw-r--r-- | test.c | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -65,8 +65,9 @@ extern int errno; #endif #if !defined (STREQ) -# define STREQ(a, b) ((a)[0] == (b)[0] && strcmp (a, b) == 0) +# define STREQ(a, b) ((a)[0] == (b)[0] && strcmp ((a), (b)) == 0) #endif /* !STREQ */ +#define STRCOLLEQ(a, b) ((a)[0] == (b)[0] && strcoll ((a), (b)) == 0) #if !defined (R_OK) #define R_OK 4 @@ -375,12 +376,16 @@ binary_test (op, arg1, arg2, flags) if (op[0] == '=' && (op[1] == '\0' || (op[1] == '=' && op[2] == '\0'))) return (patmatch ? patcomp (arg1, arg2, EQ) : STREQ (arg1, arg2)); - else if ((op[0] == '>' || op[0] == '<') && op[1] == '\0') - return ((op[0] == '>') ? (strcmp (arg1, arg2) > 0) : (strcmp (arg1, arg2) < 0)); - + { + if (shell_compatibility_level > 40 && flags & TEST_LOCALE) + return ((op[0] == '>') ? (strcoll (arg1, arg2) > 0) : (strcoll (arg1, arg2) < 0)); + else + return ((op[0] == '>') ? (strcmp (arg1, arg2) > 0) : (strcmp (arg1, arg2) < 0)); + } else if (op[0] == '!' && op[1] == '=' && op[2] == '\0') return (patmatch ? patcomp (arg1, arg2, NE) : (STREQ (arg1, arg2) == 0)); + else if (op[2] == 't') { |