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

Commit 3c1b581f authored by Yi-Yo Chiang's avatar Yi-Yo Chiang
Browse files

Replace strtok_r() with C++-style android::base::Tokenize() 

android::base::Tokenize() is like android::base::Split() but ignores
empty tokens. Think strtok_r() and strsep().
C++-ify parsing code by replacing strtok_r() with Tokenize(), which
results in more concise and readable code.

Bug: 204056804
Test: atest CtsFsMgrTestCases
Change-Id: Ic1dd0eb97ef9ce6786dc2bf65cdee22a40d813e7
parent a44f269e

fs_mgr/fs_mgr_fstab.cpp

+13 −32
Original line number Diff line number Diff line
@@ -526,11 +526,11 @@ bool EraseFstabEntry(Fstab* fstab, const std::string& mount_point) { 
}  // namespace



bool ReadFstabFromFp(FILE* fstab_file, bool proc_mounts, Fstab* fstab_out) {

    const int expected_fields = proc_mounts ? 4 : 5;

    ssize_t len;

    size_t alloc_len = 0;

    char *line = NULL;

    const char *delim = " \t";

    char *save_ptr, *p;

    char* p;

    Fstab fstab;



    while ((len = getline(&line, &alloc_len, fstab_file)) != -1) {
@@ -548,42 +548,23 @@ bool ReadFstabFromFp(FILE* fstab_file, bool proc_mounts, Fstab* fstab_out) { 
        if (*p == '#' || *p == '\0')

            continue;



        FstabEntry entry;



        if (!(p = strtok_r(line, delim, &save_ptr))) {

            LERROR << "Error parsing mount source";

            goto err;

        }

        entry.blk_device = p;



        if (!(p = strtok_r(NULL, delim, &save_ptr))) {

            LERROR << "Error parsing mount_point";

            goto err;

        }

        entry.mount_point = p;



        if (!(p = strtok_r(NULL, delim, &save_ptr))) {

            LERROR << "Error parsing fs_type";

        auto fields = android::base::Tokenize(line, " \t");

        if (fields.size() < expected_fields) {

            LERROR << "Error parsing fstab: expected " << expected_fields << " fields, got "

                   << fields.size();

            goto err;

        }

        entry.fs_type = p;



        if (!(p = strtok_r(NULL, delim, &save_ptr))) {

            LERROR << "Error parsing mount_flags";

            goto err;

        }

        FstabEntry entry;

        auto it = fields.begin();



        ParseMountFlags(p, &entry);

        entry.blk_device = std::move(*it++);

        entry.mount_point = std::move(*it++);

        entry.fs_type = std::move(*it++);

        ParseMountFlags(std::move(*it++), &entry);



        // For /proc/mounts, ignore everything after mnt_freq and mnt_passno

        if (proc_mounts) {

            p += strlen(p);

        } else if (!(p = strtok_r(NULL, delim, &save_ptr))) {

            LERROR << "Error parsing fs_mgr_options";

            goto err;

        }



        if (!ParseFsMgrFlags(p, &entry)) {

        if (!proc_mounts && !ParseFsMgrFlags(std::move(*it++), &entry)) {

            LERROR << "Error parsing fs_mgr_flags";

            goto err;

        }