roots.cpp: Reformatting the file.
Mostly cosmetic changes. Removed the use of errno, and added constness to a few pointers. format_volume() and exec_cmd() will be cleaned up in a separate CL. Test: mmma -j bootable/recovery Change-Id: Ia12ce25a91c0bdd0e319f6da02ce1dc8377f265d
This commit is contained in:
Tao Bao
parent
6eb23c594c
commit
bb10e58eb1
1 changed files with 99 additions and 107 deletions
206
roots.cpp
206
roots.cpp
|
|
@ -16,147 +16,139 @@
|
|||
|
||||
#include "roots.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <ctype.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/mount.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
#include <ctype.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include <android-base/logging.h>
|
||||
#include <android-base/properties.h>
|
||||
#include <android-base/stringprintf.h>
|
||||
#include <cryptfs.h>
|
||||
#include <ext4_utils/wipe.h>
|
||||
#include <fs_mgr.h>
|
||||
|
||||
#include "common.h"
|
||||
#include "mounts.h"
|
||||
#include "cryptfs.h"
|
||||
|
||||
static struct fstab *fstab = NULL;
|
||||
static struct fstab* fstab = nullptr;
|
||||
|
||||
extern struct selabel_handle *sehandle;
|
||||
extern struct selabel_handle* sehandle;
|
||||
|
||||
void load_volume_table()
|
||||
{
|
||||
int i;
|
||||
int ret;
|
||||
void load_volume_table() {
|
||||
fstab = fs_mgr_read_fstab_default();
|
||||
if (!fstab) {
|
||||
LOG(ERROR) << "Failed to read default fstab";
|
||||
return;
|
||||
}
|
||||
|
||||
fstab = fs_mgr_read_fstab_default();
|
||||
if (!fstab) {
|
||||
LOG(ERROR) << "failed to read default fstab";
|
||||
return;
|
||||
}
|
||||
int ret = fs_mgr_add_entry(fstab, "/tmp", "ramdisk", "ramdisk");
|
||||
if (ret == -1) {
|
||||
LOG(ERROR) << "Failed to add /tmp entry to fstab";
|
||||
fs_mgr_free_fstab(fstab);
|
||||
fstab = nullptr;
|
||||
return;
|
||||
}
|
||||
|
||||
ret = fs_mgr_add_entry(fstab, "/tmp", "ramdisk", "ramdisk");
|
||||
if (ret < 0 ) {
|
||||
LOG(ERROR) << "failed to add /tmp entry to fstab";
|
||||
fs_mgr_free_fstab(fstab);
|
||||
fstab = NULL;
|
||||
return;
|
||||
}
|
||||
|
||||
printf("recovery filesystem table\n");
|
||||
printf("=========================\n");
|
||||
for (i = 0; i < fstab->num_entries; ++i) {
|
||||
Volume* v = &fstab->recs[i];
|
||||
printf(" %d %s %s %s %lld\n", i, v->mount_point, v->fs_type,
|
||||
v->blk_device, v->length);
|
||||
}
|
||||
printf("\n");
|
||||
printf("recovery filesystem table\n");
|
||||
printf("=========================\n");
|
||||
for (int i = 0; i < fstab->num_entries; ++i) {
|
||||
const Volume* v = &fstab->recs[i];
|
||||
printf(" %d %s %s %s %lld\n", i, v->mount_point, v->fs_type, v->blk_device, v->length);
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
Volume* volume_for_path(const char* path) {
|
||||
return fs_mgr_get_entry_for_mount_point(fstab, path);
|
||||
return fs_mgr_get_entry_for_mount_point(fstab, path);
|
||||
}
|
||||
|
||||
// Mount the volume specified by path at the given mount_point.
|
||||
int ensure_path_mounted_at(const char* path, const char* mount_point) {
|
||||
Volume* v = volume_for_path(path);
|
||||
if (v == NULL) {
|
||||
LOG(ERROR) << "unknown volume for path [" << path << "]";
|
||||
return -1;
|
||||
}
|
||||
if (strcmp(v->fs_type, "ramdisk") == 0) {
|
||||
// the ramdisk is always mounted.
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!scan_mounted_volumes()) {
|
||||
LOG(ERROR) << "failed to scan mounted volumes";
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!mount_point) {
|
||||
mount_point = v->mount_point;
|
||||
}
|
||||
|
||||
MountedVolume* mv = find_mounted_volume_by_mount_point(mount_point);
|
||||
if (mv) {
|
||||
// volume is already mounted
|
||||
return 0;
|
||||
}
|
||||
|
||||
mkdir(mount_point, 0755); // in case it doesn't already exist
|
||||
|
||||
if (strcmp(v->fs_type, "ext4") == 0 ||
|
||||
strcmp(v->fs_type, "squashfs") == 0 ||
|
||||
strcmp(v->fs_type, "vfat") == 0) {
|
||||
int result = mount(v->blk_device, mount_point, v->fs_type, v->flags, v->fs_options);
|
||||
if (result == -1 && fs_mgr_is_formattable(v)) {
|
||||
LOG(ERROR) << "failed to mount " << mount_point << " (" << strerror(errno)
|
||||
<< ") , formatting.....";
|
||||
bool crypt_footer = fs_mgr_is_encryptable(v) && !strcmp(v->key_loc, "footer");
|
||||
if (fs_mgr_do_format(v, crypt_footer) == 0) {
|
||||
result = mount(v->blk_device, mount_point, v->fs_type, v->flags, v->fs_options);
|
||||
} else {
|
||||
PLOG(ERROR) << "failed to format " << mount_point;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
if (result == -1) {
|
||||
PLOG(ERROR) << "failed to mount " << mount_point;
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
LOG(ERROR) << "unknown fs_type \"" << v->fs_type << "\" for " << mount_point;
|
||||
Volume* v = volume_for_path(path);
|
||||
if (v == nullptr) {
|
||||
LOG(ERROR) << "unknown volume for path [" << path << "]";
|
||||
return -1;
|
||||
}
|
||||
if (strcmp(v->fs_type, "ramdisk") == 0) {
|
||||
// The ramdisk is always mounted.
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!scan_mounted_volumes()) {
|
||||
LOG(ERROR) << "Failed to scan mounted volumes";
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!mount_point) {
|
||||
mount_point = v->mount_point;
|
||||
}
|
||||
|
||||
const MountedVolume* mv = find_mounted_volume_by_mount_point(mount_point);
|
||||
if (mv != nullptr) {
|
||||
// Volume is already mounted.
|
||||
return 0;
|
||||
}
|
||||
|
||||
mkdir(mount_point, 0755); // in case it doesn't already exist
|
||||
|
||||
if (strcmp(v->fs_type, "ext4") == 0 || strcmp(v->fs_type, "squashfs") == 0 ||
|
||||
strcmp(v->fs_type, "vfat") == 0) {
|
||||
int result = mount(v->blk_device, mount_point, v->fs_type, v->flags, v->fs_options);
|
||||
if (result == -1 && fs_mgr_is_formattable(v)) {
|
||||
PLOG(ERROR) << "Failed to mount " << mount_point << "; formatting";
|
||||
bool crypt_footer = fs_mgr_is_encryptable(v) && !strcmp(v->key_loc, "footer");
|
||||
if (fs_mgr_do_format(v, crypt_footer) == 0) {
|
||||
result = mount(v->blk_device, mount_point, v->fs_type, v->flags, v->fs_options);
|
||||
} else {
|
||||
PLOG(ERROR) << "Failed to format " << mount_point;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
if (result == -1) {
|
||||
PLOG(ERROR) << "Failed to mount " << mount_point;
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
LOG(ERROR) << "unknown fs_type \"" << v->fs_type << "\" for " << mount_point;
|
||||
return -1;
|
||||
}
|
||||
|
||||
int ensure_path_mounted(const char* path) {
|
||||
// Mount at the default mount point.
|
||||
return ensure_path_mounted_at(path, nullptr);
|
||||
// Mount at the default mount point.
|
||||
return ensure_path_mounted_at(path, nullptr);
|
||||
}
|
||||
|
||||
int ensure_path_unmounted(const char* path) {
|
||||
Volume* v = volume_for_path(path);
|
||||
if (v == NULL) {
|
||||
LOG(ERROR) << "unknown volume for path [" << path << "]";
|
||||
return -1;
|
||||
}
|
||||
if (strcmp(v->fs_type, "ramdisk") == 0) {
|
||||
// the ramdisk is always mounted; you can't unmount it.
|
||||
return -1;
|
||||
}
|
||||
const Volume* v = volume_for_path(path);
|
||||
if (v == nullptr) {
|
||||
LOG(ERROR) << "unknown volume for path [" << path << "]";
|
||||
return -1;
|
||||
}
|
||||
if (strcmp(v->fs_type, "ramdisk") == 0) {
|
||||
// The ramdisk is always mounted; you can't unmount it.
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!scan_mounted_volumes()) {
|
||||
LOG(ERROR) << "failed to scan mounted volumes";
|
||||
return -1;
|
||||
}
|
||||
if (!scan_mounted_volumes()) {
|
||||
LOG(ERROR) << "Failed to scan mounted volumes";
|
||||
return -1;
|
||||
}
|
||||
|
||||
MountedVolume* mv = find_mounted_volume_by_mount_point(v->mount_point);
|
||||
if (mv == NULL) {
|
||||
// volume is already unmounted
|
||||
return 0;
|
||||
}
|
||||
MountedVolume* mv = find_mounted_volume_by_mount_point(v->mount_point);
|
||||
if (mv == nullptr) {
|
||||
// Volume is already unmounted.
|
||||
return 0;
|
||||
}
|
||||
|
||||
return unmount_mounted_volume(mv);
|
||||
return unmount_mounted_volume(mv);
|
||||
}
|
||||
|
||||
static int exec_cmd(const char* path, char* const argv[]) {
|
||||
|
|
@ -304,7 +296,7 @@ int format_volume(const char* volume, const char* directory) {
|
|||
}
|
||||
|
||||
int format_volume(const char* volume) {
|
||||
return format_volume(volume, NULL);
|
||||
return format_volume(volume, nullptr);
|
||||
}
|
||||
|
||||
int setup_install_mounts() {
|
||||
|
|
@ -322,12 +314,12 @@ int setup_install_mounts() {
|
|||
|
||||
if (strcmp(v->mount_point, "/tmp") == 0 || strcmp(v->mount_point, "/cache") == 0) {
|
||||
if (ensure_path_mounted(v->mount_point) != 0) {
|
||||
LOG(ERROR) << "failed to mount " << v->mount_point;
|
||||
LOG(ERROR) << "Failed to mount " << v->mount_point;
|
||||
return -1;
|
||||
}
|
||||
} else {
|
||||
if (ensure_path_unmounted(v->mount_point) != 0) {
|
||||
LOG(ERROR) << "failed to unmount " << v->mount_point;
|
||||
LOG(ERROR) << "Failed to unmount " << v->mount_point;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue