Use hasmntopt(3) rather than reinventing the wheel.
Bug: N/A
Test: "power off" still works
Change-Id: I11d3dc22f98ac71608c9929a3fd43319c787d49e
diff --git a/libcutils/android_reboot.c b/libcutils/android_reboot.c
index af7e189..159a9d4 100644
--- a/libcutils/android_reboot.c
+++ b/libcutils/android_reboot.c
@@ -42,24 +42,6 @@
struct mntent entry;
} mntent_list;
-static bool has_mount_option(const char* opts, const char* opt_to_find)
-{
- bool ret = false;
- char* copy = NULL;
- char* opt;
- char* rem;
-
- while ((opt = strtok_r(copy ? NULL : (copy = strdup(opts)), ",", &rem))) {
- if (!strcmp(opt, opt_to_find)) {
- ret = true;
- break;
- }
- }
-
- free(copy);
- return ret;
-}
-
static bool is_block_device(const char* fsname)
{
return !strncmp(fsname, "/dev/block", 10);
@@ -78,8 +60,7 @@
return;
}
while ((mentry = getmntent(fp)) != NULL) {
- if (is_block_device(mentry->mnt_fsname) &&
- has_mount_option(mentry->mnt_opts, "rw")) {
+ if (is_block_device(mentry->mnt_fsname) && hasmntopt(mentry, "rw")) {
mntent_list* item = (mntent_list*)calloc(1, sizeof(mntent_list));
item->entry = *mentry;
item->entry.mnt_fsname = strdup(mentry->mnt_fsname);
@@ -170,8 +151,7 @@
goto out;
}
while ((mentry = getmntent(fp)) != NULL) {
- if (!is_block_device(mentry->mnt_fsname) ||
- !has_mount_option(mentry->mnt_opts, "ro")) {
+ if (!is_block_device(mentry->mnt_fsname) || !hasmntopt(mentry, "ro")) {
continue;
}
mntent_list* item = find_item(&rw_entries, mentry->mnt_fsname);