gfxboot: accept plain boot logo files

Don't force the boot logo file to be a cpio archive.

Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>

diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c
index e1b865a..c415bad 100644 (file)
--- 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);