89bca2715
Denis Vlasenko
2007-06-08
Subject
test: recognize /path/to/[ case too
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/test.c+19 -14
| @@ -182,21 +182,26 @@ static void initialize_group_array(void); | |
| int bb_test(int argc, char **argv) | |
| { | |
| int res; | |
| - | |
| - | if (LONE_CHAR(argv[0], '[')) { |
| - | --argc; |
| - | if (NOT_LONE_CHAR(argv[argc], ']')) { |
| - | bb_error_msg("missing ]"); |
| - | return 2; |
| - | } |
| - | argv[argc] = NULL; |
| - | } else if (strcmp(argv[0], "[[") == 0) { |
| - | --argc; |
| - | if (strcmp(argv[argc], "]]")) { |
| - | bb_error_msg("missing ]]"); |
| - | return 2; |
| + | char *arg0; |
| + | |
| + | arg0 = strrchr(argv[0], '/'); |
| + | if (!arg0++) arg0 = argv[0]; |
| + | if (arg0[0] == '[') { |
| + | if (!arg0[1]) { /* "[" ? */ |
| + | --argc; |
| + | if (NOT_LONE_CHAR(argv[argc], ']')) { |
| + | bb_error_msg("missing ]"); |
| + | return 2; |
| + | } |
| + | argv[argc] = NULL; |
| + | } else if (LONE_CHAR(arg0, '[') == 0) { /* "[[" ? */ |
| + | --argc; |
| + | if (strcmp(argv[argc], "]]") != 0) { |
| + | bb_error_msg("missing ]]"); |
| + | return 2; |
| + | } |
| + | argv[argc] = NULL; |
| } | |
| - | argv[argc] = NULL; |
| } | |
| res = setjmp(leaving); | |