PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 168f7778: Allow passing of mount args to mountFn

Browse Source 
* commit '168f77787700f0e9f66675beef33c593a777e64e':
  Allow passing of mount args to mountFn
This commit is contained in:
Michael Runge
2014-10-23 21:56:52 +00:00
committed by Android Git Automerger
parent 4da9cdeab9 168f777877
commit da500cecf5
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
updater/install.c
View File

@@ -91,16 +91,27 @@ char* PrintSha1(const uint8_t* digest) {
// fs_type="ext4" partition_type="EMMC" location=device // fs_type="ext4" partition_type="EMMC" location=device
Value* MountFn(const char* name, State* state, int argc, Expr* argv[]) { Value* MountFn(const char* name, State* state, int argc, Expr* argv[]) {
char* result = NULL; char* result = NULL;
if (argc != 4) { if (argc != 4 && argc != 5) {
return ErrorAbort(state, "%s() expects 4 args, got %d", name, argc); return ErrorAbort(state, "%s() expects 4-5 args, got %d", name, argc);
} }
char* fs_type; char* fs_type;
char* partition_type; char* partition_type;
char* location; char* location;
char* mount_point; char* mount_point;
if (ReadArgs(state, argv, 4, &fs_type, &partition_type, char* mount_options;
bool has_mount_options;
if (argc == 5) {
has_mount_options = true;
if (ReadArgs(state, argv, 5, &fs_type, &partition_type,
&location, &mount_point, &mount_options) < 0) {
return NULL;
}
} else {
has_mount_options = false;
if (ReadArgs(state, argv, 4, &fs_type, &partition_type,
&location, &mount_point) < 0) { &location, &mount_point) < 0) {
return NULL; return NULL;
}
} }
if (strlen(fs_type) == 0) { if (strlen(fs_type) == 0) {
@@ -154,7 +165,8 @@ Value* MountFn(const char* name, State* state, int argc, Expr* argv[]) {
result = mount_point; result = mount_point;
} else { } else {
if (mount(location, mount_point, fs_type, if (mount(location, mount_point, fs_type,
MS_NOATIME | MS_NODEV | MS_NODIRATIME, "") < 0) { MS_NOATIME | MS_NODEV | MS_NODIRATIME,
has_mount_options ? mount_options : "") < 0) {
printf("%s: failed to mount %s at %s: %s\n", printf("%s: failed to mount %s at %s: %s\n",
name, location, mount_point, strerror(errno)); name, location, mount_point, strerror(errno));
result = strdup(""); result = strdup("");
@@ -168,6 +180,7 @@ done:
free(partition_type); free(partition_type);
free(location); free(location);
if (result != mount_point) free(mount_point); if (result != mount_point) free(mount_point);
if (has_mount_options) free(mount_options);
return StringValue(result); return StringValue(result);
} }