cmd: simplify do_env_set_efi()

Use efi_convert_string() to convert a UTF-8 to a UTF-16 string.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c
index 770877c..24944ab 100644 (file)
--- a/cmd/nvedit_efi.c
+++ b/cmd/nvedit_efi.c
@@ -382,8 +382,7 @@ int do_env_set_efi(struct cmd_tbl *cmdtp, int flag, int argc,
        efi_guid_t guid;
        u32 attributes;
        bool default_guid, verbose, value_on_memory;
-       u16 *var_name16 = NULL, *p;
-       size_t len;
+       u16 *var_name16;
        efi_status_t ret;
 
        if (argc == 1)
@@ -487,18 +486,15 @@ int do_env_set_efi(struct cmd_tbl *cmdtp, int flag, int argc,
                               16, 1, value, size, true);
        }
 
-       len = utf8_utf16_strnlen(var_name, strlen(var_name));
-       var_name16 = malloc((len + 1) * 2);
+       var_name16 = efi_convert_string(var_name);
        if (!var_name16) {
                printf("## Out of memory\n");
                ret = CMD_RET_FAILURE;
                goto out;
        }
-       p = var_name16;
-       utf8_utf16_strncpy(&p, var_name, len + 1);
-
        ret = efi_set_variable_int(var_name16, &guid, attributes, size, value,
                                   true);
+       free(var_name16);
        unmap_sysmem(value);
        if (ret == EFI_SUCCESS) {
                ret = CMD_RET_SUCCESS;
@@ -533,7 +529,6 @@ out:
                unmap_sysmem(value);
        else
                free(value);
-       free(var_name16);
 
        return ret;
 }