summaryrefslogtreecommitdiffstats
path: root/otautil
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2018-04-28 18:59:22 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-04-28 18:59:22 +0200
commitaf01117405a1539ce3de28525a0001861a1f6da1 (patch)
treebb50d5a59260de3dfe5784a97868df216fa18436 /otautil
parentMerge "recovery: Revoke (most of) short options." am: 3de3756081 am: 29c9690864 (diff)
parentMerge "Merge libmounts into libotautil." am: 686353215f (diff)
downloadandroid_bootable_recovery-af01117405a1539ce3de28525a0001861a1f6da1.tar
android_bootable_recovery-af01117405a1539ce3de28525a0001861a1f6da1.tar.gz
android_bootable_recovery-af01117405a1539ce3de28525a0001861a1f6da1.tar.bz2
android_bootable_recovery-af01117405a1539ce3de28525a0001861a1f6da1.tar.lz
android_bootable_recovery-af01117405a1539ce3de28525a0001861a1f6da1.tar.xz
android_bootable_recovery-af01117405a1539ce3de28525a0001861a1f6da1.tar.zst
android_bootable_recovery-af01117405a1539ce3de28525a0001861a1f6da1.zip
Diffstat (limited to 'otautil')
-rw-r--r--otautil/Android.bp9
-rw-r--r--otautil/include/otautil/mounts.h25
-rw-r--r--otautil/mounts.cpp82
3 files changed, 116 insertions, 0 deletions
diff --git a/otautil/Android.bp b/otautil/Android.bp
index 958f98b76..45d119cb5 100644
--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -21,6 +21,7 @@ cc_library_static {
"SysUtil.cpp",
"DirUtil.cpp",
"ThermalUtil.cpp",
+ "mounts.cpp",
"paths.cpp",
"rangeset.cpp",
],
@@ -39,4 +40,12 @@ cc_library_static {
export_include_dirs: [
"include",
],
+
+ target: {
+ darwin: {
+ exclude_srcs: [
+ "mounts.cpp",
+ ],
+ },
+ },
}
diff --git a/otautil/include/otautil/mounts.h b/otautil/include/otautil/mounts.h
new file mode 100644
index 000000000..6786c8d2e
--- /dev/null
+++ b/otautil/include/otautil/mounts.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+struct MountedVolume;
+
+bool scan_mounted_volumes();
+
+MountedVolume* find_mounted_volume_by_mount_point(const char* mount_point);
+
+int unmount_mounted_volume(MountedVolume* volume);
diff --git a/otautil/mounts.cpp b/otautil/mounts.cpp
new file mode 100644
index 000000000..951311bf3
--- /dev/null
+++ b/otautil/mounts.cpp
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "otautil/mounts.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <mntent.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mount.h>
+
+#include <string>
+#include <vector>
+
+#include <android-base/logging.h>
+
+struct MountedVolume {
+ std::string device;
+ std::string mount_point;
+ std::string filesystem;
+ std::string flags;
+};
+
+static std::vector<MountedVolume*> g_mounts_state;
+
+bool scan_mounted_volumes() {
+ for (size_t i = 0; i < g_mounts_state.size(); ++i) {
+ delete g_mounts_state[i];
+ }
+ g_mounts_state.clear();
+
+ // Open and read mount table entries.
+ FILE* fp = setmntent("/proc/mounts", "re");
+ if (fp == NULL) {
+ return false;
+ }
+ mntent* e;
+ while ((e = getmntent(fp)) != NULL) {
+ MountedVolume* v = new MountedVolume;
+ v->device = e->mnt_fsname;
+ v->mount_point = e->mnt_dir;
+ v->filesystem = e->mnt_type;
+ v->flags = e->mnt_opts;
+ g_mounts_state.push_back(v);
+ }
+ endmntent(fp);
+ return true;
+}
+
+MountedVolume* find_mounted_volume_by_mount_point(const char* mount_point) {
+ for (size_t i = 0; i < g_mounts_state.size(); ++i) {
+ if (g_mounts_state[i]->mount_point == mount_point) return g_mounts_state[i];
+ }
+ return nullptr;
+}
+
+int unmount_mounted_volume(MountedVolume* volume) {
+ // Intentionally pass the empty string to umount if the caller tries to unmount a volume they
+ // already unmounted using this function.
+ std::string mount_point = volume->mount_point;
+ volume->mount_point.clear();
+ int result = umount(mount_point.c_str());
+ if (result == -1) {
+ PLOG(WARNING) << "Failed to umount " << mount_point;
+ }
+ return result;
+}