Update apkL to return currently running ROM

Author: nkk71

main.c

@@ -68,23 +68,29 @@ int main(int argc, const char *argv[])
             // can manipulate them
 
             int i;
+            int active = 0;
             struct multirom_status s;
             memset(&s, 0, sizeof(struct multirom_status));
 
             multirom_apk_get_roms(&s);
 
             for(i = 0; s.roms && s.roms[i]; ++i)
             {
+                if(s.current_rom)
+                    active = (s.roms[i] == s.current_rom);
+
                 if (!s.roms[i]->partition)
                 {
                     // Internal ROMs
-                    printf("ROM: name=%s base=%s icon=%s\n",
+                    printf("ROM:%d name=%s base=%s icon=%s\n",
+                        active,
                         s.roms[i]->name, s.roms[i]->base_path, s.roms[i]->icon_path);
                 }
                 else
                 {
                     // External ROMs
-                    printf("ROM: name=%s base=%s icon=%s part_name=%s part_mount=%s part_uuid=%s part_fs=%s\n",
+                    printf("ROM:%d name=%s base=%s icon=%s part_name=%s part_mount=%s part_uuid=%s part_fs=%s\n",
+                        active,
                         s.roms[i]->name, s.roms[i]->base_path, s.roms[i]->icon_path,
                         s.roms[i]->partition->name, s.roms[i]->partition->mount_path, s.roms[i]->partition->uuid, s.roms[i]->partition->fs);
                 }

multirom.c

@@ -626,6 +626,45 @@ int multirom_apk_get_roms(struct multirom_status *s)
         return -1;
     }
 
+    char current_rom[256] = { 0 };
+    s->curr_rom_part = NULL;
+
+    /* Read multirom.ini to find current_rom */
+    char arg[256];
+    sprintf(arg, "%s/multirom.ini", mrom_dir());
+
+    FILE *f = fopen(arg, "re");
+    if(f)
+    {
+        char line[1024];
+
+        char name[64];
+        char *pch;
+
+        while((fgets(line, sizeof(line), f)))
+        {
+            pch = strtok (line, "=\n");
+            if(!pch) continue;
+            strcpy(name, pch);
+            pch = strtok (NULL, "=\n");
+            if(!pch) continue;
+            strcpy(arg, pch);
+
+            if(strstr(name, "current_rom"))
+                strcpy(current_rom, arg);
+            else if(strstr(name, "curr_rom_part"))
+                s->curr_rom_part = strdup(arg);
+        }
+
+        printf("current_rom='%s' curr_rom_part='%s'\n", current_rom, (s->curr_rom_part ? s->curr_rom_part : ""));
+
+        fclose(f);
+    }
+    else
+    {
+        printf("Failed to open config file, setting current_rom to null!\n");
+    }
+
     /* Get Internal ROM */
     char roms_path[256];
     sprintf(roms_path, "%s/roms/"INTERNAL_ROM_NAME, mrom_dir());
@@ -702,11 +741,22 @@ int multirom_apk_get_roms(struct multirom_status *s)
     multirom_update_partitions(s);
 
     int i;
-    for(i = 0; s->partitions && s->partitions[i]; ++i) {
-        //printf("part=%s\n", s->partitions[i]->mount_path);
+    pthread_mutex_lock(&parts_mutex);
+    for(i = 0; s->partitions && s->partitions[i]; ++i)
+    {
         s->partitions[i]->keep_mounted = 1; // don't unmount on exit, the APK will need access to the folders
         multirom_scan_partition_for_roms(s, s->partitions[i]);
     }
+    pthread_mutex_unlock(&parts_mutex);
+
+
+    s->current_rom = multirom_get_rom(s, current_rom, s->curr_rom_part);
+    if(!s->current_rom)
+    {
+        printf("Failed to find current rom (%s, part %s)!\n", current_rom, (s->curr_rom_part) ? s->curr_rom_part : "");
+        free(s->curr_rom_part);
+        s->curr_rom_part = NULL;
+    }
 
     return 0;
 }

version.h

@@ -19,7 +19,7 @@
 #define VERSION_H
     #define VERSION_MULTIROM 33
     #define VERSION_TRAMPOLINE 27
-    #define VERSION_APKL 2
+    #define VERSION_APKL 3
 
     // For device-specific fixes. Use letters, the version will then be like "12a"
     #ifdef MR_DEVICE_SPECIFIC_VERSION