* util/config.c: Remove trailing newline from distributor in simple

	parsing.

diff --git a/ChangeLog b/ChangeLog
index bdfe6394cd653a8811568fff5ffb39deb43538ee..1e18a864128ccff85978d9bf553fdad7a0b2c641 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/config.c: Remove trailing newline from distributor in simple
+       parsing.
+
 2013-12-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/efi/api.h: Rename protocol and interface to avoid

diff --git a/util/config.c b/util/config.c
index e7474c6d12536ca5bb66b3b9d564038d94c617e5..ebcdd8f5e22900583949421a6c9a61b44e4caca8 100644 (file)
--- a/util/config.c
+++ b/util/config.c
@@ -52,8 +52,14 @@ grub_util_parse_config (FILE *f, struct grub_util_config *cfg, int simple)
 
          if (simple)
            {
+             char *ptr2;
              free (cfg->grub_distributor);
              cfg->grub_distributor = xstrdup (ptr);
+             for (ptr2 = cfg->grub_distributor
+                    + grub_strlen (cfg->grub_distributor) - 1;
+                  ptr2 >= cfg->grub_distributor
+                    && (*ptr2 == '\r' || *ptr2 == '\n'); ptr2--);
+             ptr2[1] = '\0';
              continue;
            }
          free (cfg->grub_distributor);