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

Merge "recovery: Drop the "--stages" / '-g' argument."

Browse source 
am: 9bd1dced90

Change-Id: I2110aaac69dfe017281924426486dc821da10b49
This commit is contained in:
Tao Bao 2017-03-07 20:35:11 +00:00 committed by android-build-merger
commit ecf5467a82
2 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common.h
View file

@ -29,7 +29,7 @@ extern RecoveryUI* ui;
extern bool modified_flash; extern bool modified_flash;
// The current stage, e.g. "1/2". // The current stage, e.g. "1/2".
extern const char* stage; extern std::string stage;
// The reason argument provided in "--reason=". // The reason argument provided in "--reason=".
extern const char* reason; extern const char* reason;

17
recovery.cpp
View file

@ -83,7 +83,6 @@ static const struct option OPTIONS[] = {
{ "sideload_auto_reboot", no_argument, NULL, 'a' }, { "sideload_auto_reboot", no_argument, NULL, 'a' },
{ "just_exit", no_argument, NULL, 'x' }, { "just_exit", no_argument, NULL, 'x' },
{ "locale", required_argument, NULL, 'l' }, { "locale", required_argument, NULL, 'l' },
{ "stages", required_argument, NULL, 'g' },
{ "shutdown_after", no_argument, NULL, 'p' }, { "shutdown_after", no_argument, NULL, 'p' },
{ "reason", required_argument, NULL, 'r' }, { "reason", required_argument, NULL, 'r' },
{ "security", no_argument, NULL, 'e'}, { "security", no_argument, NULL, 'e'},
@ -129,7 +128,7 @@ static bool has_cache = false;
RecoveryUI* ui = nullptr; RecoveryUI* ui = nullptr;
bool modified_flash = false; bool modified_flash = false;
const char* stage = nullptr; std::string stage;
const char* reason = nullptr; const char* reason = nullptr;
struct selabel_handle* sehandle; struct selabel_handle* sehandle;
@ -309,7 +308,7 @@ static std::vector<std::string> get_args(const int argc, char** const argv) {
// If fails, leave a zeroed bootloader_message. // If fails, leave a zeroed bootloader_message.
boot = {}; boot = {};
} }
stage = strndup(boot.stage, sizeof(boot.stage)); stage = std::string(boot.stage);
if (boot.command[0] != 0) { if (boot.command[0] != 0) {
std::string boot_command = std::string(boot.command, sizeof(boot.command)); std::string boot_command = std::string(boot.command, sizeof(boot.command));
@ -1418,14 +1417,6 @@ int main(int argc, char **argv) {
case 'a': sideload = true; sideload_auto_reboot = true; break; case 'a': sideload = true; sideload_auto_reboot = true; break;
case 'x': just_exit = true; break; case 'x': just_exit = true; break;
case 'l': locale = optarg; break; case 'l': locale = optarg; break;
case 'g': {
if (stage == NULL || *stage == '\0') {
char buffer[20] = "1/";
strncat(buffer, optarg, sizeof(buffer)-3);
stage = strdup(buffer);
}
break;
}
case 'p': shutdown_after = true; break; case 'p': shutdown_after = true; break;
case 'r': reason = optarg; break; case 'r': reason = optarg; break;
case 'e': security_update = true; break; case 'e': security_update = true; break;
@ -1457,7 +1448,7 @@ int main(int argc, char **argv) {
} }
printf("locale is [%s]\n", locale.c_str()); printf("locale is [%s]\n", locale.c_str());
printf("stage is [%s]\n", stage); printf("stage is [%s]\n", stage.c_str());
printf("reason is [%s]\n", reason); printf("reason is [%s]\n", reason);
Device* device = make_device(); Device* device = make_device();
@ -1472,7 +1463,7 @@ int main(int argc, char **argv) {
ui->SetSystemUpdateText(security_update); ui->SetSystemUpdateText(security_update);
int st_cur, st_max; int st_cur, st_max;
if (stage != NULL && sscanf(stage, "%d/%d", &st_cur, &st_max) == 2) { if (!stage.empty() && sscanf(stage.c_str(), "%d/%d", &st_cur, &st_max) == 2) {
ui->SetStage(st_cur, st_max); ui->SetStage(st_cur, st_max);
} }