diff options
| -rw-r--r-- | find.cc | 16 | ||||
| -rw-r--r-- | testcase/find_command.mk | 1 |
2 files changed, 11 insertions, 6 deletions
@@ -526,12 +526,16 @@ class FindCommandParser { while (true) { if (!GetNextToken(&tok)) return NULL; - if (tok != "-and" && tok != "-a") { - UngetToken(tok); - return c.release(); + if (tok == "-and" || tok == "-a") { + if (!GetNextToken(&tok) || tok.empty()) + return NULL; + } else { + if (tok != "-not" && tok != "\\!" && tok != "\\(" && tok != "-name" && + tok != "-type") { + UngetToken(tok); + return c.release(); + } } - if (!GetNextToken(&tok) || tok.empty()) - return NULL; unique_ptr<FindCond> r(ParseFact(tok)); if (!r.get()) { return NULL; @@ -562,7 +566,7 @@ class FindCommandParser { } // <expr> ::= <term> {<or> <term>} - // <term> ::= <fact> {<and> <fact>} + // <term> ::= <fact> {[<and>] <fact>} // <fact> ::= <not> <fact> | '\(' <expr> '\)' | <pred> // <not> ::= '-not' | '\!' // <and> ::= '-and' | '-a' diff --git a/testcase/find_command.mk b/testcase/find_command.mk index c3e8a07..b714879 100644 --- a/testcase/find_command.mk +++ b/testcase/find_command.mk @@ -67,6 +67,7 @@ endif $(call run_find, find testdir -name "file1") $(call run_find, find testdir -name "file1") $(call run_find, find testdir -name "*1") + $(call run_find, find testdir -name "*1" -name "file*") $(call run_find, find testdir -name "*1" -and -name "file*") $(call run_find, find testdir -name "*1" -or -name "file*") $(call run_find, find testdir -name "*1" -or -type f) |