tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

roots.cpp: Reformatting the file.

Browse source 
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 2017-07-22 16:30:34 -07:00
parent 6eb23c594c
commit bb10e58eb1
1 changed files with 99 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
roots.cpp
View file

@ -16,55 +16,49 @@
#include "roots.h" #include "roots.h"
#include <errno.h> #include <ctype.h>
#include <fcntl.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include <ctype.h>
#include <fcntl.h>
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android-base/properties.h> #include <android-base/properties.h>
#include <android-base/stringprintf.h> #include <android-base/stringprintf.h>
#include <cryptfs.h>
#include <ext4_utils/wipe.h> #include <ext4_utils/wipe.h>
#include <fs_mgr.h> #include <fs_mgr.h>
#include "common.h" #include "common.h"
#include "mounts.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(); fstab = fs_mgr_read_fstab_default();
if (!fstab) { if (!fstab) {
LOG(ERROR) << "failed to read default fstab"; LOG(ERROR) << "Failed to read default fstab";
return; return;
} }
ret = fs_mgr_add_entry(fstab, "/tmp", "ramdisk", "ramdisk"); int ret = fs_mgr_add_entry(fstab, "/tmp", "ramdisk", "ramdisk");
if (ret < 0 ) { if (ret == -1) {
LOG(ERROR) << "failed to add /tmp entry to fstab"; LOG(ERROR) << "Failed to add /tmp entry to fstab";
fs_mgr_free_fstab(fstab); fs_mgr_free_fstab(fstab);
fstab = NULL; fstab = nullptr;
return; return;
} }
printf("recovery filesystem table\n"); printf("recovery filesystem table\n");
printf("=========================\n"); printf("=========================\n");
for (i = 0; i < fstab->num_entries; ++i) { for (int i = 0; i < fstab->num_entries; ++i) {
Volume* v = &fstab->recs[i]; const Volume* v = &fstab->recs[i];
printf(" %d %s %s %s %lld\n", i, v->mount_point, v->fs_type, printf(" %d %s %s %s %lld\n", i, v->mount_point, v->fs_type, v->blk_device, v->length);
v->blk_device, v->length);
} }
printf("\n"); printf("\n");
} }
@ -76,17 +70,17 @@ Volume* volume_for_path(const char* path) {
// Mount the volume specified by path at the given mount_point. // Mount the volume specified by path at the given mount_point.
int ensure_path_mounted_at(const char* path, const char* mount_point) { int ensure_path_mounted_at(const char* path, const char* mount_point) {
Volume* v = volume_for_path(path); Volume* v = volume_for_path(path);
if (v == NULL) { if (v == nullptr) {
LOG(ERROR) << "unknown volume for path [" << path << "]"; LOG(ERROR) << "unknown volume for path [" << path << "]";
return -1; return -1;
} }
if (strcmp(v->fs_type, "ramdisk") == 0) { if (strcmp(v->fs_type, "ramdisk") == 0) {
// the ramdisk is always mounted. // The ramdisk is always mounted.
return 0; return 0;
} }
if (!scan_mounted_volumes()) { if (!scan_mounted_volumes()) {
LOG(ERROR) << "failed to scan mounted volumes"; LOG(ERROR) << "Failed to scan mounted volumes";
return -1; return -1;
} }
@ -94,32 +88,30 @@ int ensure_path_mounted_at(const char* path, const char* mount_point) {
mount_point = v->mount_point; mount_point = v->mount_point;
} }
MountedVolume* mv = find_mounted_volume_by_mount_point(mount_point); const MountedVolume* mv = find_mounted_volume_by_mount_point(mount_point);
if (mv) { if (mv != nullptr) {
// volume is already mounted // Volume is already mounted.
return 0; return 0;
} }
mkdir(mount_point, 0755); // in case it doesn't already exist mkdir(mount_point, 0755); // in case it doesn't already exist
if (strcmp(v->fs_type, "ext4") == 0 || if (strcmp(v->fs_type, "ext4") == 0 || strcmp(v->fs_type, "squashfs") == 0 ||
strcmp(v->fs_type, "squashfs") == 0 ||
strcmp(v->fs_type, "vfat") == 0) { strcmp(v->fs_type, "vfat") == 0) {
int result = mount(v->blk_device, mount_point, v->fs_type, v->flags, v->fs_options); int result = mount(v->blk_device, mount_point, v->fs_type, v->flags, v->fs_options);
if (result == -1 && fs_mgr_is_formattable(v)) { if (result == -1 && fs_mgr_is_formattable(v)) {
LOG(ERROR) << "failed to mount " << mount_point << " (" << strerror(errno) PLOG(ERROR) << "Failed to mount " << mount_point << "; formatting";
<< ") , formatting.....";
bool crypt_footer = fs_mgr_is_encryptable(v) && !strcmp(v->key_loc, "footer"); bool crypt_footer = fs_mgr_is_encryptable(v) && !strcmp(v->key_loc, "footer");
if (fs_mgr_do_format(v, crypt_footer) == 0) { if (fs_mgr_do_format(v, crypt_footer) == 0) {
result = mount(v->blk_device, mount_point, v->fs_type, v->flags, v->fs_options); result = mount(v->blk_device, mount_point, v->fs_type, v->flags, v->fs_options);
} else { } else {
PLOG(ERROR) << "failed to format " << mount_point; PLOG(ERROR) << "Failed to format " << mount_point;
return -1; return -1;
} }
} }
if (result == -1) { if (result == -1) {
PLOG(ERROR) << "failed to mount " << mount_point; PLOG(ERROR) << "Failed to mount " << mount_point;
return -1; return -1;
} }
return 0; return 0;
@ -135,24 +127,24 @@ int ensure_path_mounted(const char* path) {
} }
int ensure_path_unmounted(const char* path) { int ensure_path_unmounted(const char* path) {
Volume* v = volume_for_path(path); const Volume* v = volume_for_path(path);
if (v == NULL) { if (v == nullptr) {
LOG(ERROR) << "unknown volume for path [" << path << "]"; LOG(ERROR) << "unknown volume for path [" << path << "]";
return -1; return -1;
} }
if (strcmp(v->fs_type, "ramdisk") == 0) { if (strcmp(v->fs_type, "ramdisk") == 0) {
// the ramdisk is always mounted; you can't unmount it. // The ramdisk is always mounted; you can't unmount it.
return -1; return -1;
} }
if (!scan_mounted_volumes()) { if (!scan_mounted_volumes()) {
LOG(ERROR) << "failed to scan mounted volumes"; LOG(ERROR) << "Failed to scan mounted volumes";
return -1; return -1;
} }
MountedVolume* mv = find_mounted_volume_by_mount_point(v->mount_point); MountedVolume* mv = find_mounted_volume_by_mount_point(v->mount_point);
if (mv == NULL) { if (mv == nullptr) {
// volume is already unmounted // Volume is already unmounted.
return 0; return 0;
} }
@ -304,7 +296,7 @@ int format_volume(const char* volume, const char* directory) {
} }
int format_volume(const char* volume) { int format_volume(const char* volume) {
return format_volume(volume, NULL); return format_volume(volume, nullptr);
} }
int setup_install_mounts() { 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 (strcmp(v->mount_point, "/tmp") == 0 || strcmp(v->mount_point, "/cache") == 0) {
if (ensure_path_mounted(v->mount_point) != 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; return -1;
} }
} else { } else {
if (ensure_path_unmounted(v->mount_point) != 0) { 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; return -1;
} }
} }