From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 23 Oct 2010 18:34:50 +0000 (+0200)
Subject: 	* grub-core/kern/emu/misc.c
X-Git-Tag: 1.99~369
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c81f8b349e4844d65d5b1717a1ebe61defd6062;p=thirdparty%2Fgrub.git

	* grub-core/kern/emu/misc.c
	(grub_make_system_path_relative_to_its_root): Revert r2882.
---

diff --git a/ChangeLog b/ChangeLog
index 85ff4d088..bdeb62500 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/misc.c
+	(grub_make_system_path_relative_to_its_root): Revert r2882.
+
 2010-10-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/lib/relocator.c (grub_relocator_subchunk): Remove now
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
index cfc143bf9..d8db3be9d 100644
--- a/grub-core/kern/emu/misc.c
+++ b/grub-core/kern/emu/misc.c
@@ -406,7 +406,21 @@ grub_make_system_path_relative_to_its_root (const char *path)
 
       /* buf is another filesystem; we found it.  */
       if (st.st_dev != num)
-	break;
+	{
+	  /* offset == 0 means path given is the mount point.
+	     This works around special-casing of "/" in Un*x.  This function never
+	     prints trailing slashes (so that its output can be appended a slash
+	     unconditionally).  Each slash in is considered a preceding slash, and
+	     therefore the root directory is an empty string.  */
+	  if (offset == 0)
+	    {
+	      free (buf);
+	      free (buf2);
+	      return xstrdup ("");
+	    }
+	  else
+	    break;
+	}
 
       offset = p - buf;
       /* offset == 1 means root directory.  */
@@ -434,10 +448,7 @@ grub_make_system_path_relative_to_its_root (const char *path)
     }
 #endif
 
-  /* This works around special-casing of "/" in Un*x.  This function never
-     prints trailing slashes (so that its output can be appended a slash
-     unconditionally).  Each slash in it is considered a preceding slash,
-     and therefore the root directory is an empty string.  */
+  /* Remove trailing slashes, return empty string if root directory.  */
   len = strlen (buf3);
   while (len > 0 && buf3[len - 1] == '/')
     {