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

Commit 9f0e6493 authored by Colin Cross's avatar Colin Cross
Browse files

Support building diagnose_usb against musl 

Support building diagnose_usb against musl by reimplementing
group_member, which doesn't exist in musl and isn't used anywhere
else in the tree.

Bug: 190084016
Test: m USE_HOST_MUSL=true host-native
Change-Id: Id0fe51d0bd8677561d0bbdb72d3b1a956127a11c
parent 5186681f

diagnose_usb/diagnose_usb.cpp

+21 −3
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ 
#include <errno.h>

#include <unistd.h>



#include <algorithm>

#include <string>

#include <vector>



#include <android-base/stringprintf.h>
@@ -45,9 +47,25 @@ static std::string GetUdevProblem() { 
        return "";

    }



    // getgroups(2) indicates that the GNU group_member(3) may not check the egid so we check it

    // additionally just to be sure.

    if (group_member(plugdev_group->gr_gid) || getegid() == plugdev_group->gr_gid) {

    int ngroups = getgroups(0, nullptr);

    if (ngroups < 0) {

        perror("failed to get groups list size");

        return "";

    }



    std::vector<gid_t> groups(ngroups);

    ngroups = getgroups(groups.size(), groups.data());

    if (ngroups < 0) {

        perror("failed to get groups list");

        return "";

    }



    groups.resize(ngroups);



    // getgroups(2) indicates that the egid may not be included so we check it additionally just

    // to be sure.

    if (std::find(groups.begin(), groups.end(), plugdev_group->gr_gid) != groups.end() ||

        getegid() == plugdev_group->gr_gid) {

        // The user is in plugdev so the problem is likely with the udev rules.

        return "missing udev rules? user is in the plugdev group";

    }