2005-10-09 13:03:53 +00:00
|
|
|
|
/* sfs.c - Amiga Smart FileSystem. */
|
|
|
|
|
/*
|
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
2010-01-03 22:05:07 +00:00
|
|
|
|
* Copyright (C) 2005,2006,2007,2008,2009 Free Software Foundation, Inc.
|
2005-10-09 13:03:53 +00:00
|
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* GRUB is free software: you can redistribute it and/or modify
|
2005-10-09 13:03:53 +00:00
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
2005-10-09 13:03:53 +00:00
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* GRUB is distributed in the hope that it will be useful,
|
2005-10-09 13:03:53 +00:00
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
2005-10-09 13:03:53 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <grub/err.h>
|
|
|
|
|
#include <grub/file.h>
|
|
|
|
|
#include <grub/mm.h>
|
|
|
|
|
#include <grub/misc.h>
|
|
|
|
|
#include <grub/disk.h>
|
|
|
|
|
#include <grub/dl.h>
|
|
|
|
|
#include <grub/types.h>
|
|
|
|
|
#include <grub/fshelp.h>
|
|
|
|
|
|
2011-04-11 21:01:51 +00:00
|
|
|
|
GRUB_MOD_LICENSE ("GPLv3+");
|
|
|
|
|
|
2005-10-09 13:03:53 +00:00
|
|
|
|
/* The common header for a block. */
|
|
|
|
|
struct grub_sfs_bheader
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t magic[4];
|
|
|
|
|
grub_uint32_t chksum;
|
|
|
|
|
grub_uint32_t ipointtomyself;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
/* The sfs rootblock. */
|
|
|
|
|
struct grub_sfs_rblock
|
|
|
|
|
{
|
|
|
|
|
struct grub_sfs_bheader header;
|
|
|
|
|
grub_uint32_t version;
|
|
|
|
|
grub_uint8_t unused1[36];
|
|
|
|
|
grub_uint32_t blocksize;
|
|
|
|
|
grub_uint8_t unused2[40];
|
|
|
|
|
grub_uint8_t unused3[8];
|
|
|
|
|
grub_uint32_t rootobject;
|
|
|
|
|
grub_uint32_t btree;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
/* A SFS object container. */
|
|
|
|
|
struct grub_sfs_obj
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t unused1[4];
|
|
|
|
|
grub_uint32_t nodeid;
|
|
|
|
|
grub_uint8_t unused2[4];
|
|
|
|
|
union
|
|
|
|
|
{
|
|
|
|
|
struct
|
|
|
|
|
{
|
|
|
|
|
grub_uint32_t first_block;
|
|
|
|
|
grub_uint32_t size;
|
|
|
|
|
} file __attribute__ ((packed));
|
|
|
|
|
struct
|
|
|
|
|
{
|
|
|
|
|
grub_uint32_t hashtable;
|
|
|
|
|
grub_uint32_t dir_objc;
|
|
|
|
|
} dir __attribute__ ((packed));
|
|
|
|
|
} file_dir;
|
2010-12-11 21:48:29 +00:00
|
|
|
|
grub_uint32_t mtime;
|
2005-10-09 13:03:53 +00:00
|
|
|
|
grub_uint8_t type;
|
|
|
|
|
grub_uint8_t filename[1];
|
|
|
|
|
grub_uint8_t comment[1];
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
#define GRUB_SFS_TYPE_DELETED 32
|
|
|
|
|
#define GRUB_SFS_TYPE_SYMLINK 64
|
|
|
|
|
#define GRUB_SFS_TYPE_DIR 128
|
|
|
|
|
|
|
|
|
|
/* A SFS object container. */
|
|
|
|
|
struct grub_sfs_objc
|
|
|
|
|
{
|
|
|
|
|
struct grub_sfs_bheader header;
|
|
|
|
|
grub_uint32_t parent;
|
|
|
|
|
grub_uint32_t next;
|
|
|
|
|
grub_uint32_t prev;
|
|
|
|
|
/* The amount of objects depends on the blocksize. */
|
|
|
|
|
struct grub_sfs_obj objects[1];
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
struct grub_sfs_btree_node
|
|
|
|
|
{
|
|
|
|
|
grub_uint32_t key;
|
|
|
|
|
grub_uint32_t data;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
struct grub_sfs_btree_extent
|
|
|
|
|
{
|
|
|
|
|
grub_uint32_t key;
|
|
|
|
|
grub_uint32_t next;
|
|
|
|
|
grub_uint32_t prev;
|
|
|
|
|
grub_uint16_t size;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
struct grub_sfs_btree
|
|
|
|
|
{
|
|
|
|
|
struct grub_sfs_bheader header;
|
|
|
|
|
grub_uint16_t nodes;
|
|
|
|
|
grub_uint8_t leaf;
|
|
|
|
|
grub_uint8_t nodesize;
|
|
|
|
|
/* Normally this can be kind of node, but just extents are
|
|
|
|
|
supported. */
|
|
|
|
|
struct grub_sfs_btree_node node[1];
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct grub_fshelp_node
|
|
|
|
|
{
|
|
|
|
|
struct grub_sfs_data *data;
|
|
|
|
|
int block;
|
|
|
|
|
int size;
|
2010-12-11 21:48:29 +00:00
|
|
|
|
grub_uint32_t mtime;
|
2005-10-09 13:03:53 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Information about a "mounted" sfs filesystem. */
|
|
|
|
|
struct grub_sfs_data
|
|
|
|
|
{
|
|
|
|
|
struct grub_sfs_rblock rblock;
|
|
|
|
|
struct grub_fshelp_node diropen;
|
|
|
|
|
grub_disk_t disk;
|
|
|
|
|
|
|
|
|
|
/* Blocksize in sectors. */
|
|
|
|
|
unsigned int blocksize;
|
|
|
|
|
|
|
|
|
|
/* Label of the filesystem. */
|
|
|
|
|
char *label;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static grub_dl_t my_mod;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Lookup the extent starting with BLOCK in the filesystem described
|
|
|
|
|
by DATA. Return the extent size in SIZE and the following extent
|
|
|
|
|
in NEXTEXT. */
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_sfs_read_extent (struct grub_sfs_data *data, unsigned int block,
|
|
|
|
|
int *size, int *nextext)
|
|
|
|
|
{
|
|
|
|
|
char *treeblock;
|
|
|
|
|
struct grub_sfs_btree *tree;
|
|
|
|
|
int i;
|
|
|
|
|
int next;
|
|
|
|
|
|
|
|
|
|
treeblock = grub_malloc (data->blocksize);
|
|
|
|
|
if (!block)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
next = grub_be_to_cpu32 (data->rblock.btree);
|
|
|
|
|
tree = (struct grub_sfs_btree *) treeblock;
|
|
|
|
|
|
|
|
|
|
/* Handle this level in the btree. */
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
grub_disk_read (data->disk, next, 0, data->blocksize, treeblock);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
{
|
|
|
|
|
grub_free (treeblock);
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
2009-02-27 19:50:53 +00:00
|
|
|
|
for (i = grub_be_to_cpu16 (tree->nodes) - 1; i >= 0; i--)
|
2005-10-09 13:03:53 +00:00
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
#define EXTNODE(tree, index) \
|
|
|
|
|
((struct grub_sfs_btree_node *) (((char *) &(tree)->node[0]) \
|
|
|
|
|
+ (index) * (tree)->nodesize))
|
|
|
|
|
|
|
|
|
|
/* Follow the tree down to the leaf level. */
|
2009-02-27 19:50:53 +00:00
|
|
|
|
if ((grub_be_to_cpu32 (EXTNODE(tree, i)->key) <= block)
|
2005-10-09 13:03:53 +00:00
|
|
|
|
&& !tree->leaf)
|
|
|
|
|
{
|
|
|
|
|
next = grub_be_to_cpu32 (EXTNODE (tree, i)->data);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If the leaf level is reached, just find the correct extent. */
|
|
|
|
|
if (grub_be_to_cpu32 (EXTNODE (tree, i)->key) == block && tree->leaf)
|
|
|
|
|
{
|
|
|
|
|
struct grub_sfs_btree_extent *extent;
|
|
|
|
|
extent = (struct grub_sfs_btree_extent *) EXTNODE (tree, i);
|
|
|
|
|
|
|
|
|
|
/* We found a correct leaf. */
|
|
|
|
|
*size = grub_be_to_cpu16 (extent->size);
|
|
|
|
|
*nextext = grub_be_to_cpu32 (extent->next);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-09 13:03:53 +00:00
|
|
|
|
grub_free (treeblock);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#undef EXTNODE
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
} while (!tree->leaf);
|
|
|
|
|
|
|
|
|
|
grub_free (treeblock);
|
|
|
|
|
|
|
|
|
|
return grub_error (GRUB_ERR_FILE_READ_ERROR, "SFS extent not found");
|
|
|
|
|
}
|
|
|
|
|
|
2008-05-20 05:00:53 +00:00
|
|
|
|
static grub_disk_addr_t
|
|
|
|
|
grub_sfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
|
2005-10-09 13:03:53 +00:00
|
|
|
|
{
|
|
|
|
|
int blk = node->block;
|
|
|
|
|
int size = 0;
|
|
|
|
|
int next = 0;
|
|
|
|
|
|
|
|
|
|
while (blk)
|
|
|
|
|
{
|
|
|
|
|
grub_err_t err;
|
|
|
|
|
|
|
|
|
|
/* In case of the first block we don't have to lookup the
|
|
|
|
|
extent, the minimum size is always 1. */
|
|
|
|
|
if (fileblock == 0)
|
|
|
|
|
return blk;
|
|
|
|
|
|
|
|
|
|
err = grub_sfs_read_extent (node->data, blk, &size, &next);
|
|
|
|
|
if (err)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2008-05-20 05:00:53 +00:00
|
|
|
|
if (fileblock < (unsigned int) size)
|
2005-10-09 13:03:53 +00:00
|
|
|
|
return fileblock + blk;
|
|
|
|
|
|
|
|
|
|
fileblock -= size;
|
|
|
|
|
|
|
|
|
|
blk = next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_error (GRUB_ERR_FILE_READ_ERROR,
|
|
|
|
|
"reading a SFS block outside the extent");
|
|
|
|
|
|
|
|
|
|
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_sfs_read_file (grub_fshelp_node_t node,
|
2007-08-02 18:40:37 +00:00
|
|
|
|
void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
|
2005-10-09 13:03:53 +00:00
|
|
|
|
unsigned offset, unsigned length),
|
2011-10-16 09:57:48 +00:00
|
|
|
|
grub_off_t pos, grub_size_t len, char *buf)
|
2005-10-09 13:03:53 +00:00
|
|
|
|
{
|
|
|
|
|
return grub_fshelp_read_file (node->data->disk, node, read_hook,
|
|
|
|
|
pos, len, buf, grub_sfs_read_block,
|
|
|
|
|
node->size, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct grub_sfs_data *
|
|
|
|
|
grub_sfs_mount (grub_disk_t disk)
|
|
|
|
|
{
|
|
|
|
|
struct grub_sfs_data *data;
|
|
|
|
|
struct grub_sfs_objc *rootobjc;
|
|
|
|
|
char *rootobjc_data = 0;
|
|
|
|
|
unsigned int blk;
|
|
|
|
|
|
|
|
|
|
data = grub_malloc (sizeof (*data));
|
|
|
|
|
if (!data)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Read the rootblock. */
|
|
|
|
|
grub_disk_read (disk, 0, 0, sizeof (struct grub_sfs_rblock),
|
2009-05-13 18:58:38 +00:00
|
|
|
|
&data->rblock);
|
2005-10-09 13:03:53 +00:00
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
/* Make sure this is a sfs filesystem. */
|
2006-04-26 21:58:36 +00:00
|
|
|
|
if (grub_strncmp ((char *) (data->rblock.header.magic), "SFS", 4))
|
2005-10-09 13:03:53 +00:00
|
|
|
|
{
|
2009-12-25 00:04:51 +00:00
|
|
|
|
grub_error (GRUB_ERR_BAD_FS, "not a SFS filesystem");
|
2005-10-09 13:03:53 +00:00
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
data->blocksize = grub_be_to_cpu32 (data->rblock.blocksize);
|
|
|
|
|
rootobjc_data = grub_malloc (data->blocksize);
|
2006-04-26 21:58:36 +00:00
|
|
|
|
if (! rootobjc_data)
|
2005-10-09 13:03:53 +00:00
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
/* Read the root object container. */
|
|
|
|
|
grub_disk_read (disk, grub_be_to_cpu32 (data->rblock.rootobject), 0,
|
|
|
|
|
data->blocksize, rootobjc_data);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
rootobjc = (struct grub_sfs_objc *) rootobjc_data;
|
|
|
|
|
|
|
|
|
|
blk = grub_be_to_cpu32 (rootobjc->objects[0].file_dir.dir.dir_objc);
|
|
|
|
|
data->diropen.size = 0;
|
|
|
|
|
data->diropen.block = blk;
|
|
|
|
|
data->diropen.data = data;
|
|
|
|
|
data->disk = disk;
|
2006-04-26 21:58:36 +00:00
|
|
|
|
data->label = grub_strdup ((char *) (rootobjc->objects[0].filename));
|
2005-10-09 13:03:53 +00:00
|
|
|
|
|
|
|
|
|
return data;
|
|
|
|
|
|
|
|
|
|
fail:
|
2007-08-02 17:24:06 +00:00
|
|
|
|
if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
|
2009-12-25 00:04:51 +00:00
|
|
|
|
grub_error (GRUB_ERR_BAD_FS, "not an SFS filesystem");
|
2007-08-02 17:24:06 +00:00
|
|
|
|
|
2005-10-09 13:03:53 +00:00
|
|
|
|
grub_free (data);
|
|
|
|
|
grub_free (rootobjc_data);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
grub_sfs_read_symlink (grub_fshelp_node_t node)
|
|
|
|
|
{
|
|
|
|
|
struct grub_sfs_data *data = node->data;
|
|
|
|
|
char *symlink;
|
|
|
|
|
char *block;
|
|
|
|
|
|
|
|
|
|
block = grub_malloc (data->blocksize);
|
|
|
|
|
if (!block)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
grub_disk_read (data->disk, node->block, 0, data->blocksize, block);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
{
|
|
|
|
|
grub_free (block);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is just a wild guess, but it always worked for me. How the
|
|
|
|
|
SLNK block looks like is not documented in the SFS docs. */
|
|
|
|
|
symlink = grub_strdup (&block[24]);
|
|
|
|
|
grub_free (block);
|
|
|
|
|
if (!symlink)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
return symlink;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
grub_sfs_iterate_dir (grub_fshelp_node_t dir,
|
|
|
|
|
int NESTED_FUNC_ATTR
|
|
|
|
|
(*hook) (const char *filename,
|
|
|
|
|
enum grub_fshelp_filetype filetype,
|
|
|
|
|
grub_fshelp_node_t node))
|
|
|
|
|
{
|
|
|
|
|
struct grub_fshelp_node *node = 0;
|
|
|
|
|
struct grub_sfs_data *data = dir->data;
|
|
|
|
|
char *objc_data;
|
|
|
|
|
struct grub_sfs_objc *objc;
|
|
|
|
|
unsigned int next = dir->block;
|
|
|
|
|
int pos;
|
|
|
|
|
|
|
|
|
|
auto int NESTED_FUNC_ATTR grub_sfs_create_node (const char *name, int block,
|
2010-12-11 21:48:29 +00:00
|
|
|
|
int size, int type,
|
|
|
|
|
grub_uint32_t mtime);
|
2005-10-09 13:03:53 +00:00
|
|
|
|
|
|
|
|
|
int NESTED_FUNC_ATTR grub_sfs_create_node (const char *name, int block,
|
2010-12-11 21:48:29 +00:00
|
|
|
|
int size, int type,
|
|
|
|
|
grub_uint32_t mtime)
|
2005-10-09 13:03:53 +00:00
|
|
|
|
{
|
|
|
|
|
node = grub_malloc (sizeof (*node));
|
|
|
|
|
if (!node)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
node->data = data;
|
|
|
|
|
node->size = size;
|
|
|
|
|
node->block = block;
|
2010-12-11 21:48:29 +00:00
|
|
|
|
node->mtime = mtime;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-09 13:03:53 +00:00
|
|
|
|
return hook (name, type, node);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
objc_data = grub_malloc (data->blocksize);
|
|
|
|
|
if (!objc_data)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
/* The Object container can consist of multiple blocks, iterate over
|
|
|
|
|
every block. */
|
|
|
|
|
while (next)
|
|
|
|
|
{
|
|
|
|
|
grub_disk_read (data->disk, next, 0, data->blocksize, objc_data);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
objc = (struct grub_sfs_objc *) objc_data;
|
|
|
|
|
|
|
|
|
|
pos = (char *) &objc->objects[0] - (char *) objc;
|
|
|
|
|
|
|
|
|
|
/* Iterate over all entries in this block. */
|
|
|
|
|
while (pos + sizeof (struct grub_sfs_obj) < data->blocksize)
|
|
|
|
|
{
|
|
|
|
|
struct grub_sfs_obj *obj;
|
|
|
|
|
obj = (struct grub_sfs_obj *) ((char *) objc + pos);
|
2006-04-26 21:58:36 +00:00
|
|
|
|
char *filename = (char *) (obj->filename);
|
2005-10-09 13:03:53 +00:00
|
|
|
|
int len;
|
|
|
|
|
enum grub_fshelp_filetype type;
|
|
|
|
|
unsigned int block;
|
|
|
|
|
|
|
|
|
|
/* The filename and comment dynamically increase the size of
|
|
|
|
|
the object. */
|
|
|
|
|
len = grub_strlen (filename);
|
|
|
|
|
len += grub_strlen (filename + len + 1);
|
|
|
|
|
|
|
|
|
|
pos += sizeof (*obj) + len;
|
|
|
|
|
/* Round up to a multiple of two bytes. */
|
|
|
|
|
pos = ((pos + 1) >> 1) << 1;
|
|
|
|
|
|
|
|
|
|
if (grub_strlen (filename) == 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* First check if the file was not deleted. */
|
|
|
|
|
if (obj->type & GRUB_SFS_TYPE_DELETED)
|
|
|
|
|
continue;
|
|
|
|
|
else if (obj->type & GRUB_SFS_TYPE_SYMLINK)
|
|
|
|
|
type = GRUB_FSHELP_SYMLINK;
|
|
|
|
|
else if (obj->type & GRUB_SFS_TYPE_DIR)
|
|
|
|
|
type = GRUB_FSHELP_DIR;
|
|
|
|
|
else
|
|
|
|
|
type = GRUB_FSHELP_REG;
|
|
|
|
|
|
|
|
|
|
if (type == GRUB_FSHELP_DIR)
|
|
|
|
|
block = grub_be_to_cpu32 (obj->file_dir.dir.dir_objc);
|
|
|
|
|
else
|
|
|
|
|
block = grub_be_to_cpu32 (obj->file_dir.file.first_block);
|
|
|
|
|
|
|
|
|
|
if (grub_sfs_create_node (filename, block,
|
|
|
|
|
grub_be_to_cpu32 (obj->file_dir.file.size),
|
2010-12-11 21:48:29 +00:00
|
|
|
|
type, grub_be_to_cpu32 (obj->mtime)))
|
2005-10-09 13:03:53 +00:00
|
|
|
|
{
|
|
|
|
|
grub_free (objc_data);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
next = grub_be_to_cpu32 (objc->next);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
grub_free (objc_data);
|
2008-11-28 20:10:36 +00:00
|
|
|
|
return 0;
|
2005-10-09 13:03:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Open a file named NAME and initialize FILE. */
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_sfs_open (struct grub_file *file, const char *name)
|
|
|
|
|
{
|
|
|
|
|
struct grub_sfs_data *data;
|
|
|
|
|
struct grub_fshelp_node *fdiro = 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-09 13:03:53 +00:00
|
|
|
|
grub_dl_ref (my_mod);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-09 13:03:53 +00:00
|
|
|
|
data = grub_sfs_mount (file->device->disk);
|
|
|
|
|
if (!data)
|
|
|
|
|
goto fail;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-09 13:03:53 +00:00
|
|
|
|
grub_fshelp_find_file (name, &data->diropen, &fdiro, grub_sfs_iterate_dir,
|
|
|
|
|
grub_sfs_read_symlink, GRUB_FSHELP_REG);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-09 13:03:53 +00:00
|
|
|
|
file->size = fdiro->size;
|
|
|
|
|
data->diropen = *fdiro;
|
|
|
|
|
grub_free (fdiro);
|
|
|
|
|
|
|
|
|
|
file->data = data;
|
|
|
|
|
file->offset = 0;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
if (data && fdiro != &data->diropen)
|
|
|
|
|
grub_free (fdiro);
|
2005-10-11 16:42:32 +00:00
|
|
|
|
if (data)
|
|
|
|
|
grub_free (data->label);
|
2005-10-09 13:03:53 +00:00
|
|
|
|
grub_free (data);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-09 13:03:53 +00:00
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_sfs_close (grub_file_t file)
|
|
|
|
|
{
|
|
|
|
|
grub_free (file->data);
|
|
|
|
|
|
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
|
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Read LEN bytes data from FILE into BUF. */
|
|
|
|
|
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_sfs_read (grub_file_t file, char *buf, grub_size_t len)
|
2005-10-09 13:03:53 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_sfs_data *data = (struct grub_sfs_data *) file->data;
|
|
|
|
|
|
|
|
|
|
int size = grub_sfs_read_file (&data->diropen, file->read_hook,
|
|
|
|
|
file->offset, len, buf);
|
|
|
|
|
|
|
|
|
|
return size;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
2009-06-10 21:04:23 +00:00
|
|
|
|
grub_sfs_dir (grub_device_t device, const char *path,
|
|
|
|
|
int (*hook) (const char *filename,
|
2009-04-05 20:19:05 +00:00
|
|
|
|
const struct grub_dirhook_info *info))
|
2005-10-09 13:03:53 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_sfs_data *data = 0;
|
|
|
|
|
struct grub_fshelp_node *fdiro = 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-09 13:03:53 +00:00
|
|
|
|
auto int NESTED_FUNC_ATTR iterate (const char *filename,
|
|
|
|
|
enum grub_fshelp_filetype filetype,
|
|
|
|
|
grub_fshelp_node_t node);
|
|
|
|
|
|
|
|
|
|
int NESTED_FUNC_ATTR iterate (const char *filename,
|
|
|
|
|
enum grub_fshelp_filetype filetype,
|
|
|
|
|
grub_fshelp_node_t node)
|
|
|
|
|
{
|
2009-04-05 20:19:05 +00:00
|
|
|
|
struct grub_dirhook_info info;
|
|
|
|
|
grub_memset (&info, 0, sizeof (info));
|
|
|
|
|
info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);
|
2010-12-11 21:48:29 +00:00
|
|
|
|
info.mtime = node->mtime + 8 * 365 * 86400 + 86400 * 2;
|
|
|
|
|
info.mtimeset = 1;
|
2005-10-09 13:03:53 +00:00
|
|
|
|
grub_free (node);
|
2009-04-05 20:19:05 +00:00
|
|
|
|
return hook (filename, &info);
|
2005-10-09 13:03:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_dl_ref (my_mod);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-09 13:03:53 +00:00
|
|
|
|
data = grub_sfs_mount (device->disk);
|
|
|
|
|
if (!data)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
grub_fshelp_find_file (path, &data->diropen, &fdiro, grub_sfs_iterate_dir,
|
|
|
|
|
grub_sfs_read_symlink, GRUB_FSHELP_DIR);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
grub_sfs_iterate_dir (fdiro, iterate);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-09 13:03:53 +00:00
|
|
|
|
fail:
|
|
|
|
|
if (data && fdiro != &data->diropen)
|
|
|
|
|
grub_free (fdiro);
|
2005-10-11 16:42:32 +00:00
|
|
|
|
if (data)
|
|
|
|
|
grub_free (data->label);
|
2005-10-09 13:03:53 +00:00
|
|
|
|
grub_free (data);
|
|
|
|
|
|
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_sfs_label (grub_device_t device, char **label)
|
|
|
|
|
{
|
|
|
|
|
struct grub_sfs_data *data;
|
|
|
|
|
grub_disk_t disk = device->disk;
|
|
|
|
|
|
|
|
|
|
data = grub_sfs_mount (disk);
|
|
|
|
|
if (data)
|
|
|
|
|
*label = data->label;
|
|
|
|
|
|
|
|
|
|
grub_free (data);
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct grub_fs grub_sfs_fs =
|
|
|
|
|
{
|
|
|
|
|
.name = "sfs",
|
|
|
|
|
.dir = grub_sfs_dir,
|
|
|
|
|
.open = grub_sfs_open,
|
|
|
|
|
.read = grub_sfs_read,
|
|
|
|
|
.close = grub_sfs_close,
|
|
|
|
|
.label = grub_sfs_label,
|
2010-12-18 23:49:52 +00:00
|
|
|
|
#ifdef GRUB_UTIL
|
|
|
|
|
.reserved_first_sector = 0,
|
|
|
|
|
#endif
|
2005-10-09 13:03:53 +00:00
|
|
|
|
.next = 0
|
|
|
|
|
};
|
|
|
|
|
|
2005-11-13 Marco Gerards <mgerards@xs4all.nl>
* geninit.sh: New file.
* geninitheader.sh: Likewise.
* commands/boot.c (grub_boot_init, grub_boot_fini): Removed.
* commands/cat.c (grub_cat_init, grub_cat_fini): Likewise.
* commands/cmp.c (grub_cmp_init, grub_cmp_fini): Likewise.
* commands/configfile.c (grub_configfile_init)
(grub_configfile_fini): Likewise.
* commands/default.c (grub_default_init, grub_default_fini):
Likewise.
* commands/help.c (grub_help_init, grub_help_fini): Likewise.
* commands/ls.c (grub_ls_init, grub_ls_fini): Likewise.
* commands/search.c (grub_search_init, grub_search_fini): Likewise.
* commands/terminal.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* commands/test.c (grub_test_init, grub_test_fini): Likewise.
* commands/timeout.c (grub_timeout_init, grub_timeout_fini):
Likewise.
* commands/i386/pc/halt.c (grub_halt_init, grub_halt_fini): Likewise.
* commands/iee1275/halt.c (grub_halt_init, grub_halt_fini):
Likewise.
* commands/i386/pc/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* commands/iee1275/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* disk/loopback.c (grub_loop_init, grub_loop_fini): Likewise.
* fs/affs.c (grub_affs_init, grub_affs_fini): Likewise.
* fs/ext2.c (grub_ext2_init, grub_ext2_fini): Likewise.
* fs/fat.c (grub_fat_init, grub_fat_fini): Likewise.
* fs/hfs.c (grub_hfs_init, grub_hfs_fini): Likewise.
* fs/iso9660.c (grub_iso9660_init, grub_iso9660_fini): Likewise.
* fs/jfs.c (grub_jfs_init, grub_jfs_fini): Likewise.
* fs/minix.c (grub_minix_init, grub_minix_fini): Likewise.
* fs/sfs.c (grub_sfs_init, grub_sfs_fini): Likewise.
* fs/ufs.c (grub_ufs_init, grub_ufs_fini): Likewise.
* fs/xfs.c (grub_xfs_init, grub_xfs_fini): Likewise.
* normal/main.c (grub_normal_init, grub_normal_fini): Likewise.
* partmap/amiga.c (grub_amiga_partition_map_init)
(grub_amiga_partition_map_fini): Likewise.
* partmap/apple.c (grub_apple_partition_map_init)
(grub_apple_partition_map_fini): Likewise.
* partmap/pc.c (grub_pc_partition_map_init)
(grub_pc_partition_map_fini): Likewise.
* partmap/sun.c (grub_sun_partition_map_init,
grub_sun_partition_map_fini): Likewise.
* term/terminfo.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* util/grub-emu.c: Include <grub_modules_init.h>.
(main): Don't initialize and de-initialize any modules directly,
use `grub_init_all' and `grub_fini_all' instead.
* term/i386/pc/vesafb.c (grub_vesafb_init): Renamed to
`grub_vesafb_mod_init'.
(grub_vesafb_fini): Renamed to `grub_vesafb_mod_fini'. Updated
all users.
* term/i386/pc/vga.c (grub_vga_init): Renamed to
`grub_vga_mod_init'. Updated all users.
(grub_vga_fini): Renamed to `grub_vga_mod_fini'.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `grub_emu_init.c'.
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c): New
rules.
* include/grub/dl.h (GRUB_MOD_INIT): Add argument `name'.
Generate a function to initialize the module in utilities.
Updated all callers.
(GRUB_MOD_FINI): Add argument `name'. Generate a function to
initialize the module in utilities. Updated all callers.
2005-11-13 15:47:09 +00:00
|
|
|
|
GRUB_MOD_INIT(sfs)
|
2005-10-09 13:03:53 +00:00
|
|
|
|
{
|
|
|
|
|
grub_fs_register (&grub_sfs_fs);
|
|
|
|
|
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
|
|
|
|
GRUB_MOD_FINI(sfs)
|
2005-10-09 13:03:53 +00:00
|
|
|
|
{
|
|
|
|
|
grub_fs_unregister (&grub_sfs_fs);
|
|
|
|
|
}
|