2005-09-28 10:07:22 +00:00
|
|
|
|
/* xfs.c - XFS. */
|
|
|
|
|
/*
|
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* Copyright (C) 2005,2006,2007 Free Software Foundation, Inc.
|
2005-09-28 10:07:22 +00:00
|
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* GRUB is free software: you can redistribute it and/or modify
|
2005-09-28 10:07:22 +00:00
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
2005-09-28 10:07:22 +00:00
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* GRUB is distributed in the hope that it will be useful,
|
2005-09-28 10:07:22 +00:00
|
|
|
|
* 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
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
2005-09-28 10:07:22 +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>
|
|
|
|
|
#include <grub/fshelp.h>
|
|
|
|
|
|
|
|
|
|
#define XFS_INODE_EXTENTS 9
|
|
|
|
|
|
|
|
|
|
#define XFS_INODE_FORMAT_INO 1
|
|
|
|
|
#define XFS_INODE_FORMAT_EXT 2
|
|
|
|
|
#define XFS_INODE_FORMAT_BTREE 3
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct grub_xfs_sblock
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t magic[4];
|
|
|
|
|
grub_uint32_t bsize;
|
|
|
|
|
grub_uint8_t unused1[48];
|
|
|
|
|
grub_uint64_t rootino;
|
|
|
|
|
grub_uint8_t unused2[20];
|
|
|
|
|
grub_uint32_t agsize;
|
|
|
|
|
grub_uint8_t unused3[20];
|
|
|
|
|
grub_uint8_t label[12];
|
|
|
|
|
grub_uint8_t log2_bsize;
|
|
|
|
|
grub_uint8_t unused4[2];
|
|
|
|
|
grub_uint8_t log2_inop;
|
|
|
|
|
grub_uint8_t log2_agblk;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
struct grub_xfs_dir_header
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t entries;
|
|
|
|
|
grub_uint8_t smallino;
|
|
|
|
|
grub_uint32_t parent;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
struct grub_xfs_dir_entry
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t len;
|
|
|
|
|
grub_uint16_t offset;
|
|
|
|
|
char name[1];
|
|
|
|
|
/* Inode number follows, 32 bits. */
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
struct grub_xfs_dir2_entry
|
|
|
|
|
{
|
|
|
|
|
grub_uint64_t inode;
|
|
|
|
|
grub_uint8_t len;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
typedef grub_uint32_t grub_xfs_extent[4];
|
|
|
|
|
|
|
|
|
|
struct grub_xfs_inode
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t magic[2];
|
|
|
|
|
grub_uint16_t mode;
|
|
|
|
|
grub_uint8_t version;
|
|
|
|
|
grub_uint8_t format;
|
|
|
|
|
grub_uint8_t unused2[50];
|
|
|
|
|
grub_uint64_t size;
|
|
|
|
|
grub_uint8_t unused3[36];
|
|
|
|
|
union
|
|
|
|
|
{
|
|
|
|
|
char raw[156];
|
|
|
|
|
struct dir
|
|
|
|
|
{
|
|
|
|
|
struct grub_xfs_dir_header dirhead;
|
|
|
|
|
struct grub_xfs_dir_entry direntry[1];
|
|
|
|
|
} dir;
|
|
|
|
|
grub_xfs_extent extents[XFS_INODE_EXTENTS];
|
|
|
|
|
} data __attribute__ ((packed));
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
struct grub_xfs_dirblock_tail
|
|
|
|
|
{
|
|
|
|
|
grub_uint32_t leaf_count;
|
|
|
|
|
grub_uint32_t leaf_stale;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
struct grub_fshelp_node
|
|
|
|
|
{
|
|
|
|
|
struct grub_xfs_data *data;
|
|
|
|
|
struct grub_xfs_inode inode;
|
|
|
|
|
grub_uint64_t ino;
|
|
|
|
|
int inode_read;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct grub_xfs_data
|
|
|
|
|
{
|
|
|
|
|
struct grub_xfs_sblock sblock;
|
|
|
|
|
struct grub_xfs_inode *inode;
|
|
|
|
|
grub_disk_t disk;
|
|
|
|
|
int pos;
|
|
|
|
|
int bsize;
|
|
|
|
|
int agsize;
|
|
|
|
|
struct grub_fshelp_node diropen;
|
|
|
|
|
|
|
|
|
|
};
|
2005-09-28 23:04:26 +00:00
|
|
|
|
|
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
static grub_dl_t my_mod;
|
|
|
|
|
#endif
|
|
|
|
|
|
2005-09-28 10:07:22 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Filetype information as used in inodes. */
|
|
|
|
|
#define FILETYPE_INO_MASK 0170000
|
|
|
|
|
#define FILETYPE_INO_REG 0100000
|
|
|
|
|
#define FILETYPE_INO_DIRECTORY 0040000
|
|
|
|
|
#define FILETYPE_INO_SYMLINK 0120000
|
|
|
|
|
|
|
|
|
|
#define GRUB_XFS_INO_AGBITS(data) \
|
|
|
|
|
((data)->sblock.log2_agblk + (data)->sblock.log2_inop)
|
|
|
|
|
#define GRUB_XFS_INO_INOINAG(data, ino) \
|
|
|
|
|
(grub_be_to_cpu64 (ino) & ((1 << GRUB_XFS_INO_AGBITS (data)) - 1))
|
|
|
|
|
#define GRUB_XFS_INO_AG(data,ino) \
|
|
|
|
|
(grub_be_to_cpu64 (ino) >> GRUB_XFS_INO_AGBITS (data))
|
|
|
|
|
|
|
|
|
|
#define GRUB_XFS_EXTENT_OFFSET(inode,ex) \
|
|
|
|
|
((grub_be_to_cpu32 ((inode)->data.extents[ex][0]) & ~(1 << 31)) << 23 \
|
|
|
|
|
| grub_be_to_cpu32 ((inode)->data.extents[ex][1]) >> 9)
|
|
|
|
|
|
|
|
|
|
#define GRUB_XFS_EXTENT_BLOCK(inode,ex) \
|
|
|
|
|
((grub_uint64_t) (grub_be_to_cpu32 ((inode)->data.extents[ex][1]) \
|
|
|
|
|
& (~255)) << 43 \
|
|
|
|
|
| (grub_uint64_t) grub_be_to_cpu32 ((inode)->data.extents[ex][2]) << 11 \
|
|
|
|
|
| grub_be_to_cpu32 ((inode)->data.extents[ex][3]) >> 21)
|
|
|
|
|
|
|
|
|
|
#define GRUB_XFS_EXTENT_SIZE(inode,ex) \
|
|
|
|
|
(grub_be_to_cpu32 ((inode)->data.extents[ex][3]) & ((1 << 20) - 1))
|
|
|
|
|
|
|
|
|
|
#define GRUB_XFS_ROUND_TO_DIRENT(pos) ((((pos) + 8 - 1) / 8) * 8)
|
|
|
|
|
#define GRUB_XFS_NEXT_DIRENT(pos,len) \
|
|
|
|
|
(pos) + GRUB_XFS_ROUND_TO_DIRENT (8 + 1 + len + 2)
|
|
|
|
|
|
2005-10-15 09:22:32 +00:00
|
|
|
|
static inline int
|
|
|
|
|
grub_xfs_inode_block (struct grub_xfs_data *data,
|
|
|
|
|
grub_uint64_t ino)
|
2005-09-28 10:07:22 +00:00
|
|
|
|
{
|
|
|
|
|
long long int inoinag = GRUB_XFS_INO_INOINAG (data, ino);
|
|
|
|
|
long long ag = GRUB_XFS_INO_AG (data, ino);
|
|
|
|
|
long long block;
|
|
|
|
|
|
|
|
|
|
block = (inoinag >> 4) + ag * data->agsize;
|
|
|
|
|
block <<= (data->sblock.log2_bsize - GRUB_DISK_SECTOR_BITS);
|
|
|
|
|
return block;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-10-15 09:22:32 +00:00
|
|
|
|
static inline int
|
|
|
|
|
grub_xfs_inode_offset (struct grub_xfs_data *data,
|
|
|
|
|
grub_uint64_t ino)
|
2005-09-28 10:07:22 +00:00
|
|
|
|
{
|
|
|
|
|
int inoag = GRUB_XFS_INO_INOINAG (data, ino);
|
|
|
|
|
return (inoag & ((1 << 4) - 1)) << 8;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_xfs_read_inode (struct grub_xfs_data *data, grub_uint64_t ino,
|
|
|
|
|
struct grub_xfs_inode *inode)
|
|
|
|
|
{
|
|
|
|
|
int block = grub_xfs_inode_block (data, ino);
|
|
|
|
|
int offset = grub_xfs_inode_offset (data, ino);
|
|
|
|
|
|
|
|
|
|
/* Read the inode. */
|
|
|
|
|
if (grub_disk_read (data->disk, block, offset,
|
|
|
|
|
sizeof (struct grub_xfs_inode), (char *) inode))
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
2006-04-26 21:58:36 +00:00
|
|
|
|
if (grub_strncmp ((char *) inode->magic, "IN", 2))
|
2005-09-28 10:07:22 +00:00
|
|
|
|
return grub_error (GRUB_ERR_BAD_FS, "not a correct XFS inode.\n");
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
grub_xfs_read_block (grub_fshelp_node_t node, int fileblock)
|
|
|
|
|
{
|
|
|
|
|
int ex;
|
|
|
|
|
|
|
|
|
|
if (node->inode.format != XFS_INODE_FORMAT_EXT)
|
|
|
|
|
{
|
|
|
|
|
grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
|
|
|
|
|
"xfs does not support inode format %d yet",
|
|
|
|
|
node->inode.format);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Iterate over each extent to figure out which extent has
|
|
|
|
|
the block we are looking for. */
|
|
|
|
|
for (ex = 0; ex < XFS_INODE_EXTENTS; ex++)
|
|
|
|
|
{
|
|
|
|
|
grub_uint64_t start = GRUB_XFS_EXTENT_BLOCK (&node->inode, ex);
|
|
|
|
|
int offset = GRUB_XFS_EXTENT_OFFSET (&node->inode, ex);
|
|
|
|
|
int size = GRUB_XFS_EXTENT_SIZE (&node->inode, ex);
|
|
|
|
|
|
|
|
|
|
unsigned int ag = start >> node->data->sblock.log2_agblk;
|
|
|
|
|
unsigned int block = start & ((1 << node->data->sblock.log2_agblk) - 1);
|
|
|
|
|
|
|
|
|
|
if (fileblock < offset + size)
|
|
|
|
|
return (fileblock - offset + block) + ag * node->data->agsize;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_error (GRUB_ERR_FILE_READ_ERROR,
|
|
|
|
|
"xfs block %d for inode %d is not in an extent.\n",
|
|
|
|
|
fileblock, grub_be_to_cpu64 (node->ino));
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Read LEN bytes from the file described by DATA starting with byte
|
|
|
|
|
POS. Return the amount of read bytes in READ. */
|
|
|
|
|
static grub_ssize_t
|
|
|
|
|
grub_xfs_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,
|
2005-09-28 10:07:22 +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)
|
2005-09-28 10:07:22 +00:00
|
|
|
|
{
|
|
|
|
|
return grub_fshelp_read_file (node->data->disk, node, read_hook,
|
|
|
|
|
pos, len, buf, grub_xfs_read_block,
|
|
|
|
|
grub_be_to_cpu64 (node->inode.size),
|
|
|
|
|
node->data->sblock.log2_bsize
|
|
|
|
|
- GRUB_DISK_SECTOR_BITS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
grub_xfs_read_symlink (grub_fshelp_node_t node)
|
|
|
|
|
{
|
|
|
|
|
int size = grub_be_to_cpu64 (node->inode.size);
|
|
|
|
|
|
|
|
|
|
switch (node->inode.format)
|
|
|
|
|
{
|
|
|
|
|
case XFS_INODE_FORMAT_INO:
|
|
|
|
|
return grub_strndup (node->inode.data.raw, size);
|
|
|
|
|
|
|
|
|
|
case XFS_INODE_FORMAT_EXT:
|
|
|
|
|
{
|
|
|
|
|
char *symlink;
|
|
|
|
|
grub_ssize_t numread;
|
|
|
|
|
|
|
|
|
|
symlink = grub_malloc (size + 1);
|
|
|
|
|
if (!symlink)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
numread = grub_xfs_read_file (node, 0, 0, size, symlink);
|
|
|
|
|
if (numread != size)
|
|
|
|
|
{
|
|
|
|
|
grub_free (symlink);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
symlink[size] = '\0';
|
|
|
|
|
return symlink;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static enum grub_fshelp_filetype
|
|
|
|
|
grub_xfs_mode_to_filetype (grub_uint16_t mode)
|
|
|
|
|
{
|
|
|
|
|
if ((grub_be_to_cpu16 (mode)
|
|
|
|
|
& FILETYPE_INO_MASK) == FILETYPE_INO_DIRECTORY)
|
|
|
|
|
return GRUB_FSHELP_DIR;
|
|
|
|
|
else if ((grub_be_to_cpu16 (mode)
|
|
|
|
|
& FILETYPE_INO_MASK) == FILETYPE_INO_SYMLINK)
|
|
|
|
|
return GRUB_FSHELP_SYMLINK;
|
|
|
|
|
else if ((grub_be_to_cpu16 (mode)
|
|
|
|
|
& FILETYPE_INO_MASK) == FILETYPE_INO_REG)
|
|
|
|
|
return GRUB_FSHELP_REG;
|
|
|
|
|
return GRUB_FSHELP_UNKNOWN;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
grub_xfs_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))
|
|
|
|
|
{
|
|
|
|
|
struct grub_fshelp_node *diro = (struct grub_fshelp_node *) dir;
|
2005-09-28 23:04:26 +00:00
|
|
|
|
auto int call_hook (grub_uint64_t ino, char *filename);
|
2005-09-28 10:07:22 +00:00
|
|
|
|
|
|
|
|
|
int call_hook (grub_uint64_t ino, char *filename)
|
|
|
|
|
{
|
|
|
|
|
struct grub_fshelp_node *fdiro;
|
|
|
|
|
|
|
|
|
|
fdiro = grub_malloc (sizeof (struct grub_fshelp_node));
|
|
|
|
|
if (!fdiro)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* The inode should be read, otherwise the filetype can
|
|
|
|
|
not be determined. */
|
|
|
|
|
fdiro->ino = ino;
|
|
|
|
|
fdiro->inode_read = 1;
|
|
|
|
|
fdiro->data = diro->data;
|
|
|
|
|
grub_xfs_read_inode (diro->data, ino, &fdiro->inode);
|
|
|
|
|
|
|
|
|
|
return hook (filename,
|
|
|
|
|
grub_xfs_mode_to_filetype (fdiro->inode.mode),
|
|
|
|
|
fdiro);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (diro->inode.format)
|
|
|
|
|
{
|
|
|
|
|
case XFS_INODE_FORMAT_INO:
|
|
|
|
|
{
|
|
|
|
|
struct grub_xfs_dir_entry *de = &diro->inode.data.dir.direntry[0];
|
|
|
|
|
int smallino = !diro->inode.data.dir.dirhead.smallino;
|
|
|
|
|
int i;
|
|
|
|
|
grub_uint64_t parent;
|
|
|
|
|
|
|
|
|
|
/* If small inode numbers are used to pack the direntry, the
|
|
|
|
|
parent inode number is small too. */
|
|
|
|
|
if (smallino)
|
|
|
|
|
{
|
|
|
|
|
parent = grub_be_to_cpu32 (diro->inode.data.dir.dirhead.parent);
|
|
|
|
|
parent = grub_cpu_to_be64 (parent);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
parent = *(grub_uint64_t *) &diro->inode.data.dir.dirhead.parent;
|
|
|
|
|
/* The header is a bit bigger than usual. */
|
|
|
|
|
de = (struct grub_xfs_dir_entry *) ((char *) de + 4);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Synthesize the direntries for `.' and `..'. */
|
|
|
|
|
if (call_hook (diro->ino, "."))
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
if (call_hook (parent, ".."))
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < diro->inode.data.dir.dirhead.entries; i++)
|
|
|
|
|
{
|
|
|
|
|
grub_uint64_t ino;
|
|
|
|
|
void *inopos = (((char *) de)
|
2005-10-15 09:22:32 +00:00
|
|
|
|
+ sizeof (struct grub_xfs_dir_entry)
|
|
|
|
|
+ de->len - 1);
|
|
|
|
|
char name[de->len + 1];
|
|
|
|
|
|
2005-09-28 10:07:22 +00:00
|
|
|
|
if (smallino)
|
|
|
|
|
{
|
|
|
|
|
ino = grub_be_to_cpu32 (*(grub_uint32_t *) inopos);
|
|
|
|
|
ino = grub_cpu_to_be64 (ino);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
ino = *(grub_uint64_t *) inopos;
|
|
|
|
|
|
2005-10-15 09:22:32 +00:00
|
|
|
|
grub_memcpy (name, de->name, de->len);
|
|
|
|
|
name[de->len] = '\0';
|
|
|
|
|
if (call_hook (ino, name))
|
2005-09-28 10:07:22 +00:00
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
de = ((struct grub_xfs_dir_entry *)
|
|
|
|
|
(((char *) de)+ sizeof (struct grub_xfs_dir_entry) + de->len
|
2005-10-01 20:41:53 +00:00
|
|
|
|
+ ((smallino ? sizeof (grub_uint32_t)
|
|
|
|
|
: sizeof (grub_uint64_t))) - 1));
|
2005-09-28 10:07:22 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case XFS_INODE_FORMAT_BTREE:
|
|
|
|
|
case XFS_INODE_FORMAT_EXT:
|
|
|
|
|
{
|
|
|
|
|
grub_ssize_t numread;
|
|
|
|
|
char *dirblock;
|
2005-10-15 09:22:32 +00:00
|
|
|
|
grub_uint64_t blk;
|
2005-09-28 10:07:22 +00:00
|
|
|
|
|
|
|
|
|
dirblock = grub_malloc (dir->data->bsize);
|
2005-10-15 09:22:32 +00:00
|
|
|
|
if (! dirblock)
|
2005-09-28 10:07:22 +00:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Iterate over every block the directory has. */
|
|
|
|
|
for (blk = 0;
|
|
|
|
|
blk < (grub_be_to_cpu64 (dir->inode.size)
|
|
|
|
|
>> dir->data->sblock.log2_bsize);
|
|
|
|
|
blk++)
|
|
|
|
|
{
|
|
|
|
|
/* The header is skipped, the first direntry is stored
|
|
|
|
|
from byte 16. */
|
|
|
|
|
int pos = 16;
|
|
|
|
|
int entries;
|
|
|
|
|
int tail_start = (dir->data->bsize
|
|
|
|
|
- sizeof (struct grub_xfs_dirblock_tail));
|
|
|
|
|
|
|
|
|
|
struct grub_xfs_dirblock_tail *tail;
|
|
|
|
|
tail = (struct grub_xfs_dirblock_tail *) &dirblock[tail_start];
|
|
|
|
|
|
|
|
|
|
numread = grub_xfs_read_file (dir, 0,
|
|
|
|
|
blk << dir->data->sblock.log2_bsize,
|
|
|
|
|
dir->data->bsize, dirblock);
|
2005-10-15 21:33:38 +00:00
|
|
|
|
if (numread != dir->data->bsize)
|
|
|
|
|
return 0;
|
2005-09-28 10:07:22 +00:00
|
|
|
|
|
|
|
|
|
entries = (grub_be_to_cpu32 (tail->leaf_count)
|
|
|
|
|
- grub_be_to_cpu32 (tail->leaf_stale));
|
|
|
|
|
|
|
|
|
|
/* Iterate over all entries within this block. */
|
|
|
|
|
while (pos < (dir->data->bsize
|
|
|
|
|
- (int) sizeof (struct grub_xfs_dir2_entry)))
|
|
|
|
|
{
|
|
|
|
|
struct grub_xfs_dir2_entry *direntry;
|
|
|
|
|
grub_uint16_t *freetag;
|
|
|
|
|
char *filename;
|
|
|
|
|
|
|
|
|
|
direntry = (struct grub_xfs_dir2_entry *) &dirblock[pos];
|
|
|
|
|
freetag = (grub_uint16_t *) direntry;
|
|
|
|
|
|
|
|
|
|
if (*freetag == 0XFFFF)
|
|
|
|
|
{
|
|
|
|
|
grub_uint16_t *skip = (grub_uint16_t *) (freetag + 1);
|
|
|
|
|
|
|
|
|
|
/* This entry is not used, go to the next one. */
|
|
|
|
|
pos += grub_be_to_cpu16 (*skip);
|
|
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
filename = &dirblock[pos + sizeof (*direntry)];
|
|
|
|
|
/* The byte after the filename is for the tag, which
|
|
|
|
|
is not used by GRUB. So it can be overwritten. */
|
|
|
|
|
filename[direntry->len] = '\0';
|
|
|
|
|
|
|
|
|
|
if (call_hook (direntry->inode, filename))
|
|
|
|
|
{
|
|
|
|
|
grub_free (dirblock);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check if last direntry in this block is
|
|
|
|
|
reached. */
|
|
|
|
|
entries--;
|
|
|
|
|
if (!entries)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Select the next directory entry. */
|
|
|
|
|
pos = GRUB_XFS_NEXT_DIRENT (pos, direntry->len);
|
|
|
|
|
pos = GRUB_XFS_ROUND_TO_DIRENT (pos);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
grub_free (dirblock);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
|
|
|
|
|
"xfs does not support inode format %d yet",
|
|
|
|
|
diro->inode.format);
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct grub_xfs_data *
|
|
|
|
|
grub_xfs_mount (grub_disk_t disk)
|
|
|
|
|
{
|
|
|
|
|
struct grub_xfs_data *data = 0;
|
|
|
|
|
|
|
|
|
|
data = grub_malloc (sizeof (struct grub_xfs_data));
|
|
|
|
|
if (!data)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Read the superblock. */
|
|
|
|
|
if (grub_disk_read (disk, 0, 0,
|
|
|
|
|
sizeof (struct grub_xfs_sblock), (char *) &data->sblock))
|
|
|
|
|
goto fail;
|
|
|
|
|
|
2006-04-26 21:58:36 +00:00
|
|
|
|
if (grub_strncmp ((char *) (data->sblock.magic), "XFSB", 4))
|
2005-09-28 10:07:22 +00:00
|
|
|
|
{
|
|
|
|
|
grub_error (GRUB_ERR_BAD_FS, "not a xfs filesystem");
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
data->diropen.data = data;
|
|
|
|
|
data->diropen.ino = data->sblock.rootino;
|
|
|
|
|
data->diropen.inode_read = 1;
|
2005-10-15 09:22:32 +00:00
|
|
|
|
data->bsize = grub_be_to_cpu32 (data->sblock.bsize);
|
|
|
|
|
data->agsize = grub_be_to_cpu32 (data->sblock.agsize);
|
2005-09-28 10:07:22 +00:00
|
|
|
|
|
|
|
|
|
data->disk = disk;
|
|
|
|
|
data->inode = &data->diropen.inode;
|
|
|
|
|
data->pos = 0;
|
|
|
|
|
|
|
|
|
|
grub_xfs_read_inode (data, data->diropen.ino, data->inode);
|
|
|
|
|
|
|
|
|
|
return data;
|
|
|
|
|
fail:
|
|
|
|
|
|
|
|
|
|
grub_free (data);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_xfs_dir (grub_device_t device, const char *path,
|
|
|
|
|
int (*hook) (const char *filename, int dir))
|
|
|
|
|
{
|
|
|
|
|
struct grub_xfs_data *data = 0;;
|
|
|
|
|
struct grub_fshelp_node *fdiro = 0;
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_ref (my_mod);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
data = grub_xfs_mount (device->disk);
|
|
|
|
|
if (!data)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
grub_fshelp_find_file (path, &data->diropen, &fdiro, grub_xfs_iterate_dir,
|
|
|
|
|
grub_xfs_read_symlink, GRUB_FSHELP_DIR);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
grub_xfs_iterate_dir (fdiro, iterate);
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
if (fdiro != &data->diropen)
|
|
|
|
|
grub_free (fdiro);
|
|
|
|
|
grub_free (data);
|
|
|
|
|
|
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Open a file named NAME and initialize FILE. */
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_xfs_open (struct grub_file *file, const char *name)
|
|
|
|
|
{
|
|
|
|
|
struct grub_xfs_data *data;
|
|
|
|
|
struct grub_fshelp_node *fdiro = 0;
|
|
|
|
|
|
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_ref (my_mod);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
data = grub_xfs_mount (file->device->disk);
|
|
|
|
|
if (!data)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
grub_fshelp_find_file (name, &data->diropen, &fdiro, grub_xfs_iterate_dir,
|
|
|
|
|
grub_xfs_read_symlink, GRUB_FSHELP_REG);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
if (!fdiro->inode_read)
|
|
|
|
|
{
|
|
|
|
|
grub_xfs_read_inode (data, fdiro->ino, &fdiro->inode);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_memcpy (data->inode,
|
|
|
|
|
&fdiro->inode,
|
|
|
|
|
sizeof (struct grub_xfs_inode));
|
|
|
|
|
grub_free (fdiro);
|
|
|
|
|
|
|
|
|
|
file->size = grub_be_to_cpu64 (data->inode->size);
|
|
|
|
|
file->data = data;
|
|
|
|
|
file->offset = 0;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
if (fdiro != &data->diropen)
|
|
|
|
|
grub_free (fdiro);
|
|
|
|
|
grub_free (data);
|
|
|
|
|
|
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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_xfs_read (grub_file_t file, char *buf, grub_size_t len)
|
2005-09-28 10:07:22 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_xfs_data *data =
|
|
|
|
|
(struct grub_xfs_data *) file->data;
|
|
|
|
|
|
|
|
|
|
return grub_xfs_read_file (&data->diropen, file->read_hook,
|
|
|
|
|
file->offset, len, buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_xfs_close (grub_file_t file)
|
|
|
|
|
{
|
|
|
|
|
grub_free (file->data);
|
|
|
|
|
|
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_xfs_label (grub_device_t device, char **label)
|
|
|
|
|
{
|
|
|
|
|
struct grub_xfs_data *data;
|
|
|
|
|
grub_disk_t disk = device->disk;
|
|
|
|
|
|
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_ref (my_mod);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
data = grub_xfs_mount (disk);
|
|
|
|
|
if (data)
|
2006-04-26 21:58:36 +00:00
|
|
|
|
*label = grub_strndup ((char *) (data->sblock.label), 12);
|
2005-09-28 10:07:22 +00:00
|
|
|
|
else
|
|
|
|
|
*label = 0;
|
|
|
|
|
|
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
grub_free (data);
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct grub_fs grub_xfs_fs =
|
|
|
|
|
{
|
|
|
|
|
.name = "xfs",
|
|
|
|
|
.dir = grub_xfs_dir,
|
|
|
|
|
.open = grub_xfs_open,
|
|
|
|
|
.read = grub_xfs_read,
|
|
|
|
|
.close = grub_xfs_close,
|
|
|
|
|
.label = grub_xfs_label,
|
|
|
|
|
.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(xfs)
|
2005-09-28 10:07:22 +00:00
|
|
|
|
{
|
|
|
|
|
grub_fs_register (&grub_xfs_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
|
2005-09-28 10:07:22 +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
|
2005-09-28 10:07:22 +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(xfs)
|
2005-09-28 10:07:22 +00:00
|
|
|
|
{
|
|
|
|
|
grub_fs_unregister (&grub_xfs_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
|
|
|
|
|