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

Commit 38b572c9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Improve error message of libmodprobe"

parents fe7a3dae db15b6f9

libmodprobe/libmodprobe.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -230,7 +230,7 @@ void Modprobe::ParseCfg(const std::string& cfg, 
    }

    }





    std::vector<std::string> lines = android::base::Split(cfg_contents, "\n");

    std::vector<std::string> lines = android::base::Split(cfg_contents, "\n");

    for (const std::string line : lines) {

    for (const auto& line : lines) {

        if (line.empty() || line[0] == '#') {

        if (line.empty() || line[0] == '#') {

            continue;

            continue;

        }

        }
@@ -421,7 +421,8 @@ bool Modprobe::LoadWithAliases(const std::string& module_name, bool strict, 
    }

    }





    if (strict && !module_loaded) {

    if (strict && !module_loaded) {

        LOG(ERROR) << "LoadWithAliases was unable to load " << module_name;

        LOG(ERROR) << "LoadWithAliases was unable to load " << module_name

                   << ", tried: " << android::base::Join(modules_to_load, ", ");

        return false;

        return false;

    }

    }

    return true;

    return true;

libmodprobe/libmodprobe_ext.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ bool Modprobe::Rmmod(const std::string& module_name) { 
}

}





bool Modprobe::ModuleExists(const std::string& module_name) {

bool Modprobe::ModuleExists(const std::string& module_name) {

    struct stat fileStat;

    struct stat fileStat {};

    if (blocklist_enabled && module_blocklist_.count(module_name)) {

    if (blocklist_enabled && module_blocklist_.count(module_name)) {

        LOG(INFO) << "module " << module_name << " is blocklisted";

        LOG(INFO) << "module " << module_name << " is blocklisted";

        return false;

        return false;
@@ -95,7 +95,7 @@ bool Modprobe::ModuleExists(const std::string& module_name) { 
        return false;

        return false;

    }

    }

    if (stat(deps.front().c_str(), &fileStat)) {

    if (stat(deps.front().c_str(), &fileStat)) {

        LOG(INFO) << "module " << module_name << " does not exist";

        PLOG(INFO) << "module " << module_name << " can't be loaded; can't access " << deps.front();

        return false;

        return false;

    }

    }

    if (!S_ISREG(fileStat.st_mode)) {

    if (!S_ISREG(fileStat.st_mode)) {