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

Commit d49c3297 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

am 07148ea2: Merge "Make mkdirAndChown do what it claims to do"

automerge: 7474c77c

* commit '7474c77c':
  Make mkdirAndChown do what it claims to do
parents 2280b5ec 7474c77c
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -279,12 +279,12 @@ static int mkdirAndChown(const char *path, mode_t mode, uid_t uid, gid_t gid)
{
    int ret;

    ret = mkdir(path, 0750);
    ret = mkdir(path, mode);
    if (ret < 0 && errno != EEXIST) {
        return -errno;
    }

    ret = chown(path, AID_SYSTEM, AID_SYSTEM);
    ret = chown(path, uid, gid);
    if (ret < 0) {
        ret = -errno;
        rmdir(path);