merged with upstream

fs/cpio.c

@@ -357,9 +357,9 @@ static struct grub_fs grub_cpio_fs = {
 };
 
 #ifdef MODE_USTAR
-GRUB_MOD_INIT (cpio)
-#else
 GRUB_MOD_INIT (tar)
+#else
+GRUB_MOD_INIT (cpio)
 #endif
 {
   grub_fs_register (&grub_cpio_fs);
@@ -367,9 +367,9 @@ GRUB_MOD_INIT (tar)
 }
 
 #ifdef MODE_USTAR
-GRUB_MOD_FINI (cpio)
-#else
 GRUB_MOD_FINI (tar)
+#else
+GRUB_MOD_FINI (cpio)
 #endif
 {
   grub_fs_unregister (&grub_cpio_fs);

fs/ext2.c

@@ -649,6 +649,9 @@ grub_ext2_iterate_dir (grub_fshelp_node_t dir,
       if (grub_errno)
 	return 0;
 
+      if (dirent.direntlen == 0)
+        return 0;
+
       if (dirent.namelen != 0)
 	{
 	  char filename[dirent.namelen + 1];
@@ -924,6 +927,9 @@ static struct grub_fs grub_ext2_fs =
     .label = grub_ext2_label,
     .uuid = grub_ext2_uuid,
     .mtime = grub_ext2_mtime,
+#ifdef GRUB_UTIL
+    .reserved_first_sector = 1,
+#endif
     .next = 0
   };
 

fs/fat.c

@@ -855,6 +855,9 @@ static struct grub_fs grub_fat_fs =
     .close = grub_fat_close,
     .label = grub_fat_label,
     .uuid = grub_fat_uuid,
+#ifdef GRUB_UTIL
+    .reserved_first_sector = 1,
+#endif
     .next = 0
   };
 

fs/hfsplus.c

@@ -1021,6 +1021,9 @@ static struct grub_fs grub_hfsplus_fs =
     .label = grub_hfsplus_label,
     .mtime = grub_hfsplus_mtime,
     .uuid = grub_hfsplus_uuid,
+#ifdef GRUB_UTIL
+    .reserved_first_sector = 1,
+#endif
     .next = 0
   };
 

fs/ntfs.c

@@ -1081,15 +1081,19 @@ grub_ntfs_uuid (grub_device_t device, char **uuid)
   return grub_errno;
 }
 
-static struct grub_fs grub_ntfs_fs = {
-  .name = "ntfs",
-  .dir = grub_ntfs_dir,
-  .open = grub_ntfs_open,
-  .read = grub_ntfs_read,
-  .close = grub_ntfs_close,
-  .label = grub_ntfs_label,
-  .uuid = grub_ntfs_uuid,
-  .next = 0
+static struct grub_fs grub_ntfs_fs =
+  {
+    .name = "ntfs",
+    .dir = grub_ntfs_dir,
+    .open = grub_ntfs_open,
+    .read = grub_ntfs_read,
+    .close = grub_ntfs_close,
+    .label = grub_ntfs_label,
+    .uuid = grub_ntfs_uuid,
+#ifdef GRUB_UTIL
+    .reserved_first_sector = 1,
+#endif
+    .next = 0
 };
 
 GRUB_MOD_INIT (ntfs)