Actually use memcmp() for the DOSEMU comparison; we can't seem to get

it right any other way...

1 files changed, 1 insertions, 2 deletions

diff --git a/memdisk/setup.c b/memdisk/setup.c
index 0832a266..f8de652a 100644
--- a/memdisk/setup.c
+++ b/memdisk/setup.c
@@ -408,8 +408,7 @@ const struct geometry *get_disk_image_geometry(uint32_t where, uint32_t size)
 
   /* Do we have a DOSEMU header? */
   memcpy(&dosemu, (char *)where+hd_geometry.offset, sizeof dosemu);
-  if ( ((unsigned long *)dosemu.magic)[0] == FOUR('D','O','S','E') &&
-       (((unsigned long *)dosemu.magic)[1] & 0xffffff) == FOUR('M','U',0,0) ) {
+  if ( !memcmp("DOSEMU", dosemu.magic, 7) ) {
     /* Always a hard disk unless overruled by command-line options */
     hd_geometry.driveno = 0x80;
     hd_geometry.type = 0;