efi: Add string conversion helper

Signed-off-by: Paul Barker <paul.barker@sancloud.com>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

diff --git a/include/efi_loader.h b/include/efi_loader.h
index ad01395b39c33454c11dd48826e9db343e6c3354..8c45e3ee25925e56b1dfa3f4c9c1114c05bc6621 100644 (file)
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -1014,9 +1014,10 @@ struct pkcs7_message *efi_parse_pkcs7_header(const void *buf,
 /* runtime implementation of memcpy() */
 void efi_memcpy_runtime(void *dest, const void *src, size_t n);
 
-/* commonly used helper function */
+/* commonly used helper functions */
 u16 *efi_create_indexed_name(u16 *buffer, size_t buffer_size, const char *name,
                             unsigned int index);
+efi_string_t efi_convert_string(const char *str);
 
 extern const struct efi_firmware_management_protocol efi_fmp_fit;
 extern const struct efi_firmware_management_protocol efi_fmp_raw;

diff --git a/lib/efi_loader/efi_string.c b/lib/efi_loader/efi_string.c
index 8bf1e493b89e0f355616609fe45379b4f3432765..e21e09c946172a2d8c284c188bcbf4d0cf4a5f42 100644 (file)
--- a/lib/efi_loader/efi_string.c
+++ b/lib/efi_loader/efi_string.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <charset.h>
 #include <efi_loader.h>
+#include <malloc.h>
 
 /**
  * efi_create_indexed_name - create a string name with an index
@@ -41,3 +42,26 @@ u16 *efi_create_indexed_name(u16 *buffer, size_t buffer_size, const char *name,
 
        return p;
 }
+
+/**
+ * efi_convert_string - Convert an ASCII or UTF-8 string to UTF-16
+ * @str:       String to be converted
+ *
+ * Return: Converted string in UTF-16 format. The caller is responsible for
+ *         freeing this string when it is no longer needed.
+ */
+efi_string_t efi_convert_string(const char *str)
+{
+       efi_string_t str_16, tmp;
+       size_t sz_16;
+
+       sz_16 = utf8_utf16_strlen(str);
+       str_16 = calloc(sz_16 + 1, sizeof(u16));
+       if (!str_16)
+               return NULL;
+
+       tmp = str_16;
+       utf8_utf16_strcpy(&tmp, str);
+
+       return str_16;
+}