2005-10-07 19:25:46 +00:00
|
|
|
|
/* affs.c - Amiga Fast 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-07 19:25:46 +00:00
|
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* GRUB is free software: you can redistribute it and/or modify
|
2005-10-07 19:25:46 +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-07 19:25:46 +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-07 19:25:46 +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-07 19:25:46 +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-12-14 08:52:00 +00:00
|
|
|
|
#include <grub/charset.h>
|
2005-10-07 19:25:46 +00:00
|
|
|
|
|
2011-04-11 21:01:51 +00:00
|
|
|
|
GRUB_MOD_LICENSE ("GPLv3+");
|
|
|
|
|
|
2005-10-07 19:25:46 +00:00
|
|
|
|
/* The affs bootblock. */
|
|
|
|
|
struct grub_affs_bblock
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t type[3];
|
2012-01-11 11:53:38 +00:00
|
|
|
|
grub_uint8_t flags;
|
2005-10-07 19:25:46 +00:00
|
|
|
|
grub_uint32_t checksum;
|
|
|
|
|
grub_uint32_t rootblock;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
2012-01-11 11:53:38 +00:00
|
|
|
|
/* Set if the filesystem is a AFFS filesystem. Otherwise this is an
|
|
|
|
|
OFS filesystem. */
|
|
|
|
|
#define GRUB_AFFS_FLAG_FFS 1
|
|
|
|
|
|
2005-10-07 19:25:46 +00:00
|
|
|
|
/* The affs rootblock. */
|
|
|
|
|
struct grub_affs_rblock
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t type[4];
|
|
|
|
|
grub_uint8_t unused1[8];
|
|
|
|
|
grub_uint32_t htsize;
|
|
|
|
|
grub_uint32_t unused2;
|
|
|
|
|
grub_uint32_t checksum;
|
|
|
|
|
grub_uint32_t hashtable[1];
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
2010-12-11 20:59:22 +00:00
|
|
|
|
struct grub_affs_time
|
|
|
|
|
{
|
|
|
|
|
grub_int32_t day;
|
|
|
|
|
grub_uint32_t min;
|
2010-12-11 21:02:22 +00:00
|
|
|
|
grub_uint32_t hz;
|
2010-12-11 20:59:22 +00:00
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
2005-10-07 19:25:46 +00:00
|
|
|
|
/* The second part of a file header block. */
|
|
|
|
|
struct grub_affs_file
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t unused1[12];
|
|
|
|
|
grub_uint32_t size;
|
2010-12-11 20:59:22 +00:00
|
|
|
|
grub_uint8_t unused2[92];
|
|
|
|
|
struct grub_affs_time mtime;
|
2005-10-07 19:25:46 +00:00
|
|
|
|
grub_uint8_t namelen;
|
|
|
|
|
grub_uint8_t name[30];
|
|
|
|
|
grub_uint8_t unused3[33];
|
|
|
|
|
grub_uint32_t next;
|
|
|
|
|
grub_uint32_t parent;
|
|
|
|
|
grub_uint32_t extension;
|
|
|
|
|
grub_int32_t type;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
/* The location of `struct grub_affs_file' relative to the end of a
|
|
|
|
|
file header block. */
|
|
|
|
|
#define GRUB_AFFS_FILE_LOCATION 200
|
|
|
|
|
|
|
|
|
|
/* The offset in both the rootblock and the file header block for the
|
|
|
|
|
hashtable, symlink and block pointers (all synonyms). */
|
|
|
|
|
#define GRUB_AFFS_HASHTABLE_OFFSET 24
|
|
|
|
|
#define GRUB_AFFS_BLOCKPTR_OFFSET 24
|
|
|
|
|
#define GRUB_AFFS_SYMLINK_OFFSET 24
|
|
|
|
|
|
2011-11-09 10:43:39 +00:00
|
|
|
|
#define GRUB_AFFS_FILETYPE_REG 0xfffffffd
|
|
|
|
|
#define GRUB_AFFS_FILETYPE_DIR 2
|
2005-10-07 19:25:46 +00:00
|
|
|
|
#define GRUB_AFFS_FILETYPE_SYMLINK 3
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct grub_fshelp_node
|
|
|
|
|
{
|
|
|
|
|
struct grub_affs_data *data;
|
2011-11-09 10:43:39 +00:00
|
|
|
|
grub_uint32_t block;
|
2010-12-11 20:59:22 +00:00
|
|
|
|
struct grub_fshelp_node *parent;
|
|
|
|
|
struct grub_affs_file di;
|
2011-11-09 10:43:39 +00:00
|
|
|
|
grub_uint32_t *block_cache;
|
|
|
|
|
grub_uint32_t last_block_cache;
|
2005-10-07 19:25:46 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Information about a "mounted" affs filesystem. */
|
|
|
|
|
struct grub_affs_data
|
|
|
|
|
{
|
|
|
|
|
struct grub_affs_bblock bblock;
|
|
|
|
|
struct grub_fshelp_node diropen;
|
|
|
|
|
grub_disk_t disk;
|
|
|
|
|
|
|
|
|
|
/* Blocksize in sectors. */
|
|
|
|
|
int blocksize;
|
|
|
|
|
|
|
|
|
|
/* The number of entries in the hashtable. */
|
|
|
|
|
int htsize;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static grub_dl_t my_mod;
|
|
|
|
|
|
|
|
|
|
|
2008-05-20 05:00:53 +00:00
|
|
|
|
static grub_disk_addr_t
|
|
|
|
|
grub_affs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
|
2005-10-07 19:25:46 +00:00
|
|
|
|
{
|
2011-11-09 10:43:39 +00:00
|
|
|
|
grub_uint32_t target, curblock;
|
2005-10-07 19:25:46 +00:00
|
|
|
|
grub_uint32_t pos;
|
|
|
|
|
struct grub_affs_file file;
|
|
|
|
|
struct grub_affs_data *data = node->data;
|
2011-05-18 13:35:19 +00:00
|
|
|
|
grub_uint64_t mod;
|
2005-10-07 19:25:46 +00:00
|
|
|
|
|
2011-11-09 10:43:39 +00:00
|
|
|
|
if (!node->block_cache)
|
|
|
|
|
{
|
|
|
|
|
node->block_cache = grub_malloc ((((grub_be_to_cpu32 (node->di.size)
|
|
|
|
|
+ 511) >> 9) / data->htsize + 1)
|
|
|
|
|
* sizeof (node->block_cache[0]));
|
|
|
|
|
if (!node->block_cache)
|
|
|
|
|
return -1;
|
|
|
|
|
node->last_block_cache = 0;
|
|
|
|
|
node->block_cache[0] = node->block;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Files are at most 2G on AFFS, so no need for 64-bit division. */
|
|
|
|
|
target = (grub_uint32_t) fileblock / data->htsize;
|
|
|
|
|
mod = (grub_uint32_t) fileblock % data->htsize;
|
2005-10-07 19:25:46 +00:00
|
|
|
|
/* Find the block that points to the fileblock we are looking up by
|
|
|
|
|
following the chain until the right table is reached. */
|
2011-11-09 10:43:39 +00:00
|
|
|
|
for (curblock = node->last_block_cache + 1; curblock <= target; curblock++)
|
2005-10-07 19:25:46 +00:00
|
|
|
|
{
|
2011-11-09 10:43:39 +00:00
|
|
|
|
grub_disk_read (data->disk,
|
|
|
|
|
node->block_cache[curblock - 1] + data->blocksize - 1,
|
2005-10-07 19:25:46 +00:00
|
|
|
|
data->blocksize * (GRUB_DISK_SECTOR_SIZE
|
|
|
|
|
- GRUB_AFFS_FILE_LOCATION),
|
2009-05-13 18:58:38 +00:00
|
|
|
|
sizeof (file), &file);
|
2005-10-07 19:25:46 +00:00
|
|
|
|
if (grub_errno)
|
|
|
|
|
return 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2011-11-09 10:43:39 +00:00
|
|
|
|
node->block_cache[curblock] = grub_be_to_cpu32 (file.extension);
|
|
|
|
|
node->last_block_cache = curblock;
|
2005-10-07 19:25:46 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Translate the fileblock to the block within the right table. */
|
2011-11-09 10:43:39 +00:00
|
|
|
|
grub_disk_read (data->disk, node->block_cache[target],
|
2005-10-07 19:25:46 +00:00
|
|
|
|
GRUB_AFFS_BLOCKPTR_OFFSET
|
2011-11-09 10:43:39 +00:00
|
|
|
|
+ (data->htsize - mod - 1) * sizeof (pos),
|
2009-05-13 18:58:38 +00:00
|
|
|
|
sizeof (pos), &pos);
|
2005-10-07 19:25:46 +00:00
|
|
|
|
if (grub_errno)
|
|
|
|
|
return 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-07 19:25:46 +00:00
|
|
|
|
return grub_be_to_cpu32 (pos);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct grub_affs_data *
|
|
|
|
|
grub_affs_mount (grub_disk_t disk)
|
|
|
|
|
{
|
|
|
|
|
struct grub_affs_data *data;
|
|
|
|
|
grub_uint32_t *rootblock = 0;
|
|
|
|
|
struct grub_affs_rblock *rblock;
|
|
|
|
|
|
|
|
|
|
int checksum = 0;
|
|
|
|
|
int blocksize = 0;
|
|
|
|
|
|
2011-11-09 10:43:39 +00:00
|
|
|
|
data = grub_zalloc (sizeof (struct grub_affs_data));
|
2005-10-07 19:25:46 +00:00
|
|
|
|
if (!data)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Read the bootblock. */
|
|
|
|
|
grub_disk_read (disk, 0, 0, sizeof (struct grub_affs_bblock),
|
2009-05-13 18:58:38 +00:00
|
|
|
|
&data->bblock);
|
2005-10-07 19:25:46 +00:00
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
/* Make sure this is an affs filesystem. */
|
2006-04-26 21:58:36 +00:00
|
|
|
|
if (grub_strncmp ((char *) (data->bblock.type), "DOS", 3))
|
2005-10-07 19:25:46 +00:00
|
|
|
|
{
|
2009-12-25 00:04:51 +00:00
|
|
|
|
grub_error (GRUB_ERR_BAD_FS, "not an AFFS filesystem");
|
2005-10-07 19:25:46 +00:00
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Test if the filesystem is a OFS filesystem. */
|
2012-01-11 11:53:38 +00:00
|
|
|
|
if (! (data->bblock.flags & GRUB_AFFS_FLAG_FFS))
|
2005-10-07 19:25:46 +00:00
|
|
|
|
{
|
2009-12-25 00:04:51 +00:00
|
|
|
|
grub_error (GRUB_ERR_BAD_FS, "OFS not yet supported");
|
2005-10-07 19:25:46 +00:00
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* No sane person uses more than 8KB for a block. At least I hope
|
|
|
|
|
for that person because in that case this won't work. */
|
|
|
|
|
rootblock = grub_malloc (GRUB_DISK_SECTOR_SIZE * 16);
|
|
|
|
|
if (!rootblock)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
rblock = (struct grub_affs_rblock *) rootblock;
|
|
|
|
|
|
|
|
|
|
/* Read the rootblock. */
|
2010-12-18 23:52:18 +00:00
|
|
|
|
grub_disk_read (disk, grub_be_to_cpu32 (data->bblock.rootblock), 0,
|
2009-05-13 18:58:38 +00:00
|
|
|
|
GRUB_DISK_SECTOR_SIZE * 16, rootblock);
|
2005-10-07 19:25:46 +00:00
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
/* The filesystem blocksize is not stored anywhere in the filesystem
|
|
|
|
|
itself. One way to determine it is reading blocks for the
|
|
|
|
|
rootblock until the checksum is correct. */
|
|
|
|
|
for (blocksize = 0; blocksize < 8; blocksize++)
|
|
|
|
|
{
|
|
|
|
|
grub_uint32_t *currblock = rootblock + GRUB_DISK_SECTOR_SIZE * blocksize;
|
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < GRUB_DISK_SECTOR_SIZE / sizeof (*currblock); i++)
|
|
|
|
|
checksum += grub_be_to_cpu32 (currblock[i]);
|
|
|
|
|
|
2010-12-31 14:22:36 +00:00
|
|
|
|
if (checksum == 0)
|
2005-10-07 19:25:46 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
2010-12-31 14:22:36 +00:00
|
|
|
|
if (checksum != 0)
|
2005-10-07 19:25:46 +00:00
|
|
|
|
{
|
2009-12-25 00:04:51 +00:00
|
|
|
|
grub_error (GRUB_ERR_BAD_FS, "AFFS blocksize couldn't be determined");
|
2005-10-07 19:25:46 +00:00
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
blocksize++;
|
|
|
|
|
|
|
|
|
|
data->blocksize = blocksize;
|
|
|
|
|
data->disk = disk;
|
|
|
|
|
data->htsize = grub_be_to_cpu32 (rblock->htsize);
|
|
|
|
|
data->diropen.data = data;
|
2010-12-18 23:52:18 +00:00
|
|
|
|
data->diropen.block = grub_be_to_cpu32 (data->bblock.rootblock);
|
2010-12-11 20:59:22 +00:00
|
|
|
|
data->diropen.parent = NULL;
|
|
|
|
|
grub_memcpy (&data->diropen.di, rootblock, sizeof (data->diropen.di));
|
2005-10-07 19:25:46 +00:00
|
|
|
|
|
|
|
|
|
grub_free (rootblock);
|
|
|
|
|
|
|
|
|
|
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 AFFS filesystem");
|
2007-08-02 17:24:06 +00:00
|
|
|
|
|
2005-10-07 19:25:46 +00:00
|
|
|
|
grub_free (data);
|
|
|
|
|
grub_free (rootblock);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
grub_affs_read_symlink (grub_fshelp_node_t node)
|
|
|
|
|
{
|
|
|
|
|
struct grub_affs_data *data = node->data;
|
|
|
|
|
char *symlink;
|
2011-11-09 10:43:39 +00:00
|
|
|
|
const grub_size_t symlink_size = (data->blocksize * GRUB_DISK_SECTOR_SIZE
|
|
|
|
|
- 225);
|
2005-10-07 19:25:46 +00:00
|
|
|
|
|
2011-11-09 10:43:39 +00:00
|
|
|
|
symlink = grub_malloc (symlink_size + 1);
|
2005-10-07 19:25:46 +00:00
|
|
|
|
if (!symlink)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
grub_disk_read (data->disk, node->block, GRUB_AFFS_SYMLINK_OFFSET,
|
2011-11-09 10:43:39 +00:00
|
|
|
|
symlink_size, symlink);
|
2005-10-07 19:25:46 +00:00
|
|
|
|
if (grub_errno)
|
|
|
|
|
{
|
|
|
|
|
grub_free (symlink);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2011-11-09 10:43:39 +00:00
|
|
|
|
symlink[symlink_size] = 1;
|
2009-08-15 14:45:08 +00:00
|
|
|
|
grub_dprintf ("affs", "Symlink: `%s'\n", symlink);
|
2005-10-07 19:25:46 +00:00
|
|
|
|
return symlink;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
grub_affs_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))
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
struct grub_affs_file file;
|
|
|
|
|
struct grub_fshelp_node *node = 0;
|
|
|
|
|
struct grub_affs_data *data = dir->data;
|
|
|
|
|
grub_uint32_t *hashtable;
|
|
|
|
|
|
2011-12-14 08:52:00 +00:00
|
|
|
|
auto int NESTED_FUNC_ATTR grub_affs_create_node (grub_uint32_t block,
|
2010-12-11 20:59:22 +00:00
|
|
|
|
const struct grub_affs_file *fil);
|
2005-10-07 19:25:46 +00:00
|
|
|
|
|
2011-12-14 08:52:00 +00:00
|
|
|
|
int NESTED_FUNC_ATTR grub_affs_create_node (grub_uint32_t block,
|
2010-12-11 20:59:22 +00:00
|
|
|
|
const struct grub_affs_file *fil)
|
2005-10-07 19:25:46 +00:00
|
|
|
|
{
|
2010-12-11 20:59:22 +00:00
|
|
|
|
int type;
|
2011-12-14 08:52:00 +00:00
|
|
|
|
grub_uint8_t name_u8[sizeof (fil->name) * GRUB_MAX_UTF8_PER_LATIN1 + 1];
|
2012-01-14 14:44:34 +00:00
|
|
|
|
grub_size_t len;
|
2011-12-14 08:52:00 +00:00
|
|
|
|
|
2011-11-09 10:43:39 +00:00
|
|
|
|
node = grub_zalloc (sizeof (*node));
|
2005-10-07 19:25:46 +00:00
|
|
|
|
if (!node)
|
|
|
|
|
{
|
|
|
|
|
grub_free (hashtable);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2011-11-09 10:43:39 +00:00
|
|
|
|
if (grub_be_to_cpu32 (fil->type) == GRUB_AFFS_FILETYPE_REG)
|
2010-12-11 20:59:22 +00:00
|
|
|
|
type = GRUB_FSHELP_REG;
|
2011-11-09 10:43:39 +00:00
|
|
|
|
else if (grub_be_to_cpu32 (fil->type) == GRUB_AFFS_FILETYPE_DIR)
|
2010-12-11 20:59:22 +00:00
|
|
|
|
type = GRUB_FSHELP_DIR;
|
|
|
|
|
else if (grub_be_to_cpu32 (fil->type) == GRUB_AFFS_FILETYPE_SYMLINK)
|
|
|
|
|
type = GRUB_FSHELP_SYMLINK;
|
|
|
|
|
else
|
|
|
|
|
type = GRUB_FSHELP_UNKNOWN;
|
|
|
|
|
|
2005-10-07 19:25:46 +00:00
|
|
|
|
node->data = data;
|
|
|
|
|
node->block = block;
|
2010-12-11 20:59:22 +00:00
|
|
|
|
node->di = *fil;
|
|
|
|
|
node->parent = dir;
|
2005-10-07 19:25:46 +00:00
|
|
|
|
|
2012-01-14 14:44:34 +00:00
|
|
|
|
len = fil->namelen;
|
|
|
|
|
if (len > sizeof (fil->name))
|
|
|
|
|
len = sizeof (fil->name);
|
|
|
|
|
*grub_latin1_to_utf8 (name_u8, fil->name, len) = '\0';
|
2011-12-14 08:52:00 +00:00
|
|
|
|
|
|
|
|
|
if (hook ((char *) name_u8, type, node))
|
2005-10-07 19:25:46 +00:00
|
|
|
|
{
|
|
|
|
|
grub_free (hashtable);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-12-11 20:59:22 +00:00
|
|
|
|
/* Create the directory entries for `.' and `..'. */
|
2011-11-09 10:43:39 +00:00
|
|
|
|
node = grub_zalloc (sizeof (*node));
|
2010-12-11 20:59:22 +00:00
|
|
|
|
if (!node)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
*node = *dir;
|
|
|
|
|
if (hook (".", GRUB_FSHELP_DIR, node))
|
|
|
|
|
return 1;
|
|
|
|
|
if (dir->parent)
|
|
|
|
|
{
|
2011-11-09 10:43:39 +00:00
|
|
|
|
node = grub_zalloc (sizeof (*node));
|
2010-12-11 20:59:22 +00:00
|
|
|
|
if (!node)
|
|
|
|
|
return 1;
|
|
|
|
|
*node = *dir->parent;
|
|
|
|
|
if (hook ("..", GRUB_FSHELP_DIR, node))
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2011-11-09 10:43:39 +00:00
|
|
|
|
hashtable = grub_zalloc (data->htsize * sizeof (*hashtable));
|
2005-10-07 19:25:46 +00:00
|
|
|
|
if (!hashtable)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
grub_disk_read (data->disk, dir->block, GRUB_AFFS_HASHTABLE_OFFSET,
|
|
|
|
|
data->htsize * sizeof (*hashtable), (char *) hashtable);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < data->htsize; i++)
|
|
|
|
|
{
|
2011-11-09 10:43:39 +00:00
|
|
|
|
grub_uint32_t next;
|
2005-10-07 19:25:46 +00:00
|
|
|
|
|
|
|
|
|
if (!hashtable[i])
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* Every entry in the hashtable can be chained. Read the entire
|
|
|
|
|
chain. */
|
|
|
|
|
next = grub_be_to_cpu32 (hashtable[i]);
|
|
|
|
|
|
|
|
|
|
while (next)
|
|
|
|
|
{
|
|
|
|
|
grub_disk_read (data->disk, next + data->blocksize - 1,
|
|
|
|
|
data->blocksize * GRUB_DISK_SECTOR_SIZE
|
|
|
|
|
- GRUB_AFFS_FILE_LOCATION,
|
|
|
|
|
sizeof (file), (char *) &file);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2011-12-14 08:52:00 +00:00
|
|
|
|
if (grub_affs_create_node (next, &file))
|
2005-10-07 19:25:46 +00:00
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
next = grub_be_to_cpu32 (file.next);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
}
|
2005-10-07 19:25:46 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_free (hashtable);
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
grub_free (node);
|
|
|
|
|
grub_free (hashtable);
|
2008-11-28 20:10:36 +00:00
|
|
|
|
return 0;
|
2005-10-07 19:25:46 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Open a file named NAME and initialize FILE. */
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_affs_open (struct grub_file *file, const char *name)
|
|
|
|
|
{
|
|
|
|
|
struct grub_affs_data *data;
|
|
|
|
|
struct grub_fshelp_node *fdiro = 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-07 19:25:46 +00:00
|
|
|
|
grub_dl_ref (my_mod);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-07 19:25:46 +00:00
|
|
|
|
data = grub_affs_mount (file->device->disk);
|
|
|
|
|
if (!data)
|
|
|
|
|
goto fail;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-07 19:25:46 +00:00
|
|
|
|
grub_fshelp_find_file (name, &data->diropen, &fdiro, grub_affs_iterate_dir,
|
|
|
|
|
grub_affs_read_symlink, GRUB_FSHELP_REG);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2010-12-11 20:59:22 +00:00
|
|
|
|
file->size = grub_be_to_cpu32 (fdiro->di.size);
|
2005-10-07 19:25:46 +00:00
|
|
|
|
data->diropen = *fdiro;
|
|
|
|
|
grub_free (fdiro);
|
|
|
|
|
|
|
|
|
|
file->data = data;
|
|
|
|
|
file->offset = 0;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
if (data && fdiro != &data->diropen)
|
|
|
|
|
grub_free (fdiro);
|
|
|
|
|
grub_free (data);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-07 19:25:46 +00:00
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_affs_close (grub_file_t file)
|
|
|
|
|
{
|
2011-11-09 10:43:39 +00:00
|
|
|
|
struct grub_affs_data *data =
|
|
|
|
|
(struct grub_affs_data *) file->data;
|
|
|
|
|
|
|
|
|
|
grub_free (data->diropen.block_cache);
|
2005-10-07 19:25:46 +00:00
|
|
|
|
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_affs_read (grub_file_t file, char *buf, grub_size_t len)
|
2005-10-07 19:25:46 +00:00
|
|
|
|
{
|
2009-06-10 21:04:23 +00:00
|
|
|
|
struct grub_affs_data *data =
|
2005-10-07 19:25:46 +00:00
|
|
|
|
(struct grub_affs_data *) file->data;
|
|
|
|
|
|
2011-11-09 10:43:39 +00:00
|
|
|
|
return grub_fshelp_read_file (data->diropen.data->disk, &data->diropen,
|
|
|
|
|
file->read_hook,
|
|
|
|
|
file->offset, len, buf, grub_affs_read_block,
|
|
|
|
|
grub_be_to_cpu32 (data->diropen.di.size), 0);
|
2005-10-07 19:25:46 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
2009-06-10 21:04:23 +00:00
|
|
|
|
grub_affs_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-07 19:25:46 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_affs_data *data = 0;
|
|
|
|
|
struct grub_fshelp_node *fdiro = 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-07 19:25:46 +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:02:22 +00:00
|
|
|
|
info.mtimeset = 1;
|
|
|
|
|
info.mtime = grub_be_to_cpu32 (node->di.mtime.day) * 86400
|
|
|
|
|
+ grub_be_to_cpu32 (node->di.mtime.min) * 60
|
|
|
|
|
+ grub_be_to_cpu32 (node->di.mtime.hz) / 50
|
|
|
|
|
+ 8 * 365 * 86400 + 86400 * 2;
|
2005-10-07 19:25:46 +00:00
|
|
|
|
grub_free (node);
|
2009-04-05 20:19:05 +00:00
|
|
|
|
return hook (filename, &info);
|
2005-10-07 19:25:46 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
grub_dl_ref (my_mod);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-07 19:25:46 +00:00
|
|
|
|
data = grub_affs_mount (device->disk);
|
|
|
|
|
if (!data)
|
|
|
|
|
goto fail;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-07 19:25:46 +00:00
|
|
|
|
grub_fshelp_find_file (path, &data->diropen, &fdiro, grub_affs_iterate_dir,
|
|
|
|
|
grub_affs_read_symlink, GRUB_FSHELP_DIR);
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
grub_affs_iterate_dir (fdiro, iterate);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2005-10-07 19:25:46 +00:00
|
|
|
|
fail:
|
|
|
|
|
if (data && fdiro != &data->diropen)
|
|
|
|
|
grub_free (fdiro);
|
|
|
|
|
grub_free (data);
|
|
|
|
|
|
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_affs_label (grub_device_t device, char **label)
|
|
|
|
|
{
|
|
|
|
|
struct grub_affs_data *data;
|
|
|
|
|
struct grub_affs_file file;
|
|
|
|
|
grub_disk_t disk = device->disk;
|
|
|
|
|
|
|
|
|
|
grub_dl_ref (my_mod);
|
|
|
|
|
|
|
|
|
|
data = grub_affs_mount (disk);
|
|
|
|
|
if (data)
|
|
|
|
|
{
|
2011-12-25 21:07:15 +00:00
|
|
|
|
grub_size_t len;
|
2005-10-07 19:25:46 +00:00
|
|
|
|
/* The rootblock maps quite well on a file header block, it's
|
|
|
|
|
something we can use here. */
|
2010-12-18 23:52:18 +00:00
|
|
|
|
grub_disk_read (data->disk, grub_be_to_cpu32 (data->bblock.rootblock),
|
2005-10-07 19:25:46 +00:00
|
|
|
|
data->blocksize * (GRUB_DISK_SECTOR_SIZE
|
|
|
|
|
- GRUB_AFFS_FILE_LOCATION),
|
2009-05-13 18:58:38 +00:00
|
|
|
|
sizeof (file), &file);
|
2005-10-07 19:25:46 +00:00
|
|
|
|
if (grub_errno)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2012-01-14 14:44:34 +00:00
|
|
|
|
len = file.namelen;
|
|
|
|
|
if (len > sizeof (file.name))
|
|
|
|
|
len = sizeof (file.name);
|
2011-12-25 21:07:15 +00:00
|
|
|
|
*label = grub_malloc (len * GRUB_MAX_UTF8_PER_LATIN1 + 1);
|
|
|
|
|
if (*label)
|
|
|
|
|
*grub_latin1_to_utf8 ((grub_uint8_t *) *label, file.name, len) = '\0';
|
2005-10-07 19:25:46 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
*label = 0;
|
|
|
|
|
|
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
|
|
|
|
|
grub_free (data);
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct grub_fs grub_affs_fs =
|
|
|
|
|
{
|
|
|
|
|
.name = "affs",
|
|
|
|
|
.dir = grub_affs_dir,
|
|
|
|
|
.open = grub_affs_open,
|
|
|
|
|
.read = grub_affs_read,
|
|
|
|
|
.close = grub_affs_close,
|
|
|
|
|
.label = grub_affs_label,
|
2010-12-18 23:49:52 +00:00
|
|
|
|
#ifdef GRUB_UTIL
|
|
|
|
|
.reserved_first_sector = 0,
|
|
|
|
|
#endif
|
2005-10-07 19:25:46 +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(affs)
|
2005-10-07 19:25:46 +00:00
|
|
|
|
{
|
|
|
|
|
grub_fs_register (&grub_affs_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(affs)
|
2005-10-07 19:25:46 +00:00
|
|
|
|
{
|
|
|
|
|
grub_fs_unregister (&grub_affs_fs);
|
|
|
|
|
}
|