diff mbox series

[v4,2/6] efi: Add string conversion helper

Message ID 20221005121839.3938771-3-paul.barker@sancloud.com
State Accepted, archived
Delegated to: Heinrich Schuchardt
Headers show
Series Support UEFI SPI I/O protocol | expand

Commit Message

Paul Barker Oct. 5, 2022, 12:18 p.m. UTC 
Signed-off-by: Paul Barker <paul.barker@sancloud.com>
---
 include/efi_loader.h        |  3 ++-
 lib/efi_loader/efi_string.c | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

Comments

Heinrich Schuchardt Oct. 6, 2022, 3:26 a.m. UTC | #1 
On 10/5/22 14:18, Paul Barker wrote:
> Signed-off-by: Paul Barker <paul.barker@sancloud.com>
> ---
>   include/efi_loader.h        |  3 ++-
>   lib/efi_loader/efi_string.c | 24 ++++++++++++++++++++++++
>   2 files changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/include/efi_loader.h b/include/efi_loader.h
> index 545ba06d9466..4dbbb2d3a06c 100644
> --- a/include/efi_loader.h
> +++ b/include/efi_loader.h
> @@ -985,9 +985,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 8bf1e493b89e..e21e09c94617 100644
> --- 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;
> +}

We will be able to use the function for code simplification in the
following places in future:

cmd/efidebug.c:800:
cmd/nvedit_efi.c:498:

Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Ilias Apalodimas Oct. 6, 2022, 6:19 a.m. UTC | #2 
Thanks Paul!

On Wed, Oct 05, 2022 at 01:18:35PM +0100, Paul Barker wrote:
> Signed-off-by: Paul Barker <paul.barker@sancloud.com>
> ---
>  include/efi_loader.h        |  3 ++-
>  lib/efi_loader/efi_string.c | 24 ++++++++++++++++++++++++
>  2 files changed, 26 insertions(+), 1 deletion(-)
> 
> diff --git a/include/efi_loader.h b/include/efi_loader.h
> index 545ba06d9466..4dbbb2d3a06c 100644
> --- a/include/efi_loader.h
> +++ b/include/efi_loader.h
> @@ -985,9 +985,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 8bf1e493b89e..e21e09c94617 100644
> --- 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;
> +}
> -- 
> 2.25.1
> 

Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
diff mbox series

Patch

diff --git a/include/efi_loader.h b/include/efi_loader.h
index 545ba06d9466..4dbbb2d3a06c 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -985,9 +985,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 8bf1e493b89e..e21e09c94617 100644
--- 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;
+}