From 9315750647b4ff1f323b4cfc20ca1a13ef74b634 Mon Sep 17 00:00:00 2001 From: Sebastian Herbszt Date: Tue, 8 Dec 2009 21:05:28 +0100 Subject: gfxboot: accept plain boot logo files Don't force the boot logo file to be a cpio archive. Signed-off-by: Sebastian Herbszt --- com32/gfxboot/gfxboot.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'com32/gfxboot/gfxboot.c') diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c index e1b865a1..c415bad4 100644 --- a/com32/gfxboot/gfxboot.c +++ b/com32/gfxboot/gfxboot.c @@ -424,7 +424,7 @@ unsigned magic_ok(unsigned char *buf, unsigned *code_size) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -// Search cpio archive for gfx file. +// Search (cpio archive) for gfx file. // unsigned find_file(unsigned char *buf, unsigned len, unsigned *gfx_file_start, unsigned *file_len, unsigned *code_size) { @@ -433,6 +433,8 @@ unsigned find_file(unsigned char *buf, unsigned len, unsigned *gfx_file_start, u *gfx_file_start = 0; *code_size = 0; + if((code_start = magic_ok(buf, code_size))) return code_start; + for(i = 0; i < len;) { if((len - i) >= 0x1a && (buf[i] + (buf[i + 1] << 8)) == 0x71c7) { fname_len = *(unsigned short *) (buf + i + 20); -- cgit v1.2.1