2003-10-29 18:44:30 +00:00
|
|
|
|
/* ext2.c - Second Extended filesystem */
|
|
|
|
|
/*
|
2004-04-04 13:46:03 +00:00
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
2007-03-19 00:04:29 +00:00
|
|
|
|
* Copyright (C) 2003,2004,2005,2007 Free Software Foundation, Inc.
|
2003-10-29 18:44:30 +00:00
|
|
|
|
*
|
|
|
|
|
* 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
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* Magic value used to identify an ext2 filesystem. */
|
|
|
|
|
#define EXT2_MAGIC 0xEF53
|
|
|
|
|
/* Amount of indirect blocks in an inode. */
|
|
|
|
|
#define INDIRECT_BLOCKS 12
|
|
|
|
|
/* Maximum lenght of a pathname. */
|
|
|
|
|
#define EXT2_PATH_MAX 4096
|
|
|
|
|
/* Maximum nesting of symlinks, used to prevent a loop. */
|
|
|
|
|
#define EXT2_MAX_SYMLINKCNT 8
|
|
|
|
|
|
2007-03-19 00:04:29 +00:00
|
|
|
|
/* The good old revision and the default inode size. */
|
|
|
|
|
#define EXT2_GOOD_OLD_REVISION 0
|
|
|
|
|
#define EXT2_GOOD_OLD_INODE_SIZE 128
|
|
|
|
|
|
2003-10-29 18:44:30 +00:00
|
|
|
|
/* Filetype used in directory entry. */
|
2004-08-13 22:33:35 +00:00
|
|
|
|
#define FILETYPE_UNKNOWN 0
|
2004-09-11 11:42:43 +00:00
|
|
|
|
#define FILETYPE_REG 1
|
2003-10-29 18:44:30 +00:00
|
|
|
|
#define FILETYPE_DIRECTORY 2
|
|
|
|
|
#define FILETYPE_SYMLINK 7
|
|
|
|
|
|
2004-06-27 10:43:11 +00:00
|
|
|
|
/* Filetype information as used in inodes. */
|
|
|
|
|
#define FILETYPE_INO_MASK 0170000
|
2004-09-11 11:42:43 +00:00
|
|
|
|
#define FILETYPE_INO_REG 0100000
|
2004-06-27 10:43:11 +00:00
|
|
|
|
#define FILETYPE_INO_DIRECTORY 0040000
|
|
|
|
|
#define FILETYPE_INO_SYMLINK 0120000
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
#include <grub/err.h>
|
|
|
|
|
#include <grub/file.h>
|
|
|
|
|
#include <grub/mm.h>
|
|
|
|
|
#include <grub/misc.h>
|
|
|
|
|
#include <grub/disk.h>
|
|
|
|
|
#include <grub/dl.h>
|
|
|
|
|
#include <grub/types.h>
|
2004-09-11 11:42:43 +00:00
|
|
|
|
#include <grub/fshelp.h>
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
|
|
|
|
/* Log2 size of ext2 block in 512 blocks. */
|
|
|
|
|
#define LOG2_EXT2_BLOCK_SIZE(data) \
|
2004-04-04 13:46:03 +00:00
|
|
|
|
(grub_le_to_cpu32 (data->sblock.log2_block_size) + 1)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
|
|
|
|
/* Log2 size of ext2 block in bytes. */
|
|
|
|
|
#define LOG2_BLOCK_SIZE(data) \
|
2004-04-04 13:46:03 +00:00
|
|
|
|
(grub_le_to_cpu32 (data->sblock.log2_block_size) + 10)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
|
|
|
|
/* The size of an ext2 block in bytes. */
|
2007-03-19 00:04:29 +00:00
|
|
|
|
#define EXT2_BLOCK_SIZE(data) (1 << LOG2_BLOCK_SIZE (data))
|
|
|
|
|
|
|
|
|
|
/* The revision level. */
|
|
|
|
|
#define EXT2_REVISION(data) grub_le_to_cpu32 (data->sblock.revision_level)
|
|
|
|
|
|
|
|
|
|
/* The inode size. */
|
|
|
|
|
#define EXT2_INODE_SIZE(data) \
|
|
|
|
|
(EXT2_REVISION (data) == EXT2_GOOD_OLD_REVISION \
|
|
|
|
|
? EXT2_GOOD_OLD_INODE_SIZE \
|
|
|
|
|
: grub_le_to_cpu16 (data->sblock.inode_size))
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
|
|
|
|
/* The ext2 superblock. */
|
2004-09-11 11:42:43 +00:00
|
|
|
|
struct grub_ext2_sblock
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_uint32_t total_inodes;
|
|
|
|
|
grub_uint32_t total_blocks;
|
|
|
|
|
grub_uint32_t reserved_blocks;
|
|
|
|
|
grub_uint32_t free_blocks;
|
|
|
|
|
grub_uint32_t free_inodes;
|
|
|
|
|
grub_uint32_t first_data_block;
|
|
|
|
|
grub_uint32_t log2_block_size;
|
|
|
|
|
grub_uint32_t log2_fragment_size;
|
|
|
|
|
grub_uint32_t blocks_per_group;
|
|
|
|
|
grub_uint32_t fragments_per_group;
|
|
|
|
|
grub_uint32_t inodes_per_group;
|
|
|
|
|
grub_uint32_t mtime;
|
|
|
|
|
grub_uint32_t utime;
|
|
|
|
|
grub_uint16_t mnt_count;
|
|
|
|
|
grub_uint16_t max_mnt_count;
|
|
|
|
|
grub_uint16_t magic;
|
|
|
|
|
grub_uint16_t fs_state;
|
|
|
|
|
grub_uint16_t error_handling;
|
|
|
|
|
grub_uint16_t minor_revision_level;
|
|
|
|
|
grub_uint32_t lastcheck;
|
|
|
|
|
grub_uint32_t checkinterval;
|
|
|
|
|
grub_uint32_t creator_os;
|
|
|
|
|
grub_uint32_t revision_level;
|
|
|
|
|
grub_uint16_t uid_reserved;
|
|
|
|
|
grub_uint16_t gid_reserved;
|
|
|
|
|
grub_uint32_t first_inode;
|
|
|
|
|
grub_uint16_t inode_size;
|
|
|
|
|
grub_uint16_t block_group_number;
|
|
|
|
|
grub_uint32_t feature_compatibility;
|
|
|
|
|
grub_uint32_t feature_incompat;
|
|
|
|
|
grub_uint32_t feature_ro_compat;
|
|
|
|
|
grub_uint32_t unique_id[4];
|
2003-10-29 18:44:30 +00:00
|
|
|
|
char volume_name[16];
|
|
|
|
|
char last_mounted_on[64];
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_uint32_t compression_info;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* The ext2 blockgroup. */
|
2004-09-11 11:42:43 +00:00
|
|
|
|
struct grub_ext2_block_group
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_uint32_t block_id;
|
|
|
|
|
grub_uint32_t inode_id;
|
|
|
|
|
grub_uint32_t inode_table_id;
|
|
|
|
|
grub_uint16_t free_blocks;
|
|
|
|
|
grub_uint16_t free_inodes;
|
2007-03-19 00:04:29 +00:00
|
|
|
|
grub_uint16_t used_dirs;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_uint16_t pad;
|
|
|
|
|
grub_uint32_t reserved[3];
|
2003-10-29 18:44:30 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* The ext2 inode. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
struct grub_ext2_inode
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_uint16_t mode;
|
|
|
|
|
grub_uint16_t uid;
|
|
|
|
|
grub_uint32_t size;
|
|
|
|
|
grub_uint32_t atime;
|
|
|
|
|
grub_uint32_t ctime;
|
|
|
|
|
grub_uint32_t mtime;
|
|
|
|
|
grub_uint32_t dtime;
|
|
|
|
|
grub_uint16_t gid;
|
|
|
|
|
grub_uint16_t nlinks;
|
|
|
|
|
grub_uint32_t blockcnt; /* Blocks of 512 bytes!! */
|
|
|
|
|
grub_uint32_t flags;
|
|
|
|
|
grub_uint32_t osd1;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
union
|
|
|
|
|
{
|
|
|
|
|
struct datablocks
|
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_uint32_t dir_blocks[INDIRECT_BLOCKS];
|
|
|
|
|
grub_uint32_t indir_block;
|
|
|
|
|
grub_uint32_t double_indir_block;
|
|
|
|
|
grub_uint32_t tripple_indir_block;
|
2003-11-09 22:44:14 +00:00
|
|
|
|
} blocks;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
char symlink[60];
|
|
|
|
|
};
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_uint32_t version;
|
|
|
|
|
grub_uint32_t acl;
|
|
|
|
|
grub_uint32_t dir_acl;
|
|
|
|
|
grub_uint32_t fragment_addr;
|
|
|
|
|
grub_uint32_t osd2[3];
|
2003-10-29 18:44:30 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* The header of an ext2 directory entry. */
|
|
|
|
|
struct ext2_dirent
|
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_uint32_t inode;
|
|
|
|
|
grub_uint16_t direntlen;
|
|
|
|
|
grub_uint8_t namelen;
|
|
|
|
|
grub_uint8_t filetype;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
};
|
|
|
|
|
|
2004-09-11 11:42:43 +00:00
|
|
|
|
struct grub_fshelp_node
|
|
|
|
|
{
|
|
|
|
|
struct grub_ext2_data *data;
|
|
|
|
|
struct grub_ext2_inode inode;
|
|
|
|
|
int ino;
|
|
|
|
|
int inode_read;
|
|
|
|
|
};
|
|
|
|
|
|
2003-10-29 18:44:30 +00:00
|
|
|
|
/* Information about a "mounted" ext2 filesystem. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
struct grub_ext2_data
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-09-11 11:42:43 +00:00
|
|
|
|
struct grub_ext2_sblock sblock;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_disk_t disk;
|
2004-09-11 11:42:43 +00:00
|
|
|
|
struct grub_ext2_inode *inode;
|
|
|
|
|
struct grub_fshelp_node diropen;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
};
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
static grub_dl_t my_mod;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
#endif
|
2007-03-19 00:04:29 +00:00
|
|
|
|
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2007-03-19 00:04:29 +00:00
|
|
|
|
|
2003-10-29 18:44:30 +00:00
|
|
|
|
/* Read into BLKGRP the blockgroup descriptor of blockgroup GROUP of
|
|
|
|
|
the mounted filesystem DATA. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
inline static grub_err_t
|
|
|
|
|
grub_ext2_blockgroup (struct grub_ext2_data *data, int group,
|
2004-09-11 11:42:43 +00:00
|
|
|
|
struct grub_ext2_block_group *blkgrp)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-09-11 11:42:43 +00:00
|
|
|
|
return grub_disk_read (data->disk,
|
2004-04-04 13:46:03 +00:00
|
|
|
|
((grub_le_to_cpu32 (data->sblock.first_data_block) + 1)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
<< LOG2_EXT2_BLOCK_SIZE (data)),
|
2004-09-11 11:42:43 +00:00
|
|
|
|
group * sizeof (struct grub_ext2_block_group),
|
|
|
|
|
sizeof (struct grub_ext2_block_group), (char *) blkgrp);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-09-11 11:42:43 +00:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
grub_ext2_read_block (grub_fshelp_node_t node, int fileblock)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-09-11 11:42:43 +00:00
|
|
|
|
struct grub_ext2_data *data = node->data;
|
|
|
|
|
struct grub_ext2_inode *inode = &node->inode;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
int blknr;
|
2004-09-11 11:42:43 +00:00
|
|
|
|
int blksz = EXT2_BLOCK_SIZE (data);
|
|
|
|
|
int log2_blksz = LOG2_EXT2_BLOCK_SIZE (data);
|
|
|
|
|
|
2003-10-29 18:44:30 +00:00
|
|
|
|
/* Direct blocks. */
|
|
|
|
|
if (fileblock < INDIRECT_BLOCKS)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
blknr = grub_le_to_cpu32 (inode->blocks.dir_blocks[fileblock]);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
/* Indirect. */
|
2004-09-11 11:42:43 +00:00
|
|
|
|
else if (fileblock < INDIRECT_BLOCKS + blksz / 4)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-09-11 11:42:43 +00:00
|
|
|
|
grub_uint32_t indir[blksz / 4];
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_disk_read (data->disk,
|
|
|
|
|
grub_le_to_cpu32 (inode->blocks.indir_block)
|
2004-09-11 11:42:43 +00:00
|
|
|
|
<< log2_blksz,
|
|
|
|
|
0, blksz, (char *) indir))
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_errno;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
blknr = grub_le_to_cpu32 (indir[fileblock - INDIRECT_BLOCKS]);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
|
|
|
|
/* Double indirect. */
|
2007-03-19 00:04:29 +00:00
|
|
|
|
else if (fileblock < INDIRECT_BLOCKS + blksz / 4 * (blksz / 4 + 1))
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-09-11 11:42:43 +00:00
|
|
|
|
unsigned int perblock = blksz / 4;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
unsigned int rblock = fileblock - (INDIRECT_BLOCKS
|
2004-09-11 11:42:43 +00:00
|
|
|
|
+ blksz / 4);
|
|
|
|
|
grub_uint32_t indir[blksz / 4];
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_disk_read (data->disk,
|
|
|
|
|
grub_le_to_cpu32 (inode->blocks.double_indir_block)
|
2004-09-11 11:42:43 +00:00
|
|
|
|
<< log2_blksz,
|
|
|
|
|
0, blksz, (char *) indir))
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_errno;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_disk_read (data->disk,
|
|
|
|
|
grub_le_to_cpu32 (indir[rblock / perblock])
|
2004-09-11 11:42:43 +00:00
|
|
|
|
<< log2_blksz,
|
|
|
|
|
0, blksz, (char *) indir))
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_errno;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
blknr = grub_le_to_cpu32 (indir[rblock % perblock]);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
|
|
|
|
/* Tripple indirect. */
|
|
|
|
|
else
|
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
|
2003-10-29 18:44:30 +00:00
|
|
|
|
"ext2fs doesn't support tripple indirect blocks");
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
|
blknr = -1;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-09-11 11:42:43 +00:00
|
|
|
|
return blknr;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-09-11 11:42:43 +00:00
|
|
|
|
|
2003-10-29 18:44:30 +00:00
|
|
|
|
/* Read LEN bytes from the file described by DATA starting with byte
|
|
|
|
|
POS. Return the amount of read bytes in READ. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_ssize_t
|
2004-09-11 11:42:43 +00:00
|
|
|
|
grub_ext2_read_file (grub_fshelp_node_t node,
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
|
void (*read_hook) (grub_disk_addr_t sector,
|
2004-02-15 10:09:11 +00:00
|
|
|
|
unsigned offset, unsigned length),
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
|
int pos, grub_size_t len, char *buf)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-09-11 11:42:43 +00:00
|
|
|
|
return grub_fshelp_read_file (node->data->disk, node, read_hook,
|
|
|
|
|
pos, len, buf, grub_ext2_read_block,
|
|
|
|
|
node->inode.size,
|
|
|
|
|
LOG2_EXT2_BLOCK_SIZE (node->data));
|
|
|
|
|
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Read the inode INO for the file described by DATA into INODE. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_ext2_read_inode (struct grub_ext2_data *data,
|
|
|
|
|
int ino, struct grub_ext2_inode *inode)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-09-11 11:42:43 +00:00
|
|
|
|
struct grub_ext2_block_group blkgrp;
|
|
|
|
|
struct grub_ext2_sblock *sblock = &data->sblock;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
int inodes_per_block;
|
|
|
|
|
|
|
|
|
|
unsigned int blkno;
|
|
|
|
|
unsigned int blkoff;
|
|
|
|
|
|
|
|
|
|
/* It is easier to calculate if the first inode is 0. */
|
|
|
|
|
ino--;
|
|
|
|
|
|
2007-03-19 00:04:29 +00:00
|
|
|
|
grub_ext2_blockgroup (data,
|
|
|
|
|
ino / grub_le_to_cpu32 (sblock->inodes_per_group),
|
2003-10-29 18:44:30 +00:00
|
|
|
|
&blkgrp);
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_errno)
|
|
|
|
|
return grub_errno;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2007-03-19 00:04:29 +00:00
|
|
|
|
inodes_per_block = EXT2_BLOCK_SIZE (data) / EXT2_INODE_SIZE (data);
|
2004-04-04 13:46:03 +00:00
|
|
|
|
blkno = (ino % grub_le_to_cpu32 (sblock->inodes_per_group))
|
2003-10-29 18:44:30 +00:00
|
|
|
|
/ inodes_per_block;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
blkoff = (ino % grub_le_to_cpu32 (sblock->inodes_per_group))
|
2003-10-29 18:44:30 +00:00
|
|
|
|
% inodes_per_block;
|
|
|
|
|
|
|
|
|
|
/* Read the inode. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_disk_read (data->disk,
|
|
|
|
|
((grub_le_to_cpu32 (blkgrp.inode_table_id) + blkno)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
<< LOG2_EXT2_BLOCK_SIZE (data)),
|
2007-03-19 00:04:29 +00:00
|
|
|
|
EXT2_INODE_SIZE (data) * blkoff,
|
2004-04-04 13:46:03 +00:00
|
|
|
|
sizeof (struct grub_ext2_inode), (char *) inode))
|
|
|
|
|
return grub_errno;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static struct grub_ext2_data *
|
|
|
|
|
grub_ext2_mount (grub_disk_t disk)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
struct grub_ext2_data *data;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
data = grub_malloc (sizeof (struct grub_ext2_data));
|
2003-10-29 18:44:30 +00:00
|
|
|
|
if (!data)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Read the superblock. */
|
2004-09-11 11:42:43 +00:00
|
|
|
|
grub_disk_read (disk, 1 * 2, 0, sizeof (struct grub_ext2_sblock),
|
2007-03-19 00:04:29 +00:00
|
|
|
|
(char *) &data->sblock);
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_errno)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
/* Make sure this is an ext2 filesystem. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_le_to_cpu16 (data->sblock.magic) != EXT2_MAGIC)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
goto fail;
|
|
|
|
|
|
2004-09-11 11:42:43 +00:00
|
|
|
|
data->diropen.data = data;
|
|
|
|
|
data->diropen.ino = 2;
|
|
|
|
|
data->diropen.inode_read = 1;
|
|
|
|
|
|
|
|
|
|
data->inode = &data->diropen.inode;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
data->disk = disk;
|
2004-09-11 11:42:43 +00:00
|
|
|
|
|
|
|
|
|
grub_ext2_read_inode (data, 2, data->inode);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
2003-10-29 18:44:30 +00:00
|
|
|
|
return data;
|
|
|
|
|
|
|
|
|
|
fail:
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_error (GRUB_ERR_BAD_FS, "not an ext2 filesystem");
|
|
|
|
|
grub_free (data);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-09-11 11:42:43 +00:00
|
|
|
|
static char *
|
|
|
|
|
grub_ext2_read_symlink (grub_fshelp_node_t node)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-09-11 11:42:43 +00:00
|
|
|
|
char *symlink;
|
|
|
|
|
struct grub_fshelp_node *diro = node;
|
|
|
|
|
|
2007-03-19 00:04:29 +00:00
|
|
|
|
if (! diro->inode_read)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-09-11 11:42:43 +00:00
|
|
|
|
grub_ext2_read_inode (diro->data, diro->ino, &diro->inode);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
return 0;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
2004-09-11 11:42:43 +00:00
|
|
|
|
|
|
|
|
|
symlink = grub_malloc (grub_le_to_cpu32 (diro->inode.size) + 1);
|
2007-03-19 00:04:29 +00:00
|
|
|
|
if (! symlink)
|
2004-09-11 11:42:43 +00:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* If the filesize of the symlink is bigger than
|
|
|
|
|
60 the symlink is stored in a separate block,
|
|
|
|
|
otherwise it is stored in the inode. */
|
|
|
|
|
if (grub_le_to_cpu32 (diro->inode.size) <= 60)
|
|
|
|
|
grub_strncpy (symlink,
|
|
|
|
|
diro->inode.symlink,
|
|
|
|
|
grub_le_to_cpu32 (diro->inode.size));
|
|
|
|
|
else
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-09-11 11:42:43 +00:00
|
|
|
|
grub_ext2_read_file (diro, 0, 0,
|
|
|
|
|
grub_le_to_cpu32 (diro->inode.size),
|
|
|
|
|
symlink);
|
|
|
|
|
if (grub_errno)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-09-11 11:42:43 +00:00
|
|
|
|
grub_free (symlink);
|
|
|
|
|
return 0;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
2004-09-11 11:42:43 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
symlink[grub_le_to_cpu32 (diro->inode.size)] = '\0';
|
|
|
|
|
return symlink;
|
|
|
|
|
}
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2004-09-11 11:42:43 +00:00
|
|
|
|
static int
|
|
|
|
|
grub_ext2_iterate_dir (grub_fshelp_node_t dir,
|
|
|
|
|
int NESTED_FUNC_ATTR
|
|
|
|
|
(*hook) (const char *filename,
|
|
|
|
|
enum grub_fshelp_filetype filetype,
|
|
|
|
|
grub_fshelp_node_t node))
|
|
|
|
|
{
|
|
|
|
|
unsigned int fpos = 0;
|
|
|
|
|
struct grub_fshelp_node *diro = (struct grub_fshelp_node *) dir;
|
|
|
|
|
|
2007-03-19 00:04:29 +00:00
|
|
|
|
if (! diro->inode_read)
|
2004-09-11 11:42:43 +00:00
|
|
|
|
{
|
|
|
|
|
grub_ext2_read_inode (diro->data, diro->ino, &diro->inode);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Search the file. */
|
|
|
|
|
while (fpos < grub_le_to_cpu32 (diro->inode.size))
|
|
|
|
|
{
|
|
|
|
|
struct ext2_dirent dirent;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2004-09-11 11:42:43 +00:00
|
|
|
|
grub_ext2_read_file (diro, 0, fpos, sizeof (struct ext2_dirent),
|
|
|
|
|
(char *) &dirent);
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_errno)
|
2004-09-11 11:42:43 +00:00
|
|
|
|
return 0;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2004-09-11 11:42:43 +00:00
|
|
|
|
if (dirent.namelen != 0)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-09-11 11:42:43 +00:00
|
|
|
|
char filename[dirent.namelen + 1];
|
|
|
|
|
struct grub_fshelp_node *fdiro;
|
|
|
|
|
enum grub_fshelp_filetype type = GRUB_FSHELP_UNKNOWN;
|
|
|
|
|
|
|
|
|
|
grub_ext2_read_file (diro, 0, fpos + sizeof (struct ext2_dirent),
|
|
|
|
|
dirent.namelen, filename);
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_errno)
|
2004-09-11 11:42:43 +00:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
fdiro = grub_malloc (sizeof (struct grub_fshelp_node));
|
2007-03-19 00:04:29 +00:00
|
|
|
|
if (! fdiro)
|
2004-09-11 11:42:43 +00:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
fdiro->data = diro->data;
|
|
|
|
|
fdiro->ino = grub_le_to_cpu32 (dirent.inode);
|
|
|
|
|
|
|
|
|
|
filename[dirent.namelen] = '\0';
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2004-09-11 11:42:43 +00:00
|
|
|
|
if (dirent.filetype != FILETYPE_UNKNOWN)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-09-11 11:42:43 +00:00
|
|
|
|
fdiro->inode_read = 0;
|
|
|
|
|
|
|
|
|
|
if (dirent.filetype == FILETYPE_DIRECTORY)
|
|
|
|
|
type = GRUB_FSHELP_DIR;
|
|
|
|
|
else if (dirent.filetype == FILETYPE_SYMLINK)
|
|
|
|
|
type = GRUB_FSHELP_SYMLINK;
|
|
|
|
|
else if (dirent.filetype == FILETYPE_REG)
|
|
|
|
|
type = GRUB_FSHELP_REG;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* The filetype can not be read from the dirent, read
|
|
|
|
|
the inode to get more information. */
|
2007-03-19 00:04:29 +00:00
|
|
|
|
grub_ext2_read_inode (diro->data,
|
|
|
|
|
grub_le_to_cpu32 (dirent.inode),
|
2004-09-11 11:42:43 +00:00
|
|
|
|
&fdiro->inode);
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_errno)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-09-11 11:42:43 +00:00
|
|
|
|
grub_free (fdiro);
|
|
|
|
|
return 0;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
2004-09-11 11:42:43 +00:00
|
|
|
|
|
|
|
|
|
fdiro->inode_read = 1;
|
|
|
|
|
|
2004-09-17 09:36:52 +00:00
|
|
|
|
if ((grub_le_to_cpu16 (fdiro->inode.mode)
|
2004-09-11 11:42:43 +00:00
|
|
|
|
& FILETYPE_INO_MASK) == FILETYPE_INO_DIRECTORY)
|
|
|
|
|
type = GRUB_FSHELP_DIR;
|
2004-09-17 09:36:52 +00:00
|
|
|
|
else if ((grub_le_to_cpu16 (fdiro->inode.mode)
|
|
|
|
|
& FILETYPE_INO_MASK) == FILETYPE_INO_SYMLINK)
|
2004-09-11 11:42:43 +00:00
|
|
|
|
type = GRUB_FSHELP_SYMLINK;
|
2004-09-17 09:36:52 +00:00
|
|
|
|
else if ((grub_le_to_cpu16 (fdiro->inode.mode)
|
|
|
|
|
& FILETYPE_INO_MASK) == FILETYPE_INO_REG)
|
2004-09-11 11:42:43 +00:00
|
|
|
|
type = GRUB_FSHELP_REG;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
2004-09-11 11:42:43 +00:00
|
|
|
|
|
|
|
|
|
if (hook (filename, type, fdiro))
|
|
|
|
|
return 1;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
2004-09-11 11:42:43 +00:00
|
|
|
|
|
|
|
|
|
fpos += grub_le_to_cpu16 (dirent.direntlen);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
2004-09-11 11:42:43 +00:00
|
|
|
|
|
|
|
|
|
return 0;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Open a file named NAME and initialize FILE. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_ext2_open (struct grub_file *file, const char *name)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
struct grub_ext2_data *data;
|
2004-09-11 11:42:43 +00:00
|
|
|
|
struct grub_fshelp_node *fdiro = 0;
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_ref (my_mod);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
#endif
|
2004-09-11 11:42:43 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
data = grub_ext2_mount (file->device->disk);
|
2007-03-19 00:04:29 +00:00
|
|
|
|
if (! data)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
goto fail;
|
|
|
|
|
|
2004-09-11 11:42:43 +00:00
|
|
|
|
grub_fshelp_find_file (name, &data->diropen, &fdiro, grub_ext2_iterate_dir,
|
|
|
|
|
grub_ext2_read_symlink, GRUB_FSHELP_REG);
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_errno)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
goto fail;
|
2004-09-11 11:42:43 +00:00
|
|
|
|
|
2007-03-19 00:04:29 +00:00
|
|
|
|
if (! fdiro->inode_read)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-09-11 11:42:43 +00:00
|
|
|
|
grub_ext2_read_inode (data, fdiro->ino, &fdiro->inode);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-09-11 11:42:43 +00:00
|
|
|
|
grub_memcpy (data->inode, &fdiro->inode, sizeof (struct grub_ext2_inode));
|
|
|
|
|
grub_free (fdiro);
|
|
|
|
|
|
|
|
|
|
file->size = grub_le_to_cpu32 (data->inode->size);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
file->data = data;
|
|
|
|
|
file->offset = 0;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
fail:
|
2004-09-11 11:42:43 +00:00
|
|
|
|
if (fdiro != &data->diropen)
|
|
|
|
|
grub_free (fdiro);
|
2004-12-13 17:26:17 +00:00
|
|
|
|
grub_free (data);
|
2004-09-11 11:42:43 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_unref (my_mod);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_errno;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_ext2_close (grub_file_t file)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_free (file->data);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_unref (my_mod);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return GRUB_ERR_NONE;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read LEN bytes data from FILE into BUF. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_ssize_t
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
|
grub_ext2_read (grub_file_t file, char *buf, grub_size_t len)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2007-03-19 00:04:29 +00:00
|
|
|
|
struct grub_ext2_data *data = (struct grub_ext2_data *) file->data;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2004-09-11 11:42:43 +00:00
|
|
|
|
return grub_ext2_read_file (&data->diropen, file->read_hook,
|
|
|
|
|
file->offset, len, buf);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_ext2_dir (grub_device_t device, const char *path,
|
2003-10-29 18:44:30 +00:00
|
|
|
|
int (*hook) (const char *filename, int dir))
|
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
struct grub_ext2_data *data = 0;;
|
2004-09-11 11:42:43 +00:00
|
|
|
|
struct grub_fshelp_node *fdiro = 0;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2004-09-11 11:42:43 +00:00
|
|
|
|
auto int NESTED_FUNC_ATTR iterate (const char *filename,
|
|
|
|
|
enum grub_fshelp_filetype filetype,
|
|
|
|
|
grub_fshelp_node_t node);
|
|
|
|
|
|
|
|
|
|
int NESTED_FUNC_ATTR iterate (const char *filename,
|
|
|
|
|
enum grub_fshelp_filetype filetype,
|
|
|
|
|
grub_fshelp_node_t node)
|
|
|
|
|
{
|
|
|
|
|
grub_free (node);
|
|
|
|
|
|
|
|
|
|
if (filetype == GRUB_FSHELP_DIR)
|
|
|
|
|
return hook (filename, 1);
|
|
|
|
|
else
|
|
|
|
|
return hook (filename, 0);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_ref (my_mod);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
data = grub_ext2_mount (device->disk);
|
2007-03-19 00:04:29 +00:00
|
|
|
|
if (! data)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
goto fail;
|
2004-09-11 11:42:43 +00:00
|
|
|
|
|
|
|
|
|
grub_fshelp_find_file (path, &data->diropen, &fdiro, grub_ext2_iterate_dir,
|
|
|
|
|
grub_ext2_read_symlink, GRUB_FSHELP_DIR);
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_errno)
|
2004-12-13 17:26:17 +00:00
|
|
|
|
goto fail;
|
2004-09-11 11:42:43 +00:00
|
|
|
|
|
|
|
|
|
grub_ext2_iterate_dir (fdiro, iterate);
|
|
|
|
|
|
2003-10-29 18:44:30 +00:00
|
|
|
|
fail:
|
2004-09-11 11:42:43 +00:00
|
|
|
|
if (fdiro != &data->diropen)
|
|
|
|
|
grub_free (fdiro);
|
2004-12-13 17:26:17 +00:00
|
|
|
|
grub_free (data);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_unref (my_mod);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_errno;
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_ext2_label (grub_device_t device, char **label)
|
2003-12-03 19:17:27 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
struct grub_ext2_data *data;
|
|
|
|
|
grub_disk_t disk = device->disk;
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_ref (my_mod);
|
2003-12-03 19:17:27 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
data = grub_ext2_mount (disk);
|
2003-12-03 19:17:27 +00:00
|
|
|
|
if (data)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
*label = grub_strndup (data->sblock.volume_name, 14);
|
2003-12-03 19:17:27 +00:00
|
|
|
|
else
|
|
|
|
|
*label = 0;
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_unref (my_mod);
|
2003-12-03 19:17:27 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_free (data);
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_errno;
|
2003-12-03 19:17:27 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-10-29 18:44:30 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static struct grub_fs grub_ext2_fs =
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
|
|
|
|
.name = "ext2",
|
2004-04-04 13:46:03 +00:00
|
|
|
|
.dir = grub_ext2_dir,
|
|
|
|
|
.open = grub_ext2_open,
|
|
|
|
|
.read = grub_ext2_read,
|
|
|
|
|
.close = grub_ext2_close,
|
|
|
|
|
.label = grub_ext2_label,
|
2003-10-29 18:44:30 +00:00
|
|
|
|
.next = 0
|
|
|
|
|
};
|
|
|
|
|
|
2005-11-13 Marco Gerards <mgerards@xs4all.nl>
* geninit.sh: New file.
* geninitheader.sh: Likewise.
* commands/boot.c (grub_boot_init, grub_boot_fini): Removed.
* commands/cat.c (grub_cat_init, grub_cat_fini): Likewise.
* commands/cmp.c (grub_cmp_init, grub_cmp_fini): Likewise.
* commands/configfile.c (grub_configfile_init)
(grub_configfile_fini): Likewise.
* commands/default.c (grub_default_init, grub_default_fini):
Likewise.
* commands/help.c (grub_help_init, grub_help_fini): Likewise.
* commands/ls.c (grub_ls_init, grub_ls_fini): Likewise.
* commands/search.c (grub_search_init, grub_search_fini): Likewise.
* commands/terminal.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* commands/test.c (grub_test_init, grub_test_fini): Likewise.
* commands/timeout.c (grub_timeout_init, grub_timeout_fini):
Likewise.
* commands/i386/pc/halt.c (grub_halt_init, grub_halt_fini): Likewise.
* commands/iee1275/halt.c (grub_halt_init, grub_halt_fini):
Likewise.
* commands/i386/pc/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* commands/iee1275/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* disk/loopback.c (grub_loop_init, grub_loop_fini): Likewise.
* fs/affs.c (grub_affs_init, grub_affs_fini): Likewise.
* fs/ext2.c (grub_ext2_init, grub_ext2_fini): Likewise.
* fs/fat.c (grub_fat_init, grub_fat_fini): Likewise.
* fs/hfs.c (grub_hfs_init, grub_hfs_fini): Likewise.
* fs/iso9660.c (grub_iso9660_init, grub_iso9660_fini): Likewise.
* fs/jfs.c (grub_jfs_init, grub_jfs_fini): Likewise.
* fs/minix.c (grub_minix_init, grub_minix_fini): Likewise.
* fs/sfs.c (grub_sfs_init, grub_sfs_fini): Likewise.
* fs/ufs.c (grub_ufs_init, grub_ufs_fini): Likewise.
* fs/xfs.c (grub_xfs_init, grub_xfs_fini): Likewise.
* normal/main.c (grub_normal_init, grub_normal_fini): Likewise.
* partmap/amiga.c (grub_amiga_partition_map_init)
(grub_amiga_partition_map_fini): Likewise.
* partmap/apple.c (grub_apple_partition_map_init)
(grub_apple_partition_map_fini): Likewise.
* partmap/pc.c (grub_pc_partition_map_init)
(grub_pc_partition_map_fini): Likewise.
* partmap/sun.c (grub_sun_partition_map_init,
grub_sun_partition_map_fini): Likewise.
* term/terminfo.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* util/grub-emu.c: Include <grub_modules_init.h>.
(main): Don't initialize and de-initialize any modules directly,
use `grub_init_all' and `grub_fini_all' instead.
* term/i386/pc/vesafb.c (grub_vesafb_init): Renamed to
`grub_vesafb_mod_init'.
(grub_vesafb_fini): Renamed to `grub_vesafb_mod_fini'. Updated
all users.
* term/i386/pc/vga.c (grub_vga_init): Renamed to
`grub_vga_mod_init'. Updated all users.
(grub_vga_fini): Renamed to `grub_vga_mod_fini'.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `grub_emu_init.c'.
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c): New
rules.
* include/grub/dl.h (GRUB_MOD_INIT): Add argument `name'.
Generate a function to initialize the module in utilities.
Updated all callers.
(GRUB_MOD_FINI): Add argument `name'. Generate a function to
initialize the module in utilities. Updated all callers.
2005-11-13 15:47:09 +00:00
|
|
|
|
GRUB_MOD_INIT(ext2)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_fs_register (&grub_ext2_fs);
|
2005-11-13 Marco Gerards <mgerards@xs4all.nl>
* geninit.sh: New file.
* geninitheader.sh: Likewise.
* commands/boot.c (grub_boot_init, grub_boot_fini): Removed.
* commands/cat.c (grub_cat_init, grub_cat_fini): Likewise.
* commands/cmp.c (grub_cmp_init, grub_cmp_fini): Likewise.
* commands/configfile.c (grub_configfile_init)
(grub_configfile_fini): Likewise.
* commands/default.c (grub_default_init, grub_default_fini):
Likewise.
* commands/help.c (grub_help_init, grub_help_fini): Likewise.
* commands/ls.c (grub_ls_init, grub_ls_fini): Likewise.
* commands/search.c (grub_search_init, grub_search_fini): Likewise.
* commands/terminal.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* commands/test.c (grub_test_init, grub_test_fini): Likewise.
* commands/timeout.c (grub_timeout_init, grub_timeout_fini):
Likewise.
* commands/i386/pc/halt.c (grub_halt_init, grub_halt_fini): Likewise.
* commands/iee1275/halt.c (grub_halt_init, grub_halt_fini):
Likewise.
* commands/i386/pc/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* commands/iee1275/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* disk/loopback.c (grub_loop_init, grub_loop_fini): Likewise.
* fs/affs.c (grub_affs_init, grub_affs_fini): Likewise.
* fs/ext2.c (grub_ext2_init, grub_ext2_fini): Likewise.
* fs/fat.c (grub_fat_init, grub_fat_fini): Likewise.
* fs/hfs.c (grub_hfs_init, grub_hfs_fini): Likewise.
* fs/iso9660.c (grub_iso9660_init, grub_iso9660_fini): Likewise.
* fs/jfs.c (grub_jfs_init, grub_jfs_fini): Likewise.
* fs/minix.c (grub_minix_init, grub_minix_fini): Likewise.
* fs/sfs.c (grub_sfs_init, grub_sfs_fini): Likewise.
* fs/ufs.c (grub_ufs_init, grub_ufs_fini): Likewise.
* fs/xfs.c (grub_xfs_init, grub_xfs_fini): Likewise.
* normal/main.c (grub_normal_init, grub_normal_fini): Likewise.
* partmap/amiga.c (grub_amiga_partition_map_init)
(grub_amiga_partition_map_fini): Likewise.
* partmap/apple.c (grub_apple_partition_map_init)
(grub_apple_partition_map_fini): Likewise.
* partmap/pc.c (grub_pc_partition_map_init)
(grub_pc_partition_map_fini): Likewise.
* partmap/sun.c (grub_sun_partition_map_init,
grub_sun_partition_map_fini): Likewise.
* term/terminfo.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* util/grub-emu.c: Include <grub_modules_init.h>.
(main): Don't initialize and de-initialize any modules directly,
use `grub_init_all' and `grub_fini_all' instead.
* term/i386/pc/vesafb.c (grub_vesafb_init): Renamed to
`grub_vesafb_mod_init'.
(grub_vesafb_fini): Renamed to `grub_vesafb_mod_fini'. Updated
all users.
* term/i386/pc/vga.c (grub_vga_init): Renamed to
`grub_vga_mod_init'. Updated all users.
(grub_vga_fini): Renamed to `grub_vga_mod_fini'.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `grub_emu_init.c'.
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c): New
rules.
* include/grub/dl.h (GRUB_MOD_INIT): Add argument `name'.
Generate a function to initialize the module in utilities.
Updated all callers.
(GRUB_MOD_FINI): Add argument `name'. Generate a function to
initialize the module in utilities. Updated all callers.
2005-11-13 15:47:09 +00:00
|
|
|
|
#ifndef GRUB_UTIL
|
2003-10-29 18:44:30 +00:00
|
|
|
|
my_mod = mod;
|
2005-11-13 Marco Gerards <mgerards@xs4all.nl>
* geninit.sh: New file.
* geninitheader.sh: Likewise.
* commands/boot.c (grub_boot_init, grub_boot_fini): Removed.
* commands/cat.c (grub_cat_init, grub_cat_fini): Likewise.
* commands/cmp.c (grub_cmp_init, grub_cmp_fini): Likewise.
* commands/configfile.c (grub_configfile_init)
(grub_configfile_fini): Likewise.
* commands/default.c (grub_default_init, grub_default_fini):
Likewise.
* commands/help.c (grub_help_init, grub_help_fini): Likewise.
* commands/ls.c (grub_ls_init, grub_ls_fini): Likewise.
* commands/search.c (grub_search_init, grub_search_fini): Likewise.
* commands/terminal.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* commands/test.c (grub_test_init, grub_test_fini): Likewise.
* commands/timeout.c (grub_timeout_init, grub_timeout_fini):
Likewise.
* commands/i386/pc/halt.c (grub_halt_init, grub_halt_fini): Likewise.
* commands/iee1275/halt.c (grub_halt_init, grub_halt_fini):
Likewise.
* commands/i386/pc/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* commands/iee1275/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* disk/loopback.c (grub_loop_init, grub_loop_fini): Likewise.
* fs/affs.c (grub_affs_init, grub_affs_fini): Likewise.
* fs/ext2.c (grub_ext2_init, grub_ext2_fini): Likewise.
* fs/fat.c (grub_fat_init, grub_fat_fini): Likewise.
* fs/hfs.c (grub_hfs_init, grub_hfs_fini): Likewise.
* fs/iso9660.c (grub_iso9660_init, grub_iso9660_fini): Likewise.
* fs/jfs.c (grub_jfs_init, grub_jfs_fini): Likewise.
* fs/minix.c (grub_minix_init, grub_minix_fini): Likewise.
* fs/sfs.c (grub_sfs_init, grub_sfs_fini): Likewise.
* fs/ufs.c (grub_ufs_init, grub_ufs_fini): Likewise.
* fs/xfs.c (grub_xfs_init, grub_xfs_fini): Likewise.
* normal/main.c (grub_normal_init, grub_normal_fini): Likewise.
* partmap/amiga.c (grub_amiga_partition_map_init)
(grub_amiga_partition_map_fini): Likewise.
* partmap/apple.c (grub_apple_partition_map_init)
(grub_apple_partition_map_fini): Likewise.
* partmap/pc.c (grub_pc_partition_map_init)
(grub_pc_partition_map_fini): Likewise.
* partmap/sun.c (grub_sun_partition_map_init,
grub_sun_partition_map_fini): Likewise.
* term/terminfo.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* util/grub-emu.c: Include <grub_modules_init.h>.
(main): Don't initialize and de-initialize any modules directly,
use `grub_init_all' and `grub_fini_all' instead.
* term/i386/pc/vesafb.c (grub_vesafb_init): Renamed to
`grub_vesafb_mod_init'.
(grub_vesafb_fini): Renamed to `grub_vesafb_mod_fini'. Updated
all users.
* term/i386/pc/vga.c (grub_vga_init): Renamed to
`grub_vga_mod_init'. Updated all users.
(grub_vga_fini): Renamed to `grub_vga_mod_fini'.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `grub_emu_init.c'.
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c): New
rules.
* include/grub/dl.h (GRUB_MOD_INIT): Add argument `name'.
Generate a function to initialize the module in utilities.
Updated all callers.
(GRUB_MOD_FINI): Add argument `name'. Generate a function to
initialize the module in utilities. Updated all callers.
2005-11-13 15:47:09 +00:00
|
|
|
|
#endif
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-11-13 Marco Gerards <mgerards@xs4all.nl>
* geninit.sh: New file.
* geninitheader.sh: Likewise.
* commands/boot.c (grub_boot_init, grub_boot_fini): Removed.
* commands/cat.c (grub_cat_init, grub_cat_fini): Likewise.
* commands/cmp.c (grub_cmp_init, grub_cmp_fini): Likewise.
* commands/configfile.c (grub_configfile_init)
(grub_configfile_fini): Likewise.
* commands/default.c (grub_default_init, grub_default_fini):
Likewise.
* commands/help.c (grub_help_init, grub_help_fini): Likewise.
* commands/ls.c (grub_ls_init, grub_ls_fini): Likewise.
* commands/search.c (grub_search_init, grub_search_fini): Likewise.
* commands/terminal.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* commands/test.c (grub_test_init, grub_test_fini): Likewise.
* commands/timeout.c (grub_timeout_init, grub_timeout_fini):
Likewise.
* commands/i386/pc/halt.c (grub_halt_init, grub_halt_fini): Likewise.
* commands/iee1275/halt.c (grub_halt_init, grub_halt_fini):
Likewise.
* commands/i386/pc/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* commands/iee1275/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* disk/loopback.c (grub_loop_init, grub_loop_fini): Likewise.
* fs/affs.c (grub_affs_init, grub_affs_fini): Likewise.
* fs/ext2.c (grub_ext2_init, grub_ext2_fini): Likewise.
* fs/fat.c (grub_fat_init, grub_fat_fini): Likewise.
* fs/hfs.c (grub_hfs_init, grub_hfs_fini): Likewise.
* fs/iso9660.c (grub_iso9660_init, grub_iso9660_fini): Likewise.
* fs/jfs.c (grub_jfs_init, grub_jfs_fini): Likewise.
* fs/minix.c (grub_minix_init, grub_minix_fini): Likewise.
* fs/sfs.c (grub_sfs_init, grub_sfs_fini): Likewise.
* fs/ufs.c (grub_ufs_init, grub_ufs_fini): Likewise.
* fs/xfs.c (grub_xfs_init, grub_xfs_fini): Likewise.
* normal/main.c (grub_normal_init, grub_normal_fini): Likewise.
* partmap/amiga.c (grub_amiga_partition_map_init)
(grub_amiga_partition_map_fini): Likewise.
* partmap/apple.c (grub_apple_partition_map_init)
(grub_apple_partition_map_fini): Likewise.
* partmap/pc.c (grub_pc_partition_map_init)
(grub_pc_partition_map_fini): Likewise.
* partmap/sun.c (grub_sun_partition_map_init,
grub_sun_partition_map_fini): Likewise.
* term/terminfo.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* util/grub-emu.c: Include <grub_modules_init.h>.
(main): Don't initialize and de-initialize any modules directly,
use `grub_init_all' and `grub_fini_all' instead.
* term/i386/pc/vesafb.c (grub_vesafb_init): Renamed to
`grub_vesafb_mod_init'.
(grub_vesafb_fini): Renamed to `grub_vesafb_mod_fini'. Updated
all users.
* term/i386/pc/vga.c (grub_vga_init): Renamed to
`grub_vga_mod_init'. Updated all users.
(grub_vga_fini): Renamed to `grub_vga_mod_fini'.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `grub_emu_init.c'.
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c): New
rules.
* include/grub/dl.h (GRUB_MOD_INIT): Add argument `name'.
Generate a function to initialize the module in utilities.
Updated all callers.
(GRUB_MOD_FINI): Add argument `name'. Generate a function to
initialize the module in utilities. Updated all callers.
2005-11-13 15:47:09 +00:00
|
|
|
|
GRUB_MOD_FINI(ext2)
|
2003-10-29 18:44:30 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_fs_unregister (&grub_ext2_fs);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
}
|