From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 18 Jan 2010 19:34:26 +0000 (+0000)
Subject: Resync with trunk
X-Git-Tag: 1.98~161^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d8b4e4e269f13fba1d805757939341b6077d398;p=thirdparty%2Fgrub.git

Resync with trunk
---

3d8b4e4e269f13fba1d805757939341b6077d398
diff --cc conf/common.rmk
index ee503f8b6,ffcdf045c..a83bd0fca
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@@ -88,9 -88,14 +88,17 @@@ endi
  bin_UTILITIES += grub-mkrelpath
  grub_mkrelpath_SOURCES = gnulib/progname.c util/grub-mkrelpath.c util/misc.c
  
 +bin_UTILITIES += grub-bin2h
 +grub_bin2h_SOURCES = gnulib/progname.c util/bin2h.c
 +
+ # For grub-script-check.
+ bin_UTILITIES += grub-script-check
+ util/grub-script-check.c_DEPENDENCIES = grub_script_check_init.h
+ grub_script_check_SOURCES = gnulib/progname.c util/grub-script-check.c util/misc.c \
+ 	script/main.c script/script.c script/function.c script/lexer.c \
+ 	kern/handler.c kern/err.c kern/parser.c kern/list.c \
+ 	kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c
+ 
  # For the parser.
  grub_script.tab.c grub_script.tab.h: script/parser.y
  	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y
diff --cc util/grub-mkfont.c
index 3dd0bafdd,fcd35afd4..38906a70e
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@@ -639,25 -597,8 +639,25 @@@ main (int argc, char *argv[]
  	  }
      }
  
 +  if (file_format == ASCII_BITMAPS && font_info.num_range > 0)
 +    {
 +      grub_util_error ("Option --ascii-bitmaps doesn't accept ranges (use ASCII).");
 +      return 1;
 +    }
 +
 +  else if (file_format == ASCII_BITMAPS)
 +    {
 +      font_info.ranges = xrealloc (font_info.ranges,
 +				   GRUB_FONT_RANGE_BLOCK *
 +				   sizeof (grub_uint32_t) * 2);
 +
 +      font_info.ranges[0] = (grub_uint32_t) 0x00;
 +      font_info.ranges[1] = (grub_uint32_t) 0x7f;
 +      font_info.num_range = 1;
 +    }
 +
    if (! output_file)
-     grub_util_error ("No output file is specified.");
+     grub_util_error ("no output file is specified");
  
    if (FT_Init_FreeType (&ft_lib))
      grub_util_error ("FT_Init_FreeType fails");