efi: unify BootXXXX reading

3 files changed, 32 insertions, 28 deletions

diff --git a/src/boot/boot-efi.c b/src/boot/boot-efi.c
index ac5f9c12a7..a0305ba77d 100644
--- a/src/boot/boot-efi.c
+++ b/src/boot/boot-efi.c
@@ -38,27 +38,21 @@
 #include "conf-files.h"
 
 static int get_boot_entries(struct boot_info *info) {
-        DIR *d = NULL;
-        struct dirent *dent;
+        uint16_t *list;
+        int i, n;
         int err = 0;
 
-        d = opendir("/sys/firmware/efi/efivars");
-        if (!d)
-                return -errno;
+        n = efi_get_boot_options(&list);
+        if (n < 0)
+                return n;
 
-        for (dent = readdir(d); dent != NULL; dent = readdir(d)) {
-                unsigned int id;
+        for (i = 0; i < n; i++) {
                 struct boot_info_entry *e;
 
-                if (dent->d_name[0] == '.')
-                        continue;
-                if (sscanf(dent->d_name, "Boot%04X-8be4df61-93ca-11d2-aa0d-00e098032b8c", &id) != 1)
-                        continue;
-
                 e = realloc(info->fw_entries, (info->fw_entries_count+1) * sizeof(struct boot_info_entry));
                 if (!e) {
                         err = -ENOMEM;
-                        break;
+                                break;
                 }
                 info->fw_entries = e;
 
@@ -66,15 +60,15 @@ static int get_boot_entries(struct boot_info *info) {
                 memset(e, 0, sizeof(struct boot_info_entry));
                 e->order = -1;
 
-                err = efi_get_boot_option(id, &e->title, &e->part_uuid, &e->path);
+                err = efi_get_boot_option(list[i], &e->title, &e->part_uuid, &e->path);
                 if (err < 0)
-                        break;
-                e->id = id;
+                        continue;
 
+                e->id = list[i];
                 info->fw_entries_count++;
         }
-        closedir(d);
 
+        free(list);
         return err;
 }
 
diff --git a/src/boot/boot-loader.c b/src/boot/boot-loader.c
index bd563da226..d1a8b0320b 100644
--- a/src/boot/boot-loader.c
+++ b/src/boot/boot-loader.c
@@ -104,6 +104,7 @@ int boot_loader_read_entries(struct boot_info *info) {
                 }
                 info->loader_entries_count++;
         }
+
         return 0;
 }
 
diff --git a/src/shared/efivars.c b/src/shared/efivars.c
index 70b6ce1cc7..7918c59613 100644
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -288,6 +288,21 @@ int efi_get_boot_order(uint16_t **order) {
         return (int) (l / sizeof(uint16_t));
 }
 
+static int boot_id_hex(const char s[4]) {
+        int i;
+        int id = 0;
+
+        for (i = 0; i < 4; i++)
+                if (s[i] >= '0' && s[i] <= '9')
+                        id |= (s[i] - '0') << (3 - i) * 4;
+                else if (s[i] >= 'A' && s[i] <= 'F')
+                        id |= (s[i] - 'A' + 10) << (3 - i) * 4;
+                else
+                        return -1;
+
+        return id;
+}
+
 int efi_get_boot_options(uint16_t **options) {
         _cleanup_closedir_ DIR *dir = NULL;
         struct dirent *de;
@@ -301,26 +316,20 @@ int efi_get_boot_options(uint16_t **options) {
                 return -errno;
 
         while ((de = readdir(dir))) {
-                size_t n;
-                int a, b, c, d;
+                int id;
                 uint16_t *t;
 
                 if (strncmp(de->d_name, "Boot", 4) != 0)
                         continue;
 
-                n = strlen(de->d_name);
-                if (n != 45)
+                if (strlen(de->d_name) != 45)
                         continue;
 
                 if (strcmp(de->d_name + 8, "-8be4df61-93ca-11d2-aa0d-00e098032b8c") != 0)
                         continue;
 
-                a = de->d_name[4];
-                b = de->d_name[5];
-                c = de->d_name[6];
-                d = de->d_name[7];
-
-                if (!isdigit(a) || !isdigit(b) || !isdigit(c) || !isdigit(d))
+                id = boot_id_hex(de->d_name + 4);
+                if (id < 0)
                         continue;
 
                 t = realloc(list, (count + 1) * sizeof(uint16_t));
@@ -330,7 +339,7 @@ int efi_get_boot_options(uint16_t **options) {
                 }
 
                 list = t;
-                list[count ++] = (a - '0') * 1000 + (b - '0') * 100 + (c - '0') * 10 + (d - '0');
+                list[count ++] = id;
 
         }