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

Merge powerpc grub-mkrescue flavour with common. Use xorriso HFS+

Browse source 
feature for it.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-11 23:15:26 +02:00
parent 48f39bb4df
commit a79b8a1584
14 changed files with 707 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

6
grub-core/font/font.c
View file

@ -422,7 +422,7 @@ read_section_as_short (struct font_file_section *section,
/* Load a font and add it to the beginning of the global font list.
Returns 0 upon success, nonzero upon failure. */
int
grub_font_t
grub_font_load (const char *filename)
{
grub_file_t file = 0;
@ -657,7 +657,7 @@ grub_font_load (const char *filename)
if (register_font (font) != 0)
goto fail;
return 0;
return font;
fail:
if (file)
@ -666,7 +666,7 @@ fail:
font->file = 0;
free_font (font);
return 1;
return 0;
}
/* Read a 16-bit big-endian integer from FILE, convert it to native byte

2
grub-core/font/font_cmd.c
View file

@ -32,7 +32,7 @@ loadfont_command (grub_command_t cmd __attribute__ ((unused)),
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
while (argc--)
if (grub_font_load (*args++) != 0)
if (grub_font_load (*args++) == 0)
{
if (!grub_errno)
return grub_error (GRUB_ERR_BAD_FONT, "invalid font");