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

* grub-core/fs/affs.c (grub_affs_read_symlink): Convert latin1 into

Browse source 
UTF-8.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-07 22:00:19 +02:00
parent 7dceec9b69
commit e87b10f5d6
2 changed files with 20 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 @@
2012-05-07 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/affs.c (grub_affs_read_symlink): Convert latin1 into
UTF-8.
2012-05-07 Vladimir Serbinenko <phcoder@gmail.com> 2012-05-07 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/sfs.c (grub_sfs_read_symlink): Convert latin1 into * grub-core/fs/sfs.c (grub_sfs_read_symlink): Convert latin1 into

23
grub-core/fs/affs.c
View file

@ -263,24 +263,31 @@ static char *
grub_affs_read_symlink (grub_fshelp_node_t node) grub_affs_read_symlink (grub_fshelp_node_t node)
{ {
struct grub_affs_data *data = node->data; struct grub_affs_data *data = node->data;
char *symlink; grub_uint8_t *latin1, *utf8;
const grub_size_t symlink_size = (data->blocksize * GRUB_DISK_SECTOR_SIZE const grub_size_t symlink_size = (data->blocksize * GRUB_DISK_SECTOR_SIZE
- 225); - 225);
symlink = grub_malloc (symlink_size + 1); latin1 = grub_malloc (symlink_size);
if (!symlink) if (!latin1)
return 0; return 0;
grub_disk_read (data->disk, node->block, GRUB_AFFS_SYMLINK_OFFSET, grub_disk_read (data->disk, node->block, GRUB_AFFS_SYMLINK_OFFSET,
symlink_size, symlink); symlink_size, latin1);
if (grub_errno) if (grub_errno)
{ {
grub_free (symlink); grub_free (latin1);
return 0; return 0;
} }
symlink[symlink_size] = 1; utf8 = grub_malloc (symlink_size * GRUB_MAX_UTF8_PER_LATIN1 + 1);
grub_dprintf ("affs", "Symlink: `%s'\n", symlink); if (!utf8)
return symlink; {
grub_free (latin1);
return 0;
}
*grub_latin1_to_utf8 (utf8, latin1, symlink_size) = '\0';
grub_dprintf ("affs", "Symlink: `%s'\n", utf8);
grub_free (latin1);
return (char *) utf8;
} }