On 15.06.20 14:15, Ard Biesheuvel wrote:
>> ---
>> drivers/firmware/efi/libstub/file.c | 10 ++++++++++
>> 1 file changed, 10 insertions(+)
>>
>> diff --git a/drivers/firmware/efi/libstub/file.c b/drivers/firmware/efi/libstub/file.c
>> index 2005e33b33d5..f8a28a6e0bde 100644
>> --- a/drivers/firmware/efi/libstub/file.c
>> +++ b/drivers/firmware/efi/libstub/file.c
>> @@ -102,11 +102,21 @@ static int find_file_option(const efi_char16_t *cmdline, int cmdline_len,
>> if (!found)
>> return 0;
>>
>> + /* Skip any leading slashes */
>> + while (cmdline[i] == L'/' || cmdline[i] == L'\\')
>> + i++;
>> +
>> while (--result_len > 0 && i < cmdline_len) {
>> if (cmdline[i] == L'\0' ||
>> cmdline[i] == L'\n' ||
>> cmdline[i] == L' ')
>> break;
>> + /* Replace UNIX dir separators with EFI standard separators */
>> + if (cmdline[i] == L'/') {
>> + *result++ = L'\\';
>> + i++;
>> + continue;
>> + }
>
> Any objections if I change this to
>
>
> ---%<---
> efi_char16_t c = cmdline[i++];
>
> if (c == L'\0' || c == L'\n' || c == L' ')
> break;
> else if (c == L'/')
> /* Replace UNIX dir separators with EFI standard ones */
> *result++ = L'\\';
> else
> *result++ = c;
> ---%<---
>
>
> (no need to resend)
>
>
>> *result++ = cmdline[i++];
>> }
>> *result = L'\0';
>> --
>> 2.27.0
>>
Sure, go ahead. I wasn't sure about the style, but yours looks more terse.
Thanks for queueing as a fix!
