commit e5a4a686d86d7c9719030810dd0c3455b50dc2bc
author Treehugger Robot <treehugger-gerrit@google.com> Sat Nov 17 00:54:39 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 17 00:54:39 2018 +0000
tree 056c4f8a2bc7ef45c6a94133ab856897de5b7175
parent 86ddb26af7fa7da8e818a10a3970dc6af6ced4ea
parent c293de38c296e317208e498898ca9c47e035e476

Merge "Don't fail when no glob match"

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 5676f92..6eb65b2 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -1060,7 +1060,8 @@
     // where the APEXes are really mounted at. Otherwise, we will parse the
     // same file twice.
     static constexpr char glob_pattern[] = "/apex/*@*/etc/*.rc";
-    if (glob(glob_pattern, GLOB_MARK, nullptr, &glob_result) != 0) {
+    const int ret = glob(glob_pattern, GLOB_MARK, nullptr, &glob_result);
+    if (ret != 0 && ret != GLOB_NOMATCH) {
         globfree(&glob_result);
         return Error() << "glob pattern '" << glob_pattern << "' failed";
     }