Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f169f72f authored by Jiyong Park's avatar Jiyong Park
Browse files

Don't fail when no glob match 

There can be no match when there is no APEX installed or no APEX is
providing *.rc file. Don't fail in that case.

Bug: 117403679
Test: m apex.test; m; device is is bootable

Change-Id: Ib1c607ee2c156dc236da1df7df0c6663e8d899b2
parent a59ecfd9

init/builtins.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1060,7 +1060,8 @@ static Result<Success> do_parse_apex_configs(const BuiltinArguments& args) { 
    // 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";

    }