app: aboot: update set_active command to be compliant with O upgrade.
In O upgrade, set_active command accepts slot suffix without delimiter.
Change made to process supplied suffix without delimiter.
Change-Id: I4434bafb5604df20d32e3249b2333f4a78f89297
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index c7e65cb..2cf9ded 100755
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -3545,7 +3545,7 @@
void cmd_set_active(const char *arg, void *data, unsigned sz)
{
- char *p = NULL;
+ char *p, *sp = NULL;
unsigned i,current_active_slot;
const char *current_slot_suffix;
@@ -3557,13 +3557,16 @@
if (arg)
{
- p = (char *)arg;
- if (p)
+ p = strtok_r((char *)arg, ":", &sp);
+ if (*p)
{
current_active_slot = partition_find_active_slot();
/* Check if trying to make curent slot active */
current_slot_suffix = SUFFIX_SLOT(current_active_slot);
+ current_slot_suffix = strtok_r((char *)current_slot_suffix,
+ (char *)suffix_delimiter, &sp);
+
if (!strncmp(p, current_slot_suffix, sizeof(current_slot_suffix)))
{
fastboot_okay("Slot already set active");
@@ -3574,6 +3577,8 @@
for (i = 0; i < AB_SUPPORTED_SLOTS; i++)
{
current_slot_suffix = SUFFIX_SLOT(i);
+ current_slot_suffix = strtok_r((char *)current_slot_suffix,
+ (char *)suffix_delimiter, &sp);
if (!strncmp(p, current_slot_suffix, sizeof(current_slot_suffix)))
{
partition_switch_slots(current_active_slot, i);
@@ -4120,7 +4125,7 @@
{"oem disable-charger-screen", cmd_oem_disable_charger_screen},
{"oem off-mode-charge", cmd_oem_off_mode_charger},
{"oem select-display-panel", cmd_oem_select_display_panel},
- {"oem set_active",cmd_set_active},
+ {"set_active",cmd_set_active},
#if UNITTEST_FW_SUPPORT
{"oem run-tests", cmd_oem_runtests},
#endif