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

* fs/udf.c (grub_udf_iterate_dir): Decode the Unicode filenames.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-04-19 02:41:48 +02:00
parent 0037de3fa3
commit 189593857c
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2010-04-19 Vladimir Serbinenko <phcoder@gmail.com>
* fs/udf.c (grub_udf_iterate_dir): Decode the Unicode filenames.
2010-04-18 Vladimir Serbinenko <phcoder@gmail.com> 2010-04-18 Vladimir Serbinenko <phcoder@gmail.com>
* boot/sparc64/ieee1275/boot.S: Various size-reducing changes. * boot/sparc64/ieee1275/boot.S: Various size-reducing changes.

33
fs/udf.c
View file

@ -25,6 +25,7 @@
#include <grub/dl.h> #include <grub/dl.h>
#include <grub/types.h> #include <grub/types.h>
#include <grub/fshelp.h> #include <grub/fshelp.h>
#include <grub/charset.h>
#define GRUB_UDF_MAX_PDS 2 #define GRUB_UDF_MAX_PDS 2
#define GRUB_UDF_MAX_PMS 6 #define GRUB_UDF_MAX_PMS 6
@ -745,19 +746,41 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir,
else else
{ {
enum grub_fshelp_filetype type; enum grub_fshelp_filetype type;
char filename[dirent.file_ident_length + 1]; grub_uint8_t raw[dirent.file_ident_length];
grub_uint16_t utf16[dirent.file_ident_length - 1];
grub_uint8_t filename[dirent.file_ident_length * 2];
grub_size_t utf16len;
type = ((dirent.characteristics & GRUB_UDF_FID_CHAR_DIRECTORY) ? type = ((dirent.characteristics & GRUB_UDF_FID_CHAR_DIRECTORY) ?
(GRUB_FSHELP_DIR) : (GRUB_FSHELP_REG)); (GRUB_FSHELP_DIR) : (GRUB_FSHELP_REG));
if ((grub_udf_read_file (dir, 0, offset, if ((grub_udf_read_file (dir, 0, offset,
dirent.file_ident_length, filename)) dirent.file_ident_length,
(char *) raw))
!= dirent.file_ident_length) != dirent.file_ident_length)
return 0; return 0;
filename[dirent.file_ident_length] = 0; if (raw[0] == 8)
if (hook (&filename[1], type, child)) {
return 1; unsigned i;
utf16len = dirent.file_ident_length - 1;
for (i = 0; i < utf16len; i++)
utf16[i] = raw[i + 1];
}
if (raw[0] == 16)
{
unsigned i;
utf16len = (dirent.file_ident_length - 1) / 2;
for (i = 0; i < utf16len; i++)
utf16[i] = (raw[2 * i + 1] << 8) | raw[2*i + 2];
}
if (raw[0] == 8 || raw[0] == 16)
{
*grub_utf16_to_utf8 (filename, utf16, utf16len) = '\0';
if (hook ((char *) filename, type, child))
return 1;
}
} }
/* Align to dword boundary. */ /* Align to dword boundary. */