vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2004-03-14 Jeroen Dekkers <jeroen@dekkers.cx>

Browse source 
* Makefile.in: Update copyright.
	* genmodsrc.sh: Likewise.
	* gensymlist.sh: Likewise.
	* term/i386/pc/vga.c: Indent correctly.

	* util/i386/pc/pupa-mkimage.c (usage): Use PACKAGE_BUGREPORT as
	bugreporting address.
	* util/i386/pc/pupa-setup.c (usage): Likewise,
	(main): Call pupa_ext2_init and pupa_ext2_fini.

	* fs/fat.c (log2): Renamed to ...
	(fat_log2): ... this.
	All callers changed.
	* kern/misc.c (memcpy): Alias to pupa_memmove.
	* loader/i386/pc/multiboot.c (pupa_rescue_cmd_multiboot): Fix
	lvalue cast.
	* util/console.c (pupa_ncurses_fini): Return 0.

	* util/i386/pc/biosdisk.c (pupa_util_biosdisk_open)[__linux__]:
	Move fail label here.
	[__GNU__]: Don't warn when using stat.
	(open_device)[!__linux__]: Check if FD < 0 instead of !FD.
	(pupa_util_biosdisk_get_pupa_dev)[__GNU__]: Change type of N to
	long int. Use strtol instead of strtoul.
This commit is contained in:
jeroen 2004-03-14 17:48:25 +00:00
parent db1771cfbe
commit 8c8cc20511
12 changed files with 149 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

4
loader/i386/pc/multiboot.c
View file

@ -1,7 +1,7 @@
/* multiboot.c - boot a multiboot OS image. */
/*
* PUPA -- Preliminary Universal Programming Architecture for GRUB
* Copyright (C) 2003 Free Software Foundation, Inc.
* Copyright (C) 2003, 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
@ -119,7 +119,7 @@ pupa_rescue_cmd_multiboot (int argc, char *argv[])
be at least 12 bytes and aligned on a 4-byte boundary. */
for (header = (struct pupa_multiboot_header *) buffer;
((char *) header <= buffer + len - 12) || (header = 0);
(char *)header += 4)
header = (struct pupa_multiboot_header *) ((char *)header + 4))
{
if (header->magic == PUPA_MB_MAGIC
&& !(header->magic + header->flags + header->checksum))