From 98e2f50661b63494a7d94d3ad04d31669468f9b4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 24 Jun 2011 13:02:49 +0200
Subject: [PATCH] 	* grub-core/fs/iso9660.c (grub_iso9660_iterate_dir):
 Skip . and ..

---
 ChangeLog              |  4 ++++
 grub-core/fs/iso9660.c | 11 ++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1e7a468ec..d21fa1026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/iso9660.c (grub_iso9660_iterate_dir): Skip . and ..
+
 2011-06-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Load
diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
index 508cc5b71..5b53ca597 100644
--- a/grub-core/fs/iso9660.c
+++ b/grub-core/fs/iso9660.c
@@ -598,7 +598,7 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
       return 0;
     }
 
-  while (offset < dir->size)
+  for (; offset < dir->size; offset += dirent.len)
     {
       if (grub_disk_read (dir->data->disk,
 			  (dir->blk << GRUB_ISO9660_LOG2_BLKSZ)
@@ -676,10 +676,9 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
 	    if (filename)
 	      *filename = '\0';
 
-	    if (dirent.namelen == 1 && name[0] == 0)
-	      filename = ".";
-	    else if (dirent.namelen == 1 && name[0] == 1)
-	      filename = "..";
+	    /* . and .. */
+	    if (dirent.namelen == 1 && (name[0] == 0 || name[0] == 1))
+	      continue;
 	    else
 	      filename = name;
 	  }
@@ -712,8 +711,6 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
 	if (filename_alloc)
 	  grub_free (filename);
       }
-
-      offset += dirent.len;
     }
 
   return 0;