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

Commit e92372ba authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of 2237ca4c to jb-mr1-dev 

Change-Id: I04982ff2b092274b940a621b238c2246349aa85e
parents d7f78e88 2237ca4c

sdcard/sdcard.c

+17 −5
Original line number Diff line number Diff line
@@ -1314,11 +1314,23 @@ int main(int argc, char **argv) 
            source_path = arg;

        else if (!dest_path)

            dest_path = arg;

        else if (!uid)

            uid = strtoul(arg, 0, 10);

        else if (!gid)

            gid = strtoul(arg, 0, 10);

        else {

        else if (!uid) {

            char* endptr = NULL;

            errno = 0;

            uid = strtoul(arg, &endptr, 10);

            if (*endptr != '\0' || errno != 0) {

                ERROR("Invalid uid");

                return usage();

            }

        } else if (!gid) {

            char* endptr = NULL;

            errno = 0;

            gid = strtoul(arg, &endptr, 10);

            if (*endptr != '\0' || errno != 0) {

                ERROR("Invalid gid");

                return usage();

            }

        } else {

            ERROR("too many arguments\n");

            return usage();

        }