diff --git a/ChangeLog b/ChangeLog index 798b7838c..e78838b52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2004-04-15 Yoshinori K. Okuji + + * 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 . + + * docs/grub.texi (Invoking grub-md5-crypt): Fixed the chapter + name. + Reported by Martin Pool . + 2004-04-04 Yoshinori K. Okuji * configure.ac (STAGE2_CFLAGS): Check if -fno-stack-protector is diff --git a/THANKS b/THANKS index 87b7b190b..6b6cfe63b 100644 --- a/THANKS +++ b/THANKS @@ -32,6 +32,7 @@ Danilo Godec Dennis Kitzman Derrik Pates Edmund GRIMLEY EVANS +Eduard Guzovsky Edward Killips Egmont Koblinger Eric Hanchrow diff --git a/docs/grub.texi b/docs/grub.texi index e0096be99..91cac5b34 100644 --- 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 05dea899a..b0233e8fe 100644 --- 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);