vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/kern/efi/efi.c: Ensure that the result starts with /

Browse source 
and has no //.
This commit is contained in:
Vladimir Serbinenko 2014-01-18 16:41:47 +01:00
parent 5acc8020b4
commit 7e7293d745
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/efi/efi.c: Ensure that the result starts with /
and has no //.
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com> 2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
* NEWS: Add few missing entries. * NEWS: Add few missing entries.

21
grub-core/kern/efi/efi.c
View file

@ -309,7 +309,7 @@ grub_efi_modules_addr (void)
char * char *
grub_efi_get_filename (grub_efi_device_path_t *dp0) grub_efi_get_filename (grub_efi_device_path_t *dp0)
{ {
char *name = 0, *p; char *name = 0, *p, *pi;
grub_size_t filesize = 0; grub_size_t filesize = 0;
grub_efi_device_path_t *dp; grub_efi_device_path_t *dp;
@ -328,7 +328,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0)
grub_efi_uint16_t len; grub_efi_uint16_t len;
len = ((GRUB_EFI_DEVICE_PATH_LENGTH (dp) - 4) len = ((GRUB_EFI_DEVICE_PATH_LENGTH (dp) - 4)
/ sizeof (grub_efi_char16_t)); / sizeof (grub_efi_char16_t));
filesize += GRUB_MAX_UTF8_PER_UTF16 * len + 1; filesize += GRUB_MAX_UTF8_PER_UTF16 * len + 2;
} }
dp = GRUB_EFI_NEXT_DEVICE_PATH (dp); dp = GRUB_EFI_NEXT_DEVICE_PATH (dp);
@ -356,12 +356,12 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0)
grub_efi_file_path_device_path_t *fp; grub_efi_file_path_device_path_t *fp;
grub_efi_uint16_t len; grub_efi_uint16_t len;
if (p != name)
*p++ = '/'; *p++ = '/';
len = ((GRUB_EFI_DEVICE_PATH_LENGTH (dp) - 4) len = ((GRUB_EFI_DEVICE_PATH_LENGTH (dp) - 4)
/ sizeof (grub_efi_char16_t)); / sizeof (grub_efi_char16_t));
fp = (grub_efi_file_path_device_path_t *) dp; fp = (grub_efi_file_path_device_path_t *) dp;
p = (char *) grub_utf16_to_utf8 ((unsigned char *) p, fp->path_name, len); p = (char *) grub_utf16_to_utf8 ((unsigned char *) p, fp->path_name, len);
} }
@ -370,10 +370,19 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0)
*p = '\0'; *p = '\0';
for (pi = name, p = name; *pi;)
{
/* EFI breaks paths with backslashes. */ /* EFI breaks paths with backslashes. */
for (p = name; *p; p++) if (*pi == '\\' || *pi == '/')
if (*p == '\\') {
*p = '/'; *p++ = '/';
while (*pi == '\\' || *pi == '/')
pi++;
continue;
}
*p++ = *pi++;
}
*p = '\0';
return name; return name;
} }