2004-04-15 Yoshinori K. Okuji <okuji@enbug.org>

	* netboot/fsys_tftp.c (buf_fill): Cast 1 to unsigned short
	explicitly so that the constant doesn't extend unsigned short
	to int automatically.
	Reported by Eduard Guzovsky <eguzovsk@enterasys.com>.

	* docs/grub.texi (Invoking grub-md5-crypt): Fixed the chapter
	name.
	Reported by Martin Pool <mbp@sourcefrog.net>.

diff --git a/ChangeLog b/ChangeLog
index 798b7838c3d6376e621f28df29c2461549cc47e8..e78838b52211706e072482fca53fd1bebb6a4b46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-04-15  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * netboot/fsys_tftp.c (buf_fill): Cast 1 to unsigned short
+       explicitly so that the constant doesn't extend unsigned short
+       to int automatically.
+       Reported by Eduard Guzovsky <eguzovsk@enterasys.com>.
+
+       * docs/grub.texi (Invoking grub-md5-crypt): Fixed the chapter
+       name.
+       Reported by Martin Pool <mbp@sourcefrog.net>.
+
 2004-04-04  Yoshinori K. Okuji  <okuji@enbug.org>
 
        * configure.ac (STAGE2_CFLAGS): Check if -fno-stack-protector is

diff --git a/THANKS b/THANKS
index 87b7b190b5f1f822922fdc3c112b5fcb28428576..6b6cfe63b01e22d0ca2782275b576120efd1ee87 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -32,6 +32,7 @@ Danilo Godec <danci@agenda.si>
 Dennis Kitzman <dennis-kitzman@uiowa.edu>
 Derrik Pates <dpates@dsdk12.net>
 Edmund GRIMLEY EVANS <edmundo@rano.demon.co.uk>
+Eduard Guzovsky <eguzovsk@enterasys.com>
 Edward Killips <ekillips@triton.net>
 Egmont Koblinger <egmont@uhulinux.hu>
 Eric Hanchrow <erich@microsoft.com>

diff --git a/docs/grub.texi b/docs/grub.texi
index e0096be999e533301aff144c50f510602f0d8667..91cac5b34d4f5d2090d03d7b9e61ee6fd357592f 100644 (file)
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -3466,7 +3466,7 @@ Use @var{file} as the grub shell.
 
 
 @node Invoking grub-terminfo
-@chapter Invoking grub-md5-crypt
+@chapter Invoking grub-terminfo
 
 The program @command{grub-terminfo} generates a terminfo command from
 a terminfo name (@pxref{terminfo}). The result can be used in the

diff --git a/netboot/fsys_tftp.c b/netboot/fsys_tftp.c
index 05dea899aceda0e7913bde7e598211948ff423a7..b0233e8fef8c2e84f168494d53d2e4105ef74a12 100644 (file)
--- a/netboot/fsys_tftp.c
+++ b/netboot/fsys_tftp.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+ *  Copyright (C) 2000,2001,2002,2004  Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -208,7 +208,7 @@ buf_fill (int abort)
        /* Neither TFTP_OACK nor TFTP_DATA.  */
        break;
 
-      if ((block || bcounter) && (block != prevblock + 1))
+      if ((block || bcounter) && (block != prevblock + (unsigned short) 1))
        /* Block order should be continuous */
        tp.u.ack.block = htons (block = prevblock);