SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boot: Use unicode literals

Browse Source 
No changes in behavior.
This commit is contained in:
Jan Janssen
2023-01-25 15:24:10 +01:00
parent 54d9ecc380
commit a083aed03f
4 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/boot/efi/boot.c
+27 -27
View File
@@ -428,7 +428,7 @@ static bool unicode_supported(void) {
if (cache < 0) if (cache < 0)
/* Basic unicode box drawing support is mandated by the spec, but it does /* Basic unicode box drawing support is mandated by the spec, but it does
* not hurt to make sure it works. */ * not hurt to make sure it works. */
cache = ST->ConOut->TestString(ST->ConOut, (char16_t *) L"─") == EFI_SUCCESS; cache = ST->ConOut->TestString(ST->ConOut, (char16_t *) u"─") == EFI_SUCCESS;
return cache; return cache;
} }
@@ -747,7 +747,7 @@ static bool menu_run(
print_at(x_start, print_at(x_start,
y_start + i - idx_first, y_start + i - idx_first,
i == idx_highlight ? COLOR_HIGHLIGHT : COLOR_ENTRY, i == idx_highlight ? COLOR_HIGHLIGHT : COLOR_ENTRY,
unicode_supported() ? L" ►" : L"=>"); unicode_supported() ? u" ►" : u"=>");
} }
refresh = false; refresh = false;
} else if (highlight) { } else if (highlight) {
@@ -757,12 +757,12 @@ static bool menu_run(
print_at(x_start, print_at(x_start,
y_start + idx_highlight_prev - idx_first, y_start + idx_highlight_prev - idx_first,
COLOR_ENTRY, COLOR_ENTRY,
unicode_supported() ? L" ►" : L"=>"); unicode_supported() ? u" ►" : u"=>");
if (idx_highlight == config->idx_default_efivar) if (idx_highlight == config->idx_default_efivar)
print_at(x_start, print_at(x_start,
y_start + idx_highlight - idx_first, y_start + idx_highlight - idx_first,
COLOR_HIGHLIGHT, COLOR_HIGHLIGHT,
unicode_supported() ? L" ►" : L"=>"); unicode_supported() ? u" ►" : u"=>");
highlight = false; highlight = false;
} }
@@ -1528,7 +1528,7 @@ static void config_entry_add_type1(
config_add_entry(config, entry); config_add_entry(config, entry);
config_entry_parse_tries(entry, path, file, L".conf"); config_entry_parse_tries(entry, path, file, u".conf");
TAKE_PTR(entry); TAKE_PTR(entry);
} }
@@ -1580,7 +1580,7 @@ static void config_load_defaults(Config *config, EFI_FILE *root_dir) {
.timeout_sec_efivar = TIMEOUT_UNSET, .timeout_sec_efivar = TIMEOUT_UNSET,
}; };
err = file_read(root_dir, L"\\loader\\loader.conf", 0, 0, &content, NULL); err = file_read(root_dir, u"\\loader\\loader.conf", 0, 0, &content, NULL);
if (err == EFI_SUCCESS) if (err == EFI_SUCCESS)
config_defaults_load_from_file(config, content); config_defaults_load_from_file(config, content);
@@ -1615,8 +1615,8 @@ static void config_load_defaults(Config *config, EFI_FILE *root_dir) {
strtolower16(config->entry_oneshot); strtolower16(config->entry_oneshot);
strtolower16(config->entry_saved); strtolower16(config->entry_saved);
config->use_saved_entry = streq16(config->entry_default_config, L"@saved"); config->use_saved_entry = streq16(config->entry_default_config, u"@saved");
config->use_saved_entry_efivar = streq16(config->entry_default_efivar, L"@saved"); config->use_saved_entry_efivar = streq16(config->entry_default_efivar, u"@saved");
if (config->use_saved_entry || config->use_saved_entry_efivar) if (config->use_saved_entry || config->use_saved_entry_efivar)
(void) efivar_get(MAKE_GUID_PTR(LOADER), u"LoaderEntryLastBooted", &config->entry_saved); (void) efivar_get(MAKE_GUID_PTR(LOADER), u"LoaderEntryLastBooted", &config->entry_saved);
} }
@@ -1638,7 +1638,7 @@ static void config_load_entries(
/* Adds Boot Loader Type #1 entries (i.e. /loader/entries/….conf) */ /* Adds Boot Loader Type #1 entries (i.e. /loader/entries/….conf) */
err = open_directory(root_dir, L"\\loader\\entries", &entries_dir); err = open_directory(root_dir, u"\\loader\\entries", &entries_dir);
if (err != EFI_SUCCESS) if (err != EFI_SUCCESS)
return; return;
@@ -1654,14 +1654,14 @@ static void config_load_entries(
if (FLAGS_SET(f->Attribute, EFI_FILE_DIRECTORY)) if (FLAGS_SET(f->Attribute, EFI_FILE_DIRECTORY))
continue; continue;
if (!endswith_no_case(f->FileName, L".conf")) if (!endswith_no_case(f->FileName, u".conf"))
continue; continue;
if (startswith(f->FileName, L"auto-")) if (startswith(f->FileName, u"auto-"))
continue; continue;
err = file_read(entries_dir, f->FileName, 0, 0, &content, NULL); err = file_read(entries_dir, f->FileName, 0, 0, &content, NULL);
if (err == EFI_SUCCESS) if (err == EFI_SUCCESS)
config_entry_add_type1(config, device, root_dir, L"\\loader\\entries", f->FileName, content, loaded_image_path); config_entry_add_type1(config, device, root_dir, u"\\loader\\entries", f->FileName, content, loaded_image_path);
} }
} }
@@ -1896,7 +1896,7 @@ static ConfigEntry *config_entry_add_loader_auto(
return NULL; return NULL;
if (!loader) { if (!loader) {
loader = L"\\EFI\\BOOT\\BOOT" EFI_MACHINE_TYPE_NAME ".efi"; loader = u"\\EFI\\BOOT\\BOOT" EFI_MACHINE_TYPE_NAME ".efi";
/* We are trying to add the default EFI loader here, /* We are trying to add the default EFI loader here,
* but we do not want to do that if that would be us. * but we do not want to do that if that would be us.
@@ -1905,7 +1905,7 @@ static ConfigEntry *config_entry_add_loader_auto(
* chainload GRUBX64.EFI in that case, which might be us.*/ * chainload GRUBX64.EFI in that case, which might be us.*/
if (strcaseeq16(loader, loaded_image_path) || if (strcaseeq16(loader, loaded_image_path) ||
is_sd_boot(root_dir, loader) || is_sd_boot(root_dir, loader) ||
is_sd_boot(root_dir, L"\\EFI\\BOOT\\GRUB" EFI_MACHINE_TYPE_NAME L".EFI")) is_sd_boot(root_dir, u"\\EFI\\BOOT\\GRUB" EFI_MACHINE_TYPE_NAME u".EFI"))
return NULL; return NULL;
} }
@@ -1957,10 +1957,10 @@ static void config_entry_add_osx(Config *config) {
handles[i], handles[i],
root, root,
NULL, NULL,
L"auto-osx", u"auto-osx",
'a', 'a',
L"macOS", u"macOS",
L"\\System\\Library\\CoreServices\\boot.efi")) u"\\System\\Library\\CoreServices\\boot.efi"))
break; break;
} }
} }
@@ -2029,7 +2029,7 @@ static EFI_STATUS boot_windows_bitlocker(void) {
if (buf_size < offset + sizeof(char16_t)) if (buf_size < offset + sizeof(char16_t))
continue; continue;
if (streq16((char16_t *) (buf + offset), L"Windows Boot Manager")) { if (streq16((char16_t *) (buf + offset), u"Windows Boot Manager")) {
err = efivar_set_raw( err = efivar_set_raw(
MAKE_GUID_PTR(EFI_GLOBAL_VARIABLE), MAKE_GUID_PTR(EFI_GLOBAL_VARIABLE),
u"BootNext", u"BootNext",
@@ -2061,13 +2061,13 @@ static void config_entry_add_windows(Config *config, EFI_HANDLE *device, EFI_FIL
return; return;
/* Try to find a better title. */ /* Try to find a better title. */
err = file_read(root_dir, L"\\EFI\\Microsoft\\Boot\\BCD", 0, 100*1024, &bcd, &len); err = file_read(root_dir, u"\\EFI\\Microsoft\\Boot\\BCD", 0, 100*1024, &bcd, &len);
if (err == EFI_SUCCESS) if (err == EFI_SUCCESS)
title = get_bcd_title((uint8_t *) bcd, len); title = get_bcd_title((uint8_t *) bcd, len);
ConfigEntry *e = config_entry_add_loader_auto(config, device, root_dir, NULL, ConfigEntry *e = config_entry_add_loader_auto(config, device, root_dir, NULL,
L"auto-windows", 'w', title ?: L"Windows Boot Manager", u"auto-windows", 'w', title ?: u"Windows Boot Manager",
L"\\EFI\\Microsoft\\Boot\\bootmgfw.efi"); u"\\EFI\\Microsoft\\Boot\\bootmgfw.efi");
if (config->reboot_for_bitlocker) if (config->reboot_for_bitlocker)
e->call = boot_windows_bitlocker; e->call = boot_windows_bitlocker;
@@ -2090,7 +2090,7 @@ static void config_entry_add_unified(
assert(device); assert(device);
assert(root_dir); assert(root_dir);
err = open_directory(root_dir, L"\\EFI\\Linux", &linux_dir); err = open_directory(root_dir, u"\\EFI\\Linux", &linux_dir);
if (err != EFI_SUCCESS) if (err != EFI_SUCCESS)
return; return;
@@ -2122,9 +2122,9 @@ static void config_entry_add_unified(
continue; continue;
if (FLAGS_SET(f->Attribute, EFI_FILE_DIRECTORY)) if (FLAGS_SET(f->Attribute, EFI_FILE_DIRECTORY))
continue; continue;
if (!endswith_no_case(f->FileName, L".efi")) if (!endswith_no_case(f->FileName, u".efi"))
continue; continue;
if (startswith(f->FileName, L"auto-")) if (startswith(f->FileName, u"auto-"))
continue; continue;
/* look for .osrel and .cmdline sections in the .efi binary */ /* look for .osrel and .cmdline sections in the .efi binary */
@@ -2217,7 +2217,7 @@ static void config_entry_add_unified(
strtolower16(entry->id); strtolower16(entry->id);
config_add_entry(config, entry); config_add_entry(config, entry);
config_entry_parse_tries(entry, L"\\EFI\\Linux", f->FileName, L".efi"); config_entry_parse_tries(entry, u"\\EFI\\Linux", f->FileName, u".efi");
if (szs[SECTION_CMDLINE] == 0) if (szs[SECTION_CMDLINE] == 0)
continue; continue;
@@ -2591,9 +2591,9 @@ static void config_load_all_entries(
config_entry_add_osx(config); config_entry_add_osx(config);
config_entry_add_windows(config, loaded_image->DeviceHandle, root_dir); config_entry_add_windows(config, loaded_image->DeviceHandle, root_dir);
config_entry_add_loader_auto(config, loaded_image->DeviceHandle, root_dir, NULL, config_entry_add_loader_auto(config, loaded_image->DeviceHandle, root_dir, NULL,
L"auto-efi-shell", 's', L"EFI Shell", L"\\shell" EFI_MACHINE_TYPE_NAME ".efi"); u"auto-efi-shell", 's', u"EFI Shell", u"\\shell" EFI_MACHINE_TYPE_NAME ".efi");
config_entry_add_loader_auto(config, loaded_image->DeviceHandle, root_dir, loaded_image_path, config_entry_add_loader_auto(config, loaded_image->DeviceHandle, root_dir, loaded_image_path,
L"auto-efi-default", '\0', L"EFI Default Loader", NULL); u"auto-efi-default", '\0', u"EFI Default Loader", NULL);
if (config->auto_firmware && FLAGS_SET(get_os_indications_supported(), EFI_OS_INDICATIONS_BOOT_TO_FW_UI)) { if (config->auto_firmware && FLAGS_SET(get_os_indications_supported(), EFI_OS_INDICATIONS_BOOT_TO_FW_UI)) {
ConfigEntry *entry = xnew(ConfigEntry, 1); ConfigEntry *entry = xnew(ConfigEntry, 1);
src/boot/efi/drivers.c
+2 -2
View File
@@ -82,7 +82,7 @@ EFI_STATUS load_drivers(
err = open_directory( err = open_directory(
root_dir, root_dir,
L"\\EFI\\systemd\\drivers", u"\\EFI\\systemd\\drivers",
&drivers_dir); &drivers_dir);
if (err == EFI_NOT_FOUND) if (err == EFI_NOT_FOUND)
return EFI_SUCCESS; return EFI_SUCCESS;
@@ -100,7 +100,7 @@ EFI_STATUS load_drivers(
continue; continue;
if (FLAGS_SET(dirent->Attribute, EFI_FILE_DIRECTORY)) if (FLAGS_SET(dirent->Attribute, EFI_FILE_DIRECTORY))
continue; continue;
if (!endswith_no_case(dirent->FileName, EFI_MACHINE_TYPE_NAME L".efi")) if (!endswith_no_case(dirent->FileName, EFI_MACHINE_TYPE_NAME u".efi"))
continue; continue;
err = load_one_driver(parent_image, loaded_image, dirent->FileName); err = load_one_driver(parent_image, loaded_image, dirent->FileName);
src/boot/efi/random-seed.c
+1 -1
View File
@@ -194,7 +194,7 @@ EFI_STATUS process_random_seed(EFI_FILE *root_dir) {
err = root_dir->Open( err = root_dir->Open(
root_dir, root_dir,
&handle, &handle,
(char16_t *) L"\\loader\\random-seed", (char16_t *) u"\\loader\\random-seed",
EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE, EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE,
0); 0);
if (err != EFI_SUCCESS) { if (err != EFI_SUCCESS) {
src/boot/efi/stub.c
+9 -9
View File
@@ -281,25 +281,25 @@ static EFI_STATUS run(EFI_HANDLE image) {
if (pack_cpio(loaded_image, if (pack_cpio(loaded_image,
NULL, NULL,
L".cred", u".cred",
".extra/credentials", ".extra/credentials",
/* dir_mode= */ 0500, /* dir_mode= */ 0500,
/* access_mode= */ 0400, /* access_mode= */ 0400,
/* tpm_pcr= */ TPM_PCR_INDEX_KERNEL_PARAMETERS, /* tpm_pcr= */ TPM_PCR_INDEX_KERNEL_PARAMETERS,
L"Credentials initrd", u"Credentials initrd",
&credential_initrd, &credential_initrd,
&credential_initrd_size, &credential_initrd_size,
&m) == EFI_SUCCESS) &m) == EFI_SUCCESS)
parameters_measured = parameters_measured < 0 ? m : (parameters_measured && m); parameters_measured = parameters_measured < 0 ? m : (parameters_measured && m);
if (pack_cpio(loaded_image, if (pack_cpio(loaded_image,
L"\\loader\\credentials", u"\\loader\\credentials",
L".cred", u".cred",
".extra/global_credentials", ".extra/global_credentials",
/* dir_mode= */ 0500, /* dir_mode= */ 0500,
/* access_mode= */ 0400, /* access_mode= */ 0400,
/* tpm_pcr= */ TPM_PCR_INDEX_KERNEL_PARAMETERS, /* tpm_pcr= */ TPM_PCR_INDEX_KERNEL_PARAMETERS,
L"Global credentials initrd", u"Global credentials initrd",
&global_credential_initrd, &global_credential_initrd,
&global_credential_initrd_size, &global_credential_initrd_size,
&m) == EFI_SUCCESS) &m) == EFI_SUCCESS)
@@ -307,12 +307,12 @@ static EFI_STATUS run(EFI_HANDLE image) {
if (pack_cpio(loaded_image, if (pack_cpio(loaded_image,
NULL, NULL,
L".raw", u".raw",
".extra/sysext", ".extra/sysext",
/* dir_mode= */ 0555, /* dir_mode= */ 0555,
/* access_mode= */ 0444, /* access_mode= */ 0444,
/* tpm_pcr= */ TPM_PCR_INDEX_INITRD_SYSEXTS, /* tpm_pcr= */ TPM_PCR_INDEX_INITRD_SYSEXTS,
L"System extension initrd", u"System extension initrd",
&sysext_initrd, &sysext_initrd,
&sysext_initrd_size, &sysext_initrd_size,
&m) == EFI_SUCCESS) &m) == EFI_SUCCESS)
@@ -333,7 +333,7 @@ static EFI_STATUS run(EFI_HANDLE image) {
(uint8_t*) loaded_image->ImageBase + addrs[UNIFIED_SECTION_PCRSIG], (uint8_t*) loaded_image->ImageBase + addrs[UNIFIED_SECTION_PCRSIG],
szs[UNIFIED_SECTION_PCRSIG], szs[UNIFIED_SECTION_PCRSIG],
".extra", ".extra",
L"tpm2-pcr-signature.json", u"tpm2-pcr-signature.json",
/* dir_mode= */ 0555, /* dir_mode= */ 0555,
/* access_mode= */ 0444, /* access_mode= */ 0444,
/* tpm_pcr= */ UINT32_MAX, /* tpm_pcr= */ UINT32_MAX,
@@ -351,7 +351,7 @@ static EFI_STATUS run(EFI_HANDLE image) {
(uint8_t*) loaded_image->ImageBase + addrs[UNIFIED_SECTION_PCRPKEY], (uint8_t*) loaded_image->ImageBase + addrs[UNIFIED_SECTION_PCRPKEY],
szs[UNIFIED_SECTION_PCRPKEY], szs[UNIFIED_SECTION_PCRPKEY],
".extra", ".extra",
L"tpm2-pcr-public-key.pem", u"tpm2-pcr-public-key.pem",
/* dir_mode= */ 0555, /* dir_mode= */ 0555,
/* access_mode= */ 0444, /* access_mode= */ 0444,
/* tpm_pcr= */ UINT32_MAX, /* tpm_pcr= */ UINT32_MAX,