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

2004-04-29 Jeroen Dekkers <jeroen@dekkers.cx>

Browse source 
* stage2/char_io.c (grub_memcmp): Define for stage1.5 too.

	* stage2/fsys_iso9660.c (iso9660_mount): Use memcmp() instead of
	__builtin_memcmp().
	(iso9660_dir): Likewise.
This commit is contained in:
jeroen 2004-04-29 09:57:09 +00:00
parent 6525b81507
commit 50396703ad
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2004-04-29 Jeroen Dekkers <jeroen@dekkers.cx>
* stage2/char_io.c (grub_memcmp): Define for stage1.5 too.
* stage2/fsys_iso9660.c (iso9660_mount): Use memcmp() instead of
__builtin_memcmp().
(iso9660_dir): Likewise.
2004-04-26 Christian Jones <chjones@aleph0.com> 2004-04-26 Christian Jones <chjones@aleph0.com>
* docs/grub.texi (Making a GRUB bootable CD-ROM): minor edits, * docs/grub.texi (Making a GRUB bootable CD-ROM): minor edits,

4
stage2/char_io.c
View file

@ -1,7 +1,7 @@
/* char_io.c - basic console input and output */ /* char_io.c - basic console input and output */
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002 Free Software Foundation, Inc. * Copyright (C) 1999,2000,2001,2002,2004 Free Software Foundation, Inc.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -921,7 +921,6 @@ grub_isspace (int c)
return 0; return 0;
} }
#ifndef STAGE1_5
int int
grub_memcmp (const char *s1, const char *s2, int n) grub_memcmp (const char *s1, const char *s2, int n)
{ {
@ -939,6 +938,7 @@ grub_memcmp (const char *s1, const char *s2, int n)
return 0; return 0;
} }
#ifndef STAGE1_5
int int
grub_strncat (char *s1, const char *s2, int n) grub_strncat (char *s1, const char *s2, int n)
{ {

4
stage2/fsys_iso9660.c
View file

@ -120,7 +120,7 @@ iso9660_mount (void)
break; break;
/* check ISO_VD_PRIMARY and ISO_STANDARD_ID */ /* check ISO_VD_PRIMARY and ISO_STANDARD_ID */
if (PRIMDESC->type.l == ISO_VD_PRIMARY if (PRIMDESC->type.l == ISO_VD_PRIMARY
&& !__builtin_memcmp(PRIMDESC->id, ISO_STANDARD_ID, sizeof(PRIMDESC->id))) && !memcmp(PRIMDESC->id, ISO_STANDARD_ID, sizeof(PRIMDESC->id)))
{ {
ISO_SUPER->vol_sector = sector; ISO_SUPER->vol_sector = sector;
INODE->file_start = 0; INODE->file_start = 0;
@ -344,7 +344,7 @@ iso9660_dir (char *dirname)
filemax = MAXINT; filemax = MAXINT;
if (name_len >= pathlen if (name_len >= pathlen
&& !__builtin_memcmp(name, dirname, pathlen)) && !memcmp(name, dirname, pathlen))
{ {
if (dirname[pathlen] == '/' || !print_possibilities) if (dirname[pathlen] == '/' || !print_possibilities)
{ {