2005-09-29 Yoshinori K. Okuji <okuji@enbug.org>

Make GRUB's kernel compliant to Multiboot Specification.

        * kern/i386/pc/startup.S (multiboot_header): New label.
        (multiboot_entry): Likewise.
        (multiboot_trampoline): Likewise.

        * include/grub/i386/pc/kernel.h (GRUB_KERNEL_MACHINE_RAW_SIZE):
        Increased to 0x4A0.

        * fs/xfs.c (grub_xfs_iterate_dir): Fix a syntax error. You may not
        put parentheses after a question mark.
        [!GRUB_UTIL] (my_mod): New variable.

        * util/grub-emu.c (main): Call grub_xfs_init and grub_xfs_fini.

fs/xfs.c

@@ -119,6 +119,11 @@ struct grub_xfs_data
   struct grub_fshelp_node diropen;
 
 };
+
+#ifndef GRUB_UTIL
+static grub_dl_t my_mod;
+#endif
+
 
 
 /* Filetype information as used in inodes.  */
@@ -300,6 +305,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
 				grub_fshelp_node_t node))
 {
   struct grub_fshelp_node *diro = (struct grub_fshelp_node *) dir;
+  auto int call_hook (grub_uint64_t ino, char *filename);
     
   int call_hook (grub_uint64_t ino, char *filename)
     {
@@ -370,8 +376,8 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
 
 	    de = ((struct grub_xfs_dir_entry *) 
 		  (((char *) de)+ sizeof (struct grub_xfs_dir_entry) + de->len
-		   + (smallino ? (sizeof (grub_uint32_t)
-				  : sizeof (grub_uint64_t))) - 1));
+		   + (smallino ? sizeof (grub_uint32_t)
+		      : sizeof (grub_uint64_t))) - 1);
 	  }
 	break;
       }