2010-02-20 Vladimir Serbinenko <phcoder@gmail.com>
* fs/iso9660.c (grub_iso9660_iterate_dir): Strip version from joliet filename. Reported by: Georgy Buranov
This commit is contained in:
parent
7dd05b96dc
commit
618307dd08
2 changed files with 11 additions and 1 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2010-02-20 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
|
* fs/iso9660.c (grub_iso9660_iterate_dir): Strip version from joliet
|
||||||
|
filename.
|
||||||
|
Reported by: Georgy Buranov
|
||||||
|
|
||||||
2010-02-20 Carles Pina i Estany <carles@pina.cat>
|
2010-02-20 Carles Pina i Estany <carles@pina.cat>
|
||||||
|
|
||||||
* util/grub-mkrawimage.c (usage): Change string formatting to
|
* util/grub-mkrawimage.c (usage): Change string formatting to
|
||||||
|
|
|
@ -629,12 +629,16 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
|
||||||
|
|
||||||
if (dir->data->joliet)
|
if (dir->data->joliet)
|
||||||
{
|
{
|
||||||
char *oldname;
|
char *oldname, *semicolon;
|
||||||
|
|
||||||
oldname = filename;
|
oldname = filename;
|
||||||
filename = grub_iso9660_convert_string
|
filename = grub_iso9660_convert_string
|
||||||
((grub_uint16_t *) oldname, dirent.namelen >> 1);
|
((grub_uint16_t *) oldname, dirent.namelen >> 1);
|
||||||
|
|
||||||
|
semicolon = grub_strrchr (filename, ';');
|
||||||
|
if (semicolon)
|
||||||
|
*semicolon = '\0';
|
||||||
|
|
||||||
if (filename_alloc)
|
if (filename_alloc)
|
||||||
grub_free (oldname);
|
grub_free (oldname);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue