* grub-core/fs/iso9660.c (grub_iso9660_label): Rtrim the label.

diff --git a/ChangeLog b/ChangeLog
index 0d902ecd617cd35b34fcf30d445020deefebad8c..741f0f01358b3add234784b698a84c1ad0ec3a08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-26  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/fs/iso9660.c (grub_iso9660_label): Rtrim the label.
+
 2011-03-26  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Use libgeom on FreeBSD to detect partitions.

diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
index 6dc465f256f225d4b2be1c0963b670a03c14e5b3..f72249d2094c21f988229f320cef812939619c26 100644 (file)
--- a/grub-core/fs/iso9660.c
+++ b/grub-core/fs/iso9660.c
@@ -808,6 +808,15 @@ grub_iso9660_label (grub_device_t device, char **label)
                  ((grub_uint16_t *) &data->voldesc.volname, 16);
       else
         *label = grub_strndup ((char *) data->voldesc.volname, 32);
+      if (*label)
+       {
+         char *ptr;
+         for (ptr = *label; *ptr;ptr++);
+         ptr--;
+         while (ptr >= *label && *ptr == ' ')
+           *ptr-- = 0;
+       }
+
       grub_free (data);
     }
   else