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>.
This commit is contained in:
okuji 2004-04-15 11:50:29 +00:00
parent 0accb2cab8
commit 4e69adb6ab
4 changed files with 15 additions and 3 deletions

View file

@ -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

1
THANKS
View file

@ -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>

View file

@ -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

View file

@ -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);