* util/grub-mkfont.c (main): Report errors in FT_New_Face.

diff --git a/ChangeLog b/ChangeLog
index 9881baee9ee765e6baf381765af51837a3527185..7f5a316fcd2b64815b34a08e718ed7b22313e1bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-mkfont.c (main): Report errors in FT_New_Face.
+
 2010-12-31  Ian Campbell <ijc@hellion.org.uk>
 
        * util/grub.d/20_linux_xen.in (linux_entry): Correctly capitalize

diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index fff6a619e6d4b7e2650b26b3c965a4799457331f..983ac7065d38f61b13319b63e23544f766d31987 100644 (file)
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -1146,11 +1146,18 @@ main (int argc, char *argv[])
     {
       FT_Face ft_face;
       int size;
+      FT_Error err;
 
-      if (FT_New_Face (ft_lib, argv[optind], font_index, &ft_face))
+      err = FT_New_Face (ft_lib, argv[optind], font_index, &ft_face);
+      if (err)
        {
-         grub_util_info ("can't open file %s, index %d", argv[optind],
-                         font_index);
+         grub_printf ("can't open file %s, index %d: error %d", argv[optind],
+                      font_index, err);
+         if (err > 0 && err < (signed) ARRAY_SIZE (ft_errmsgs))
+           printf (": %s\n", ft_errmsgs[err]);
+         else
+           printf ("\n");
+
          continue;
        }