2004-08-28 13:14:29 +00:00
|
|
|
|
/* jfs.c - JFS. */
|
|
|
|
|
/*
|
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
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
|
|
|
|
* Copyright (C) 2004,2005,2006 Free Software Foundation, Inc.
|
2004-08-28 13:14:29 +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_JFS_MAX_SYMLNK_CNT 8
|
|
|
|
|
#define GRUB_JFS_FILETYPE_MASK 0170000
|
|
|
|
|
#define GRUB_JFS_FILETYPE_REG 0100000
|
|
|
|
|
#define GRUB_JFS_FILETYPE_LNK 0120000
|
|
|
|
|
#define GRUB_JFS_FILETYPE_DIR 0040000
|
|
|
|
|
|
|
|
|
|
#define GRUB_JFS_SBLOCK 64
|
|
|
|
|
#define GRUB_JFS_AGGR_INODE 2
|
|
|
|
|
#define GRUB_JFS_FS1_INODE_BLK 104
|
|
|
|
|
|
|
|
|
|
#define GRUB_JFS_TREE_LEAF 2
|
|
|
|
|
|
|
|
|
|
struct grub_jfs_sblock
|
|
|
|
|
{
|
|
|
|
|
/* The magic for JFS. It should contain the string "JFS1". */
|
|
|
|
|
grub_uint8_t magic[4];
|
|
|
|
|
grub_uint32_t version;
|
|
|
|
|
grub_uint64_t ag_size;
|
|
|
|
|
|
|
|
|
|
/* The size of a filesystem block in bytes. XXX: currently only
|
|
|
|
|
4096 was tested. */
|
|
|
|
|
grub_uint32_t blksz;
|
|
|
|
|
grub_uint16_t log2_blksz;
|
|
|
|
|
|
|
|
|
|
grub_uint8_t unused[71];
|
|
|
|
|
grub_uint8_t volname[11];
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct grub_jfs_extent
|
|
|
|
|
{
|
|
|
|
|
/* The length of the extent in filesystem blocks. */
|
|
|
|
|
grub_uint16_t length;
|
|
|
|
|
grub_uint8_t length2;
|
|
|
|
|
|
|
|
|
|
/* The physical offset of the first block on the disk. */
|
|
|
|
|
grub_uint8_t blk1;
|
|
|
|
|
grub_uint32_t blk2;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
struct grub_jfs_iag
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t unused[3072];
|
|
|
|
|
struct grub_jfs_extent inodes[128];
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* The head of the tree used to find extents. */
|
|
|
|
|
struct grub_jfs_treehead
|
|
|
|
|
{
|
|
|
|
|
grub_uint64_t next;
|
|
|
|
|
grub_uint64_t prev;
|
|
|
|
|
|
|
|
|
|
grub_uint8_t flags;
|
|
|
|
|
grub_uint8_t unused;
|
|
|
|
|
|
|
|
|
|
grub_uint16_t count;
|
|
|
|
|
grub_uint16_t max;
|
|
|
|
|
grub_uint8_t unused2[10];
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
/* A node in the extent tree. */
|
|
|
|
|
struct grub_jfs_tree_extent
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t flags;
|
|
|
|
|
grub_uint16_t unused;
|
|
|
|
|
|
|
|
|
|
/* The offset is the key used to lookup an extent. */
|
|
|
|
|
grub_uint8_t offset1;
|
|
|
|
|
grub_uint32_t offset2;
|
|
|
|
|
|
|
|
|
|
struct grub_jfs_extent extent;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
/* The tree of directory entries. */
|
|
|
|
|
struct grub_jfs_tree_dir
|
|
|
|
|
{
|
|
|
|
|
/* Pointers to the previous and next tree headers of other nodes on
|
|
|
|
|
this level. */
|
|
|
|
|
grub_uint64_t nextb;
|
|
|
|
|
grub_uint64_t prevb;
|
|
|
|
|
|
|
|
|
|
grub_uint8_t flags;
|
|
|
|
|
|
|
|
|
|
/* The amount of dirents in this node. */
|
|
|
|
|
grub_uint8_t count;
|
|
|
|
|
grub_uint8_t freecnt;
|
|
|
|
|
grub_uint8_t freelist;
|
|
|
|
|
grub_uint8_t maxslot;
|
|
|
|
|
|
|
|
|
|
/* The location of the sorted array of pointers to dirents. */
|
|
|
|
|
grub_uint8_t sindex;
|
|
|
|
|
grub_uint8_t unused[10];
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
/* An internal node in the dirents tree. */
|
|
|
|
|
struct grub_jfs_internal_dirent
|
|
|
|
|
{
|
|
|
|
|
struct grub_jfs_extent ex;
|
|
|
|
|
grub_uint8_t next;
|
|
|
|
|
grub_uint8_t len;
|
|
|
|
|
grub_uint16_t namepart[11];
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
/* A leaf node in the dirents tree. */
|
|
|
|
|
struct grub_jfs_leaf_dirent
|
|
|
|
|
{
|
|
|
|
|
/* The inode for this dirent. */
|
|
|
|
|
grub_uint32_t inode;
|
|
|
|
|
grub_uint8_t next;
|
|
|
|
|
|
|
|
|
|
/* The size of the name. */
|
|
|
|
|
grub_uint8_t len;
|
|
|
|
|
grub_uint16_t namepart[11];
|
|
|
|
|
grub_uint32_t index;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
/* A leaf in the dirents tree. This one is used if the previously
|
|
|
|
|
dirent was not big enough to store the name. */
|
|
|
|
|
struct grub_jfs_leaf_next_dirent
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t next;
|
|
|
|
|
grub_uint8_t len;
|
|
|
|
|
grub_uint16_t namepart[15];
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
struct grub_jfs_inode
|
|
|
|
|
{
|
|
|
|
|
grub_uint32_t stamp;
|
|
|
|
|
grub_uint32_t fileset;
|
|
|
|
|
grub_uint32_t inode;
|
|
|
|
|
grub_uint8_t unused[12];
|
|
|
|
|
grub_uint64_t size;
|
|
|
|
|
grub_uint8_t unused2[20];
|
|
|
|
|
grub_uint32_t mode;
|
|
|
|
|
grub_uint8_t unused3[72];
|
|
|
|
|
grub_uint8_t unused4[96];
|
|
|
|
|
|
|
|
|
|
union
|
|
|
|
|
{
|
|
|
|
|
/* The tree describing the extents of the file. */
|
2007-05-17 15:43:32 +00:00
|
|
|
|
struct __attribute__ ((packed))
|
2004-08-28 13:14:29 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_jfs_treehead tree;
|
|
|
|
|
struct grub_jfs_tree_extent extents[16];
|
2007-05-17 15:43:32 +00:00
|
|
|
|
} file;
|
2004-08-28 13:14:29 +00:00
|
|
|
|
union
|
|
|
|
|
{
|
|
|
|
|
/* The tree describing the dirents. */
|
|
|
|
|
struct
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t unused[16];
|
|
|
|
|
grub_uint8_t flags;
|
|
|
|
|
|
|
|
|
|
/* Amount of dirents in this node. */
|
|
|
|
|
grub_uint8_t count;
|
|
|
|
|
grub_uint8_t freecnt;
|
|
|
|
|
grub_uint8_t freelist;
|
|
|
|
|
grub_uint32_t idotdot;
|
|
|
|
|
grub_uint8_t sorted[8];
|
|
|
|
|
} header;
|
|
|
|
|
struct grub_jfs_leaf_dirent dirents[8];
|
|
|
|
|
} dir __attribute__ ((packed));
|
|
|
|
|
/* Fast symlink. */
|
|
|
|
|
struct
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t unused[32];
|
|
|
|
|
grub_uint8_t path[128];
|
|
|
|
|
} symlink;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
struct grub_jfs_data
|
|
|
|
|
{
|
|
|
|
|
struct grub_jfs_sblock sblock;
|
|
|
|
|
grub_disk_t disk;
|
|
|
|
|
struct grub_jfs_inode fileset;
|
|
|
|
|
struct grub_jfs_inode currinode;
|
|
|
|
|
int pos;
|
|
|
|
|
int linknest;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
struct grub_jfs_diropen
|
|
|
|
|
{
|
|
|
|
|
int index;
|
|
|
|
|
union
|
|
|
|
|
{
|
|
|
|
|
struct grub_jfs_tree_dir header;
|
|
|
|
|
struct grub_jfs_leaf_dirent dirent[0];
|
|
|
|
|
struct grub_jfs_leaf_next_dirent next_dirent[0];
|
|
|
|
|
char sorted[0];
|
|
|
|
|
} *dirpage __attribute__ ((packed));
|
|
|
|
|
struct grub_jfs_data *data;
|
|
|
|
|
struct grub_jfs_inode *inode;
|
|
|
|
|
int count;
|
|
|
|
|
char *sorted;
|
|
|
|
|
struct grub_jfs_leaf_dirent *leaf;
|
|
|
|
|
struct grub_jfs_leaf_next_dirent *next_leaf;
|
|
|
|
|
|
|
|
|
|
/* The filename and inode of the last read dirent. */
|
|
|
|
|
char name[255];
|
|
|
|
|
grub_uint32_t ino;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
static grub_dl_t my_mod;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
static grub_err_t grub_jfs_lookup_symlink (struct grub_jfs_data *data, int ino);
|
|
|
|
|
|
|
|
|
|
/* Get the block number for the block BLK in the node INODE in the
|
|
|
|
|
mounted filesystem DATA. */
|
|
|
|
|
static int
|
|
|
|
|
grub_jfs_blkno (struct grub_jfs_data *data, struct grub_jfs_inode *inode,
|
|
|
|
|
unsigned int blk)
|
|
|
|
|
{
|
|
|
|
|
auto int getblk (struct grub_jfs_treehead *treehead,
|
|
|
|
|
struct grub_jfs_tree_extent *extents);
|
|
|
|
|
|
|
|
|
|
int getblk (struct grub_jfs_treehead *treehead,
|
|
|
|
|
struct grub_jfs_tree_extent *extents)
|
|
|
|
|
{
|
|
|
|
|
int found = -1;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < grub_le_to_cpu16 (treehead->count) - 2; i++)
|
|
|
|
|
{
|
|
|
|
|
if (treehead->flags & GRUB_JFS_TREE_LEAF)
|
|
|
|
|
{
|
|
|
|
|
/* Read the leafnode. */
|
|
|
|
|
if (grub_le_to_cpu32 (extents[i].offset2) <= blk
|
|
|
|
|
&& ((grub_le_to_cpu16 (extents[i].extent.length))
|
|
|
|
|
+ (extents[i].extent.length2 << 8)
|
|
|
|
|
+ grub_le_to_cpu32 (extents[i].offset2)) > blk)
|
|
|
|
|
return (blk - grub_le_to_cpu32 (extents[i].offset2)
|
|
|
|
|
+ grub_le_to_cpu32 (extents[i].extent.blk2));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
if (blk >= grub_le_to_cpu32 (extents[i].offset2))
|
|
|
|
|
found = i;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (found != -1)
|
|
|
|
|
{
|
|
|
|
|
struct
|
|
|
|
|
{
|
|
|
|
|
struct grub_jfs_treehead treehead;
|
|
|
|
|
struct grub_jfs_tree_extent extents[254];
|
|
|
|
|
} tree;
|
|
|
|
|
|
|
|
|
|
if (grub_disk_read (data->disk,
|
|
|
|
|
grub_le_to_cpu32 (extents[found].extent.blk2)
|
|
|
|
|
<< (grub_le_to_cpu16 (data->sblock.log2_blksz)
|
|
|
|
|
- GRUB_DISK_SECTOR_BITS), 0,
|
|
|
|
|
sizeof (tree), (char *) &tree))
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
return getblk (&tree.treehead, &tree.extents[0]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return getblk (&inode->file.tree, &inode->file.extents[0]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_jfs_read_inode (struct grub_jfs_data *data, int ino,
|
|
|
|
|
struct grub_jfs_inode *inode)
|
|
|
|
|
{
|
|
|
|
|
struct grub_jfs_iag iag;
|
|
|
|
|
int iagnum = ino / 4096;
|
|
|
|
|
int inoext = (ino % 4096) / 32;
|
|
|
|
|
int inonum = (ino % 4096) % 32;
|
|
|
|
|
grub_uint32_t iagblk;
|
|
|
|
|
grub_uint32_t inoblk;
|
|
|
|
|
|
|
|
|
|
iagblk = grub_jfs_blkno (data, &data->fileset, iagnum + 1);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
/* Read in the IAG. */
|
|
|
|
|
if (grub_disk_read (data->disk,
|
|
|
|
|
iagblk << (grub_le_to_cpu16 (data->sblock.log2_blksz)
|
|
|
|
|
- GRUB_DISK_SECTOR_BITS), 0,
|
|
|
|
|
sizeof (struct grub_jfs_iag), (char *) &iag))
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
inoblk = grub_le_to_cpu32 (iag.inodes[inoext].blk2);
|
|
|
|
|
inoblk <<= (grub_le_to_cpu16 (data->sblock.log2_blksz)
|
|
|
|
|
- GRUB_DISK_SECTOR_BITS);
|
|
|
|
|
inoblk += inonum;
|
|
|
|
|
|
|
|
|
|
if (grub_disk_read (data->disk, inoblk, 0,
|
|
|
|
|
sizeof (struct grub_jfs_inode), (char *) inode))
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct grub_jfs_data *
|
|
|
|
|
grub_jfs_mount (grub_disk_t disk)
|
|
|
|
|
{
|
|
|
|
|
struct grub_jfs_data *data = 0;
|
|
|
|
|
|
|
|
|
|
data = grub_malloc (sizeof (struct grub_jfs_data));
|
|
|
|
|
if (!data)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Read the superblock. */
|
|
|
|
|
if (grub_disk_read (disk, GRUB_JFS_SBLOCK, 0,
|
|
|
|
|
sizeof (struct grub_jfs_sblock), (char *) &data->sblock))
|
|
|
|
|
goto fail;
|
|
|
|
|
|
2006-04-26 21:58:36 +00:00
|
|
|
|
if (grub_strncmp ((char *) (data->sblock.magic), "JFS1", 4))
|
2004-08-28 13:14:29 +00:00
|
|
|
|
{
|
|
|
|
|
grub_error (GRUB_ERR_BAD_FS, "not a jfs filesystem");
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
data->disk = disk;
|
|
|
|
|
data->pos = 0;
|
|
|
|
|
data->linknest = 0;
|
|
|
|
|
|
|
|
|
|
/* Read the inode of the first fileset. */
|
|
|
|
|
if (grub_disk_read (data->disk, GRUB_JFS_FS1_INODE_BLK, 0,
|
|
|
|
|
sizeof (struct grub_jfs_inode), (char *) &data->fileset))
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
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 jfs filesystem");
|
|
|
|
|
|
2004-08-28 13:14:29 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct grub_jfs_diropen *
|
|
|
|
|
grub_jfs_opendir (struct grub_jfs_data *data, struct grub_jfs_inode *inode)
|
|
|
|
|
{
|
|
|
|
|
struct grub_jfs_internal_dirent *de;
|
|
|
|
|
struct grub_jfs_diropen *diro;
|
|
|
|
|
int blk;
|
|
|
|
|
|
|
|
|
|
de = (struct grub_jfs_internal_dirent *) inode->dir.dirents;
|
|
|
|
|
|
|
|
|
|
if (!((grub_le_to_cpu32 (inode->mode)
|
|
|
|
|
& GRUB_JFS_FILETYPE_MASK) == GRUB_JFS_FILETYPE_DIR))
|
|
|
|
|
{
|
|
|
|
|
grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a directory");
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
diro = grub_malloc (sizeof (struct grub_jfs_diropen));
|
|
|
|
|
if (!diro)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
diro->index = 0;
|
|
|
|
|
diro->data = data;
|
|
|
|
|
diro->inode = inode;
|
|
|
|
|
|
|
|
|
|
/* Check if the entire tree is contained within the inode. */
|
|
|
|
|
if (inode->file.tree.flags & GRUB_JFS_TREE_LEAF)
|
|
|
|
|
{
|
|
|
|
|
diro->leaf = inode->dir.dirents;
|
|
|
|
|
diro->next_leaf = (struct grub_jfs_leaf_next_dirent *) de;
|
2006-04-26 21:58:36 +00:00
|
|
|
|
diro->sorted = (char *) (inode->dir.header.sorted);
|
2004-08-28 13:14:29 +00:00
|
|
|
|
diro->count = inode->dir.header.count;
|
|
|
|
|
diro->dirpage = 0;
|
|
|
|
|
|
|
|
|
|
return diro;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
diro->dirpage = grub_malloc (grub_le_to_cpu32 (data->sblock.blksz));
|
|
|
|
|
if (!diro->dirpage)
|
|
|
|
|
{
|
|
|
|
|
grub_free (diro);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
blk = grub_le_to_cpu32 (de[inode->dir.header.sorted[0]].ex.blk2);
|
|
|
|
|
blk <<= (grub_le_to_cpu16 (data->sblock.log2_blksz) - GRUB_DISK_SECTOR_BITS);
|
|
|
|
|
|
|
|
|
|
/* Read in the nodes until we are on the leaf node level. */
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
int index;
|
|
|
|
|
if (grub_disk_read (data->disk, blk, 0,
|
|
|
|
|
grub_le_to_cpu32 (data->sblock.blksz),
|
|
|
|
|
diro->dirpage->sorted))
|
|
|
|
|
{
|
|
|
|
|
grub_free (diro->dirpage);
|
|
|
|
|
grub_free (diro);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
de = (struct grub_jfs_internal_dirent *) diro->dirpage->dirent;
|
|
|
|
|
index = diro->dirpage->sorted[diro->dirpage->header.sindex * 32];
|
|
|
|
|
blk = (grub_le_to_cpu32 (de[index].ex.blk2)
|
|
|
|
|
<< (grub_le_to_cpu16 (data->sblock.log2_blksz)
|
|
|
|
|
- GRUB_DISK_SECTOR_BITS));
|
|
|
|
|
} while (!(diro->dirpage->header.flags & GRUB_JFS_TREE_LEAF));
|
|
|
|
|
|
|
|
|
|
diro->leaf = diro->dirpage->dirent;
|
|
|
|
|
diro->next_leaf = diro->dirpage->next_dirent;
|
|
|
|
|
diro->sorted = &diro->dirpage->sorted[diro->dirpage->header.sindex * 32];
|
|
|
|
|
diro->count = diro->dirpage->header.count;
|
|
|
|
|
|
|
|
|
|
return diro;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
grub_jfs_closedir (struct grub_jfs_diropen *diro)
|
|
|
|
|
{
|
|
|
|
|
if (!diro)
|
|
|
|
|
return;
|
|
|
|
|
grub_free (diro->dirpage);
|
|
|
|
|
grub_free (diro);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Read in the next dirent from the directory described by DIRO. */
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_jfs_getent (struct grub_jfs_diropen *diro)
|
|
|
|
|
{
|
|
|
|
|
int strpos = 0;
|
|
|
|
|
struct grub_jfs_leaf_dirent *leaf;
|
|
|
|
|
struct grub_jfs_leaf_next_dirent *next_leaf;
|
|
|
|
|
int len;
|
|
|
|
|
int nextent;
|
|
|
|
|
grub_uint16_t filename[255];
|
|
|
|
|
|
|
|
|
|
auto void addstr (grub_uint16_t *uname, int ulen);
|
|
|
|
|
|
|
|
|
|
/* Add the unicode string to the utf16 filename buffer. */
|
|
|
|
|
void addstr (grub_uint16_t *name, int ulen)
|
|
|
|
|
{
|
|
|
|
|
while (ulen--)
|
|
|
|
|
filename[strpos++] = *(name++);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The last node, read in more. */
|
|
|
|
|
if (diro->index == diro->count)
|
|
|
|
|
{
|
|
|
|
|
unsigned int next;
|
|
|
|
|
|
|
|
|
|
/* If the inode contains the entrie tree or if this was the last
|
|
|
|
|
node, there is nothing to read. */
|
|
|
|
|
if ((diro->inode->file.tree.flags & GRUB_JFS_TREE_LEAF)
|
|
|
|
|
|| !grub_le_to_cpu64 (diro->dirpage->header.nextb))
|
|
|
|
|
return GRUB_ERR_OUT_OF_RANGE;
|
|
|
|
|
|
|
|
|
|
next = grub_le_to_cpu64 (diro->dirpage->header.nextb);
|
|
|
|
|
next <<= (grub_le_to_cpu16 (diro->data->sblock.log2_blksz)
|
|
|
|
|
- GRUB_DISK_SECTOR_BITS);
|
|
|
|
|
|
|
|
|
|
if (grub_disk_read (diro->data->disk, next, 0,
|
|
|
|
|
grub_le_to_cpu32 (diro->data->sblock.blksz),
|
|
|
|
|
diro->dirpage->sorted))
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
diro->leaf = diro->dirpage->dirent;
|
|
|
|
|
diro->next_leaf = diro->dirpage->next_dirent;
|
|
|
|
|
diro->sorted = &diro->dirpage->sorted[diro->dirpage->header.sindex * 32];
|
|
|
|
|
diro->count = diro->dirpage->header.count;
|
|
|
|
|
diro->index = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
leaf = &diro->leaf[(int) diro->sorted[diro->index]];
|
|
|
|
|
next_leaf = &diro->next_leaf[diro->index];
|
|
|
|
|
|
|
|
|
|
len = leaf->len;
|
|
|
|
|
if (!len)
|
|
|
|
|
{
|
|
|
|
|
diro->index++;
|
|
|
|
|
return grub_jfs_getent (diro);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
addstr (leaf->namepart, len < 11 ? len : 11);
|
|
|
|
|
diro->ino = grub_le_to_cpu32 (leaf->inode);
|
|
|
|
|
len -= 11;
|
|
|
|
|
|
|
|
|
|
/* Move down to the leaf level. */
|
|
|
|
|
nextent = leaf->next;
|
|
|
|
|
if (leaf->next != 255)
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
next_leaf = &diro->next_leaf[nextent];
|
|
|
|
|
addstr (next_leaf->namepart, len < 15 ? len : 15 );
|
|
|
|
|
|
|
|
|
|
len -= 15;
|
|
|
|
|
nextent = next_leaf->next;
|
|
|
|
|
} while (next_leaf->next != 255 && len > 0);
|
|
|
|
|
|
|
|
|
|
diro->index++;
|
|
|
|
|
|
|
|
|
|
/* Convert the temporary UTF16 filename to UTF8. */
|
2006-04-26 21:58:36 +00:00
|
|
|
|
*grub_utf16_to_utf8 ((grub_uint8_t *) (diro->name), filename, strpos) = '\0';
|
2004-08-28 13:14:29 +00:00
|
|
|
|
|
|
|
|
|
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_jfs_read_file (struct grub_jfs_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-08-28 13:14:29 +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-08-28 13:14:29 +00:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
int blockcnt;
|
|
|
|
|
|
|
|
|
|
/* Adjust len so it we can't read past the end of the file. */
|
|
|
|
|
if (len > data->currinode.size)
|
|
|
|
|
len = data->currinode.size;
|
|
|
|
|
|
|
|
|
|
blockcnt = ((len + pos + grub_le_to_cpu32 (data->sblock.blksz) - 1)
|
|
|
|
|
/ grub_le_to_cpu32 (data->sblock.blksz));
|
|
|
|
|
|
|
|
|
|
for (i = pos / grub_le_to_cpu32 (data->sblock.blksz); i < blockcnt; i++)
|
|
|
|
|
{
|
|
|
|
|
int blknr;
|
|
|
|
|
int blockoff = pos % grub_le_to_cpu32 (data->sblock.blksz);
|
|
|
|
|
int blockend = grub_le_to_cpu32 (data->sblock.blksz);
|
|
|
|
|
|
|
|
|
|
int skipfirst = 0;
|
|
|
|
|
|
|
|
|
|
blknr = grub_jfs_blkno (data, &data->currinode, i);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
/* Last block. */
|
|
|
|
|
if (i == blockcnt - 1)
|
|
|
|
|
{
|
|
|
|
|
blockend = (len + pos) % grub_le_to_cpu32 (data->sblock.blksz);
|
|
|
|
|
|
|
|
|
|
if (!blockend)
|
|
|
|
|
blockend = grub_le_to_cpu32 (data->sblock.blksz);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* First block. */
|
|
|
|
|
if (i == (pos / (int) grub_le_to_cpu32 (data->sblock.blksz)))
|
|
|
|
|
{
|
|
|
|
|
skipfirst = blockoff;
|
|
|
|
|
blockend -= skipfirst;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
data->disk->read_hook = read_hook;
|
|
|
|
|
grub_disk_read (data->disk,
|
|
|
|
|
blknr << (grub_le_to_cpu16 (data->sblock.log2_blksz)
|
|
|
|
|
- GRUB_DISK_SECTOR_BITS),
|
|
|
|
|
skipfirst, blockend, buf);
|
|
|
|
|
|
|
|
|
|
data->disk->read_hook = 0;
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
buf += grub_le_to_cpu32 (data->sblock.blksz) - skipfirst;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Find the file with the pathname PATH on the filesystem described by
|
|
|
|
|
DATA. */
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_jfs_find_file (struct grub_jfs_data *data, const char *path)
|
|
|
|
|
{
|
|
|
|
|
char fpath[grub_strlen (path)];
|
|
|
|
|
char *name = fpath;
|
|
|
|
|
char *next;
|
|
|
|
|
unsigned int pos = 0;
|
|
|
|
|
struct grub_jfs_diropen *diro;
|
|
|
|
|
|
|
|
|
|
grub_strncpy (fpath, path, grub_strlen (path) + 1);
|
|
|
|
|
|
|
|
|
|
if (grub_jfs_read_inode (data, GRUB_JFS_AGGR_INODE, &data->currinode))
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
/* 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++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
diro = grub_jfs_opendir (data, &data->currinode);
|
|
|
|
|
if (!diro)
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
if (grub_strlen (name) == 0)
|
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
|
|
|
|
|
|
if (grub_jfs_getent (diro) == GRUB_ERR_OUT_OF_RANGE)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Check if the current direntry matches the current part of the
|
|
|
|
|
pathname. */
|
|
|
|
|
if (!grub_strcmp (name, diro->name))
|
|
|
|
|
{
|
|
|
|
|
int ino = diro->ino;
|
|
|
|
|
int dirino = grub_le_to_cpu32 (data->currinode.inode);
|
|
|
|
|
|
|
|
|
|
grub_jfs_closedir (diro);
|
|
|
|
|
diro = 0;
|
|
|
|
|
|
|
|
|
|
if (grub_jfs_read_inode (data, ino, &data->currinode))
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Check if this is a symlink. */
|
|
|
|
|
if ((grub_le_to_cpu32 (data->currinode.mode)
|
|
|
|
|
& GRUB_JFS_FILETYPE_MASK) == GRUB_JFS_FILETYPE_LNK)
|
|
|
|
|
{
|
|
|
|
|
grub_jfs_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++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Open this directory for reading dirents. */
|
|
|
|
|
diro = grub_jfs_opendir (data, &data->currinode);
|
|
|
|
|
if (!diro)
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_jfs_closedir (diro);
|
|
|
|
|
grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_jfs_lookup_symlink (struct grub_jfs_data *data, int ino)
|
|
|
|
|
{
|
|
|
|
|
int size = grub_le_to_cpu64 (data->currinode.size);
|
|
|
|
|
char symlink[size + 1];
|
|
|
|
|
|
|
|
|
|
if (++data->linknest > GRUB_JFS_MAX_SYMLNK_CNT)
|
|
|
|
|
return grub_error (GRUB_ERR_SYMLINK_LOOP, "too deep nesting of symlinks");
|
|
|
|
|
|
|
|
|
|
if (size <= 128)
|
2006-04-26 21:58:36 +00:00
|
|
|
|
grub_strncpy (symlink, (char *) (data->currinode.symlink.path), 128);
|
2004-08-28 13:14:29 +00:00
|
|
|
|
else if (grub_jfs_read_file (data, 0, 0, size, symlink) < 0)
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
symlink[size] = '\0';
|
|
|
|
|
|
|
|
|
|
/* The symlink is an absolute path, go back to the root inode. */
|
|
|
|
|
if (symlink[0] == '/')
|
|
|
|
|
ino = 2;
|
|
|
|
|
|
|
|
|
|
/* Now load in the old inode. */
|
|
|
|
|
if (grub_jfs_read_inode (data, ino, &data->currinode))
|
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
|
|
grub_jfs_find_file (data, symlink);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
grub_error (grub_errno, "Can not follow symlink `%s'.", symlink);
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_jfs_dir (grub_device_t device, const char *path,
|
|
|
|
|
int (*hook) (const char *filename, int dir))
|
|
|
|
|
{
|
|
|
|
|
struct grub_jfs_data *data = 0;
|
|
|
|
|
struct grub_jfs_diropen *diro = 0;
|
|
|
|
|
|
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_ref (my_mod);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
data = grub_jfs_mount (device->disk);
|
|
|
|
|
if (!data)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
if (grub_jfs_find_file (data, path))
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
diro = grub_jfs_opendir (data, &data->currinode);
|
|
|
|
|
if (!diro)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
/* Iterate over the dirents in the directory that was found. */
|
|
|
|
|
while (grub_jfs_getent (diro) != GRUB_ERR_OUT_OF_RANGE)
|
|
|
|
|
{
|
|
|
|
|
struct grub_jfs_inode inode;
|
|
|
|
|
int isdir;
|
|
|
|
|
|
|
|
|
|
if (grub_jfs_read_inode (data, diro->ino, &inode))
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
isdir = (grub_le_to_cpu32 (inode.mode)
|
|
|
|
|
& GRUB_JFS_FILETYPE_MASK) == GRUB_JFS_FILETYPE_DIR;
|
|
|
|
|
if (hook (diro->name, isdir))
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* XXX: GRUB_ERR_OUT_OF_RANGE is used for the last dirent. */
|
|
|
|
|
if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
|
|
|
|
|
grub_errno = 0;
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
grub_jfs_closedir (diro);
|
|
|
|
|
grub_free (data);
|
|
|
|
|
|
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Open a file named NAME and initialize FILE. */
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_jfs_open (struct grub_file *file, const char *name)
|
|
|
|
|
{
|
|
|
|
|
struct grub_jfs_data *data;
|
|
|
|
|
|
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_ref (my_mod);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
data = grub_jfs_mount (file->device->disk);
|
|
|
|
|
if (!data)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
grub_jfs_find_file (data, name);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
/* It is only possible for open regular files. */
|
|
|
|
|
if (! ((grub_le_to_cpu32 (data->currinode.mode)
|
|
|
|
|
& GRUB_JFS_FILETYPE_MASK) == GRUB_JFS_FILETYPE_REG))
|
|
|
|
|
{
|
|
|
|
|
grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a regular file");
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
file->data = data;
|
|
|
|
|
file->size = grub_le_to_cpu64 (data->currinode.size);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
|
|
|
|
|
#ifndef GRUB_UTIL
|
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
grub_free (data);
|
|
|
|
|
|
|
|
|
|
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_jfs_read (grub_file_t file, char *buf, grub_size_t len)
|
2004-08-28 13:14:29 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_jfs_data *data =
|
|
|
|
|
(struct grub_jfs_data *) file->data;
|
|
|
|
|
|
|
|
|
|
return grub_jfs_read_file (data, file->read_hook, file->offset, len, buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_jfs_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_jfs_label (grub_device_t device, char **label)
|
|
|
|
|
{
|
|
|
|
|
struct grub_jfs_data *data;
|
|
|
|
|
data = grub_jfs_mount (device->disk);
|
|
|
|
|
|
|
|
|
|
if (data)
|
2006-04-26 21:58:36 +00:00
|
|
|
|
*label = grub_strndup ((char *) (data->sblock.volname), 11);
|
2004-08-28 13:14:29 +00:00
|
|
|
|
else
|
|
|
|
|
*label = 0;
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct grub_fs grub_jfs_fs =
|
|
|
|
|
{
|
|
|
|
|
.name = "jfs",
|
|
|
|
|
.dir = grub_jfs_dir,
|
|
|
|
|
.open = grub_jfs_open,
|
|
|
|
|
.read = grub_jfs_read,
|
|
|
|
|
.close = grub_jfs_close,
|
|
|
|
|
.label = grub_jfs_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(jfs)
|
2004-08-28 13:14:29 +00:00
|
|
|
|
{
|
|
|
|
|
grub_fs_register (&grub_jfs_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-08-28 13:14:29 +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-08-28 13:14:29 +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(jfs)
|
2004-08-28 13:14:29 +00:00
|
|
|
|
{
|
|
|
|
|
grub_fs_unregister (&grub_jfs_fs);
|
|
|
|
|
}
|