d4f3db942
Denys Vlasenko
2016-10-30
Subject
ash: if using libc glob(), skip it if no metachars are in word
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/ash.c+15 -0
| @@ -7047,6 +7047,21 @@ expandmeta(struct strlist *str /*, int flag*/) | |
| if (fflag) | |
| goto nometa; | |
| + | |
| + | /* Avoid glob() (and thus, stat() et al) for words like "echo" */ |
| + | p = str->text; |
| + | while (*p) { |
| + | if (*p == '*') |
| + | goto need_glob; |
| + | if (*p == '?') |
| + | goto need_glob; |
| + | if (*p == '[') |
| + | goto need_glob; |
| + | p++; |
| + | } |
| + | goto nometa; |
| + | |
| + | need_glob: |
| INT_OFF; | |
| p = preglob(str->text, RMESCAPE_ALLOC | RMESCAPE_HEAP); | |
| // GLOB_NOMAGIC (GNU): if no *?[ chars in pattern, return it even if no match | |