2004-05-24 21:32:21 +00:00
|
|
|
|
/* ufs.c - Unix File System */
|
|
|
|
|
/*
|
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
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
|
|
|
|
* Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
2004-05-24 21:32:21 +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.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define GRUB_UFS_MAGIC 0x11954
|
|
|
|
|
#define GRUB_UFS2_MAGIC 0x19540119
|
|
|
|
|
#define GRUB_UFS_INODE 2
|
|
|
|
|
#define GRUB_UFS_FILETYPE_DIR 4
|
|
|
|
|
#define GRUB_UFS_FILETYPE_LNK 10
|
|
|
|
|
#define GRUB_UFS_MAX_SYMLNK_CNT 8
|
|
|
|
|
|
|
|
|
|
#define GRUB_UFS_DIRBLKS 12
|
|
|
|
|
#define GRUB_UFS_INDIRBLKS 3
|
|
|
|
|
|
|
|
|
|
#define GRUB_UFS_ATTR_DIR 040000
|
|
|
|
|
|
|
|
|
|
/* Calculate in which group the inode can be found. */
|
|
|
|
|
#define inode_group(inode,sblock) ()
|
|
|
|
|
|
|
|
|
|
#define UFS_BLKSZ(sblock) (grub_le_to_cpu32 (sblock->bsize))
|
|
|
|
|
|
|
|
|
|
#define INODE(data,field) (data->ufs_type == UFS1 ? \
|
|
|
|
|
data->inode. field : data->inode2. field)
|
|
|
|
|
#define INODE_ENDIAN(data,field,bits1,bits2) (data->ufs_type == UFS1 ? \
|
|
|
|
|
grub_le_to_cpu##bits1 (data->inode.field) : \
|
|
|
|
|
grub_le_to_cpu##bits2 (data->inode2.field))
|
|
|
|
|
#define INODE_SIZE(data) INODE_ENDIAN (data,size,32,64)
|
|
|
|
|
#define INODE_MODE(data) INODE_ENDIAN (data,mode,16,16)
|
|
|
|
|
#define INODE_BLKSZ(data) (data->ufs_type == UFS1 ? 32 : 64)
|
|
|
|
|
#define INODE_DIRBLOCKS(data,blk) INODE_ENDIAN \
|
|
|
|
|
(data,blocks.dir_blocks[blk],32,64)
|
|
|
|
|
#define INODE_INDIRBLOCKS(data,blk) INODE_ENDIAN \
|
|
|
|
|
(data,blocks.indir_blocks[blk],32,64)
|
|
|
|
|
|
|
|
|
|
/* The blocks on which the superblock can be found. */
|
|
|
|
|
static int sblocklist[] = { 128, 16, 0, 512, -1 };
|
|
|
|
|
|
|
|
|
|
struct grub_ufs_sblock
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t unused[16];
|
|
|
|
|
/* The offset of the inodes in the cylinder group. */
|
|
|
|
|
grub_uint32_t inoblk_offs;
|
|
|
|
|
|
|
|
|
|
grub_uint8_t unused2[4];
|
|
|
|
|
|
|
|
|
|
/* The start of the cylinder group. */
|
|
|
|
|
grub_uint32_t cylg_offset;
|
|
|
|
|
|
|
|
|
|
grub_uint8_t unused3[20];
|
|
|
|
|
|
|
|
|
|
/* The size of a block in bytes. */
|
|
|
|
|
grub_int32_t bsize;
|
|
|
|
|
grub_uint8_t unused4[48];
|
|
|
|
|
|
|
|
|
|
/* The size of filesystem blocks to disk blocks. */
|
|
|
|
|
grub_uint32_t log2_blksz;
|
|
|
|
|
grub_uint8_t unused5[80];
|
|
|
|
|
|
|
|
|
|
/* Inodes stored per cylinder group. */
|
|
|
|
|
grub_uint32_t ino_per_group;
|
|
|
|
|
|
|
|
|
|
/* The frags per cylinder group. */
|
|
|
|
|
grub_uint32_t frags_per_group;
|
|
|
|
|
|
|
|
|
|
grub_uint8_t unused7[1180];
|
|
|
|
|
|
|
|
|
|
/* Magic value to check if this is really a UFS filesystem. */
|
|
|
|
|
grub_uint32_t magic;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* UFS inode. */
|
|
|
|
|
struct grub_ufs_inode
|
|
|
|
|
{
|
|
|
|
|
grub_uint16_t mode;
|
|
|
|
|
grub_uint16_t nlinks;
|
|
|
|
|
grub_uint16_t uid;
|
|
|
|
|
grub_uint16_t gid;
|
|
|
|
|
grub_int64_t size;
|
|
|
|
|
grub_uint64_t atime;
|
|
|
|
|
grub_uint64_t mtime;
|
|
|
|
|
grub_uint64_t ctime;
|
|
|
|
|
union
|
|
|
|
|
{
|
|
|
|
|
struct
|
|
|
|
|
{
|
|
|
|
|
grub_uint32_t dir_blocks[GRUB_UFS_DIRBLKS];
|
|
|
|
|
grub_uint32_t indir_blocks[GRUB_UFS_INDIRBLKS];
|
|
|
|
|
} blocks;
|
|
|
|
|
grub_uint8_t symlink[(GRUB_UFS_DIRBLKS + GRUB_UFS_INDIRBLKS) * 4];
|
|
|
|
|
};
|
|
|
|
|
grub_uint32_t flags;
|
|
|
|
|
grub_uint32_t nblocks;
|
|
|
|
|
grub_uint32_t gen;
|
|
|
|
|
grub_uint32_t unused;
|
|
|
|
|
grub_uint8_t pad[12];
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* UFS inode. */
|
|
|
|
|
struct grub_ufs2_inode
|
|
|
|
|
{
|
|
|
|
|
grub_uint16_t mode;
|
|
|
|
|
grub_uint16_t nlinks;
|
|
|
|
|
grub_uint32_t uid;
|
|
|
|
|
grub_uint32_t gid;
|
|
|
|
|
grub_uint32_t blocksize;
|
|
|
|
|
grub_int64_t size;
|
|
|
|
|
grub_int64_t nblocks;
|
|
|
|
|
grub_uint64_t atime;
|
|
|
|
|
grub_uint64_t mtime;
|
|
|
|
|
grub_uint64_t ctime;
|
|
|
|
|
grub_uint64_t create_time;
|
|
|
|
|
grub_uint32_t atime_sec;
|
|
|
|
|
grub_uint32_t mtime_sec;
|
|
|
|
|
grub_uint32_t ctime_sec;
|
|
|
|
|
grub_uint32_t create_time_sec;
|
|
|
|
|
grub_uint32_t gen;
|
|
|
|
|
grub_uint32_t kernel_flags;
|
|
|
|
|
grub_uint32_t flags;
|
|
|
|
|
grub_uint32_t extsz;
|
|
|
|
|
grub_uint64_t ext[2];
|
|
|
|
|
union
|
|
|
|
|
{
|
|
|
|
|
struct
|
|
|
|
|
{
|
|
|
|
|
grub_uint64_t dir_blocks[GRUB_UFS_DIRBLKS];
|
|
|
|
|
grub_uint64_t indir_blocks[GRUB_UFS_INDIRBLKS];
|
|
|
|
|
} blocks;
|
|
|
|
|
grub_uint8_t symlink[(GRUB_UFS_DIRBLKS + GRUB_UFS_INDIRBLKS) * 8];
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
grub_uint8_t unused[24];
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Directory entry. */
|
|
|
|
|
struct grub_ufs_dirent
|
|
|
|
|
{
|
|
|
|
|
grub_uint32_t ino;
|
|
|
|
|
grub_uint16_t direntlen;
|
|
|
|
|
grub_uint8_t filetype;
|
|
|
|
|
grub_uint8_t namelen;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Information about a "mounted" ufs filesystem. */
|
|
|
|
|
struct grub_ufs_data
|
|
|
|
|
{
|
|
|
|
|
struct grub_ufs_sblock sblock;
|
|
|
|
|
grub_disk_t disk;
|
|
|
|
|
union
|
|
|
|
|
{
|
|
|
|
|
struct grub_ufs_inode inode;
|
|
|
|
|
struct grub_ufs2_inode inode2;
|
|
|
|
|
};
|
|
|
|
|
enum
|
|
|
|
|
{
|
|
|
|
|
UFS1,
|
|
|
|
|
UFS2,
|
|
|
|
|
UNKNOWN
|
|
|
|
|
} ufs_type;
|
|
|
|
|
int ino;
|
|
|
|
|
int linknest;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
static grub_dl_t my_mod;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Forward declaration. */
|
|
|
|
|
static grub_err_t grub_ufs_find_file (struct grub_ufs_data *data,
|
|
|
|
|
const char *path);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
grub_ufs_get_file_block (struct grub_ufs_data *data, unsigned int blk)
|
|
|
|
|
{
|
|
|
|
|
struct grub_ufs_sblock *sblock = &data->sblock;
|
|
|
|
|
unsigned int indirsz;
|
|
|
|
|
|
|
|
|
|
/* Direct. */
|
|
|
|
|
if (blk < GRUB_UFS_DIRBLKS)
|
|
|
|
|
return INODE_DIRBLOCKS (data, blk);
|
|
|
|
|
|
|
|
|
|
blk -= GRUB_UFS_DIRBLKS;
|
|
|
|
|
|
|
|
|
|
indirsz = UFS_BLKSZ (sblock) / INODE_BLKSZ (data);
|
|
|
|
|
/* Single indirect block. */
|
|
|
|
|
if (blk < indirsz)
|
|
|
|
|
{
|
|
|
|
|
grub_uint32_t indir[UFS_BLKSZ (sblock)];
|
|
|
|
|
grub_disk_read (data->disk, INODE_INDIRBLOCKS (data, 0),
|
|
|
|
|
0, sizeof (indir), (char *) indir);
|
|
|
|
|
return indir[blk];
|
|
|
|
|
}
|
|
|
|
|
blk -= indirsz;
|
|
|
|
|
|
|
|
|
|
/* Double indirect block. */
|
|
|
|
|
if (blk < UFS_BLKSZ (sblock) / indirsz)
|
|
|
|
|
{
|
|
|
|
|
grub_uint32_t indir[UFS_BLKSZ (sblock)];
|
|
|
|
|
|
|
|
|
|
grub_disk_read (data->disk, INODE_INDIRBLOCKS (data, 1),
|
|
|
|
|
0, sizeof (indir), (char *) indir);
|
|
|
|
|
grub_disk_read (data->disk, indir[blk / indirsz],
|
|
|
|
|
0, sizeof (indir), (char *) indir);
|
|
|
|
|
|
|
|
|
|
return indir[blk % indirsz];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
|
|
|
|
|
"ufs does not support tripple indirect blocks");
|
|
|
|
|
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_ufs_read_file (struct grub_ufs_data *data,
|
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-05-24 21:32:21 +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)
|
2004-05-24 21:32:21 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_ufs_sblock *sblock = &data->sblock;
|
|
|
|
|
int i;
|
|
|
|
|
int blockcnt;
|
|
|
|
|
|
|
|
|
|
/* Adjust len so it we can't read past the end of the file. */
|
|
|
|
|
if (len > INODE_SIZE (data))
|
|
|
|
|
len = INODE_SIZE (data);
|
|
|
|
|
|
|
|
|
|
blockcnt = (len + pos + UFS_BLKSZ (sblock) - 1) / UFS_BLKSZ (sblock);
|
|
|
|
|
|
|
|
|
|
for (i = pos / UFS_BLKSZ (sblock); i < blockcnt; i++)
|
|
|
|
|
{
|
|
|
|
|
int blknr;
|
|
|
|
|
int blockoff = pos % UFS_BLKSZ (sblock);
|
|
|
|
|
int blockend = UFS_BLKSZ (sblock);
|
|
|
|
|
|
|
|
|
|
int skipfirst = 0;
|
|
|
|
|
|
|
|
|
|
blknr = grub_ufs_get_file_block (data, i);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
/* Last block. */
|
|
|
|
|
if (i == blockcnt - 1)
|
|
|
|
|
{
|
|
|
|
|
blockend = (len + pos) % UFS_BLKSZ (sblock);
|
|
|
|
|
|
|
|
|
|
if (!blockend)
|
|
|
|
|
blockend = UFS_BLKSZ (sblock);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* First block. */
|
|
|
|
|
if (i == (pos / (int) UFS_BLKSZ (sblock)))
|
|
|
|
|
{
|
|
|
|
|
skipfirst = blockoff;
|
|
|
|
|
blockend -= skipfirst;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* XXX: If the block number is 0 this block is not stored on
|
|
|
|
|
disk but is zero filled instead. */
|
|
|
|
|
if (blknr)
|
|
|
|
|
{
|
|
|
|
|
data->disk->read_hook = read_hook;
|
|
|
|
|
grub_disk_read (data->disk,
|
|
|
|
|
blknr << grub_le_to_cpu32 (data->sblock.log2_blksz),
|
|
|
|
|
skipfirst, blockend, buf);
|
|
|
|
|
data->disk->read_hook = 0;
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
grub_memset (buf, UFS_BLKSZ (sblock) - skipfirst, 0);
|
|
|
|
|
|
|
|
|
|
buf += UFS_BLKSZ (sblock) - skipfirst;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Read inode INO from the mounted filesystem described by DATA. This
|
|
|
|
|
inode is used by default now. */
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_ufs_read_inode (struct grub_ufs_data *data, int ino)
|
|
|
|
|
{
|
|
|
|
|
struct grub_ufs_sblock *sblock = &data->sblock;
|
|
|
|
|
|
|
|
|
|
/* Determine the group the inode is in. */
|
|
|
|
|
int group = ino / grub_le_to_cpu32 (sblock->ino_per_group);
|
|
|
|
|
|
|
|
|
|
/* Determine the inode within the group. */
|
|
|
|
|
int grpino = ino % grub_le_to_cpu32 (sblock->ino_per_group);
|
|
|
|
|
|
|
|
|
|
/* The first block of the group. */
|
|
|
|
|
int grpblk = group * (grub_le_to_cpu32 (sblock->frags_per_group));
|
|
|
|
|
|
|
|
|
|
if (data->ufs_type == UFS1)
|
|
|
|
|
{
|
|
|
|
|
struct grub_ufs_inode *inode = &data->inode;
|
|
|
|
|
|
|
|
|
|
grub_disk_read (data->disk,
|
|
|
|
|
(((grub_le_to_cpu32 (sblock->inoblk_offs) + grpblk)
|
|
|
|
|
<< grub_le_to_cpu32 (data->sblock.log2_blksz)))
|
|
|
|
|
+ grpino / 4,
|
|
|
|
|
(grpino % 4) * sizeof (struct grub_ufs_inode),
|
|
|
|
|
sizeof (struct grub_ufs_inode),
|
|
|
|
|
(char *) inode);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
struct grub_ufs2_inode *inode = &data->inode2;
|
|
|
|
|
|
|
|
|
|
grub_disk_read (data->disk,
|
|
|
|
|
(((grub_le_to_cpu32 (sblock->inoblk_offs) + grpblk)
|
|
|
|
|
<< grub_le_to_cpu32 (data->sblock.log2_blksz)))
|
|
|
|
|
+ grpino / 2,
|
|
|
|
|
(grpino % 2) * sizeof (struct grub_ufs2_inode),
|
|
|
|
|
sizeof (struct grub_ufs2_inode),
|
|
|
|
|
(char *) inode);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
data->ino = ino;
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Lookup the symlink the current inode points to. INO is the inode
|
|
|
|
|
number of the directory the symlink is relative to. */
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_ufs_lookup_symlink (struct grub_ufs_data *data, int ino)
|
|
|
|
|
{
|
|
|
|
|
char symlink[INODE_SIZE (data)];
|
|
|
|
|
|
|
|
|
|
if (++data->linknest > GRUB_UFS_MAX_SYMLNK_CNT)
|
|
|
|
|
return grub_error (GRUB_ERR_SYMLINK_LOOP, "too deep nesting of symlinks");
|
|
|
|
|
|
|
|
|
|
if (INODE_SIZE (data) < (GRUB_UFS_DIRBLKS + GRUB_UFS_INDIRBLKS
|
|
|
|
|
* INODE_BLKSZ (data)))
|
2006-04-26 21:58:36 +00:00
|
|
|
|
grub_strcpy (symlink, (char *) INODE (data, symlink));
|
2004-05-24 21:32:21 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
grub_disk_read (data->disk,
|
|
|
|
|
(INODE_DIRBLOCKS (data, 0)
|
|
|
|
|
<< grub_le_to_cpu32 (data->sblock.log2_blksz)),
|
|
|
|
|
0, INODE_SIZE (data), symlink);
|
|
|
|
|
symlink[INODE_SIZE (data)] = '\0';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The symlink is an absolute path, go back to the root inode. */
|
|
|
|
|
if (symlink[0] == '/')
|
|
|
|
|
ino = GRUB_UFS_INODE;
|
|
|
|
|
|
|
|
|
|
/* Now load in the old inode. */
|
|
|
|
|
if (grub_ufs_read_inode (data, ino))
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
grub_ufs_find_file (data, symlink);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
grub_error (grub_errno, "Can not follow symlink `%s'.", symlink);
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Find the file with the pathname PATH on the filesystem described by
|
|
|
|
|
DATA. */
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_ufs_find_file (struct grub_ufs_data *data, const char *path)
|
|
|
|
|
{
|
|
|
|
|
char fpath[grub_strlen (path)];
|
|
|
|
|
char *name = fpath;
|
|
|
|
|
char *next;
|
|
|
|
|
unsigned int pos = 0;
|
|
|
|
|
int dirino;
|
|
|
|
|
|
|
|
|
|
grub_strncpy (fpath, path, grub_strlen (path));
|
|
|
|
|
|
|
|
|
|
/* Skip the first slash. */
|
|
|
|
|
if (name[0] == '/')
|
|
|
|
|
{
|
|
|
|
|
name++;
|
|
|
|
|
if (!*name)
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Extract the actual part from the pathname. */
|
|
|
|
|
next = grub_strchr (name, '/');
|
|
|
|
|
if (next)
|
|
|
|
|
{
|
|
|
|
|
next[0] = '\0';
|
|
|
|
|
next++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
struct grub_ufs_dirent dirent;
|
|
|
|
|
|
|
|
|
|
if (grub_strlen (name) == 0)
|
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
|
|
|
|
|
|
if (grub_ufs_read_file (data, 0, pos, sizeof (dirent),
|
|
|
|
|
(char *) &dirent) < 0)
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
char filename[dirent.namelen + 1];
|
|
|
|
|
|
|
|
|
|
if (grub_ufs_read_file (data, 0, pos + sizeof (dirent),
|
|
|
|
|
dirent.namelen, filename) < 0)
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
filename[dirent.namelen] = '\0';
|
|
|
|
|
|
|
|
|
|
if (!grub_strcmp (name, filename))
|
|
|
|
|
{
|
|
|
|
|
dirino = data->ino;
|
|
|
|
|
grub_ufs_read_inode (data, grub_le_to_cpu32 (dirent.ino));
|
|
|
|
|
|
|
|
|
|
if (dirent.filetype == GRUB_UFS_FILETYPE_LNK)
|
|
|
|
|
{
|
|
|
|
|
grub_ufs_lookup_symlink (data, dirino);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!next)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
pos = 0;
|
|
|
|
|
|
|
|
|
|
name = next;
|
|
|
|
|
next = grub_strchr (name, '/');
|
|
|
|
|
if (next)
|
|
|
|
|
{
|
|
|
|
|
next[0] = '\0';
|
|
|
|
|
next++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!(dirent.filetype & GRUB_UFS_FILETYPE_DIR))
|
|
|
|
|
return grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a directory");
|
|
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pos += grub_le_to_cpu16 (dirent.direntlen);
|
2005-11-23 03:36:25 +00:00
|
|
|
|
} while (pos < INODE_SIZE (data));
|
2004-05-24 21:32:21 +00:00
|
|
|
|
|
|
|
|
|
grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Mount the filesystem on the disk DISK. */
|
|
|
|
|
static struct grub_ufs_data *
|
|
|
|
|
grub_ufs_mount (grub_disk_t disk)
|
|
|
|
|
{
|
|
|
|
|
struct grub_ufs_data *data;
|
|
|
|
|
int *sblklist = sblocklist;
|
|
|
|
|
|
|
|
|
|
data = grub_malloc (sizeof (struct grub_ufs_data));
|
|
|
|
|
if (!data)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Find a UFS1 or UFS2 sblock. */
|
|
|
|
|
data->ufs_type = UNKNOWN;
|
|
|
|
|
while (*sblklist != -1)
|
|
|
|
|
{
|
|
|
|
|
grub_disk_read (disk, *sblklist, 0, sizeof (struct grub_ufs_sblock),
|
|
|
|
|
(char *) &data->sblock);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
if (grub_le_to_cpu32 (data->sblock.magic) == GRUB_UFS_MAGIC)
|
|
|
|
|
{
|
|
|
|
|
data->ufs_type = UFS1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else if (grub_le_to_cpu32 (data->sblock.magic) == GRUB_UFS2_MAGIC)
|
|
|
|
|
{
|
|
|
|
|
data->ufs_type = UFS2;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
sblklist++;
|
|
|
|
|
}
|
|
|
|
|
if (data->ufs_type == UNKNOWN)
|
|
|
|
|
{
|
|
|
|
|
grub_error (GRUB_ERR_BAD_FS, "not an ufs filesystem");
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
data->disk = disk;
|
|
|
|
|
data->linknest = 0;
|
|
|
|
|
return data;
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
grub_free (data);
|
2004-11-01 16:14:16 +00:00
|
|
|
|
|
|
|
|
|
if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
|
|
|
|
|
grub_error (GRUB_ERR_BAD_FS, "not a ufs filesystem");
|
|
|
|
|
|
2004-05-24 21:32:21 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_ufs_dir (grub_device_t device, const char *path,
|
|
|
|
|
int (*hook) (const char *filename, int dir))
|
|
|
|
|
{
|
|
|
|
|
struct grub_ufs_data *data;
|
|
|
|
|
struct grub_ufs_sblock *sblock;
|
|
|
|
|
unsigned int pos = 0;
|
|
|
|
|
|
|
|
|
|
data = grub_ufs_mount (device->disk);
|
|
|
|
|
if (!data)
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
grub_ufs_read_inode (data, GRUB_UFS_INODE);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
sblock = &data->sblock;
|
|
|
|
|
|
|
|
|
|
if (!path || path[0] != '/')
|
|
|
|
|
{
|
|
|
|
|
grub_error (GRUB_ERR_BAD_FILENAME, "bad filename");
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_ufs_find_file (data, path);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
if (!(INODE_MODE (data) & GRUB_UFS_ATTR_DIR))
|
|
|
|
|
{
|
|
|
|
|
grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a directory");
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while (pos < INODE_SIZE (data))
|
|
|
|
|
{
|
|
|
|
|
struct grub_ufs_dirent dirent;
|
|
|
|
|
|
|
|
|
|
if (grub_ufs_read_file (data, 0, pos, sizeof (dirent),
|
|
|
|
|
(char *) &dirent) < 0)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
char filename[dirent.namelen + 1];
|
|
|
|
|
|
|
|
|
|
if (grub_ufs_read_file (data, 0, pos + sizeof (dirent),
|
|
|
|
|
dirent.namelen, filename) < 0)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
filename[dirent.namelen] = '\0';
|
|
|
|
|
if (hook (filename, dirent.filetype == GRUB_UFS_FILETYPE_DIR))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pos += grub_le_to_cpu16 (dirent.direntlen);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
grub_free (data);
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Open a file named NAME and initialize FILE. */
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_ufs_open (struct grub_file *file, const char *name)
|
|
|
|
|
{
|
|
|
|
|
struct grub_ufs_data *data;
|
|
|
|
|
data = grub_ufs_mount (file->device->disk);
|
|
|
|
|
if (!data)
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
grub_ufs_read_inode (data, 2);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
{
|
|
|
|
|
grub_free (data);
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!name || name[0] != '/')
|
|
|
|
|
{
|
|
|
|
|
grub_error (GRUB_ERR_BAD_FILENAME, "bad filename");
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_ufs_find_file (data, name);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
{
|
|
|
|
|
grub_free (data);
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
file->data = data;
|
|
|
|
|
file->size = INODE_SIZE (data);
|
|
|
|
|
|
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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_ufs_read (grub_file_t file, char *buf, grub_size_t len)
|
2004-05-24 21:32:21 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_ufs_data *data =
|
|
|
|
|
(struct grub_ufs_data *) file->data;
|
|
|
|
|
|
|
|
|
|
return grub_ufs_read_file (data, file->read_hook, file->offset, len, buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_ufs_close (grub_file_t file)
|
|
|
|
|
{
|
|
|
|
|
grub_free (file->data);
|
|
|
|
|
|
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_ufs_label (grub_device_t device __attribute ((unused)),
|
|
|
|
|
char **label __attribute ((unused)))
|
|
|
|
|
{
|
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct grub_fs grub_ufs_fs =
|
|
|
|
|
{
|
|
|
|
|
.name = "ufs",
|
|
|
|
|
.dir = grub_ufs_dir,
|
|
|
|
|
.open = grub_ufs_open,
|
|
|
|
|
.read = grub_ufs_read,
|
|
|
|
|
.close = grub_ufs_close,
|
|
|
|
|
.label = grub_ufs_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(ufs)
|
2004-05-24 21:32:21 +00:00
|
|
|
|
{
|
|
|
|
|
grub_fs_register (&grub_ufs_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
|
2004-05-24 21:32:21 +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
|
2004-05-24 21:32:21 +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(ufs)
|
2004-05-24 21:32:21 +00:00
|
|
|
|
{
|
|
|
|
|
grub_fs_unregister (&grub_ufs_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
|
|
|
|
|