* JFS support (PATCH) and filesystem improvements
@ 2004-08-23 12:48 Marco Gerards
2004-08-28 17:47 ` Marco Gerards
0 siblings, 1 reply; 8+ messages in thread
From: Marco Gerards @ 2004-08-23 12:48 UTC (permalink / raw)
To: grub-devel
Hi,
Here is a patch to add JFS support to GRUB 2. It has all features you
might expect from it, except support for journaling and HUGE
filesystems. I was not able to test this on filesystems with a
blocksize other than 4096 bytes, so that might not work either.
Another thing I have not implemented is looking up files using the B+
tree, if that is really a big problem for someone, please tell me. I
have tested this implementation with a huge directory and I think the
slowdown is less important than the amount of code I have to write for
this.
Because filenames are stored in UTF-16, I had to do a conversion to
UTF-8/ Okuji wrote some code for this for fat.c. I have moved this
to kern/misc.c so ufs.c can use this as well.
Please read the code or test it and send in suggestions for
improvements or bug reports. If I do not hear anything before Friday
I will commit this patch Friday.
The next filesystem on my todo is iso9660fs. I moved it up on my todo
because we already have CDROM support (for free! :)) for the PPC
port.
Before I will do that, I want to have a close look at the filesystems
currently implemented. There are some (minor) mistakes I made because
of a lack of experience, I want to fix those first. And there is a
lot of code duplication for some tasks.
The two main functions that are more or less duplicated every time is
the function to read in a file and the one to lookup files by the
path. The best way to implement this properly is writing some
filesystem helper functions (kern/fshelp.c or so). Most filesystems
can use those functions to avoid code duplication and thus bugs.
Another way to solve this problem is changing the interfaces for the
filesystems. But I do not want to do that because I like the way
things are, filesystems are in control and know what is best (some
filesystems can lookup files in B+ trees, for example).
If someone does not agree with this improvement, please tell me.
Thanks,
Marco
2004-08-23 Marco Gerards <metgerards@student.han.nl>
Add support for the JFS filesystem.
* fs/jfs.c: New file.
* include/grub/fs.h (grub_hfs_init): New prototype.
(grub_hfs_fini): New prototype.
(grub_jfs_init): New prototype.
(grub_jfs_fini): New prototype.
* conf/i386-pc.rmk (grub_setup_SOURCES): Add fs/jfs.c.
(grub_emu_SOURCES): Likewise.
(pkgdata_MODULES): Add jfs.mod.
(jfs_mod_SOURCES): New variable.
(jfs_mod_CFLAGS): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Add fs.jfs.c.
(grubof_SOURCES): Likewise.
* util/grub-emu.c (main): Initialize and deinitialize JFS support.
* fs/fat.c (grub_fat_find_dir): Convert the filename little
endian to the host endian.
(grub_fat_utf16_to_utf8): Move function from there...
* kern/misc.c (grub_utf16_to_utf8): ...to here. Do not convert
the endianess of the source string anymore.
* include/grub/misc.h (grub_utf16_to_utf8): New prototype.
Index: conf/i386-pc.rmk
===================================================================
RCS file: /cvsroot/grub/grub2/conf/i386-pc.rmk,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 i386-pc.rmk
--- conf/i386-pc.rmk 18 Aug 2004 09:00:01 -0000 1.16
+++ conf/i386-pc.rmk 23 Aug 2004 12:23:55 -0000
@@ -61,7 +61,7 @@ grub_mkimage_LDFLAGS = -llzo
grub_setup_SOURCES = util/i386/pc/grub-setup.c util/i386/pc/biosdisk.c \
util/misc.c util/i386/pc/getroot.c kern/device.c kern/disk.c \
kern/err.c kern/misc.c disk/i386/pc/partition.c fs/fat.c fs/ext2.c \
- fs/ufs.c fs/minix.c fs/hfs.c kern/file.c kern/fs.c kern/env.c
+ fs/ufs.c fs/minix.c fs/hfs.c fs/jfs.c kern/file.c kern/fs.c kern/env.c
# For grub
grub_emu_SOURCES = kern/main.c kern/device.c \
@@ -69,7 +69,7 @@ grub_emu_SOURCES = kern/main.c kern/devi
kern/misc.c kern/loader.c kern/rescue.c kern/term.c \
disk/i386/pc/partition.c kern/env.c commands/ls.c \
commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c \
- util/i386/pc/biosdisk.c fs/fat.c fs/ext2.c fs/ufs.c fs/minix.c fs/hfs.c \
+ util/i386/pc/biosdisk.c fs/fat.c fs/ext2.c fs/ufs.c fs/minix.c fs/hfs.c fs/jfs.c\
normal/cmdline.c normal/command.c normal/main.c normal/menu.c normal/arg.c \
util/console.c util/grub-emu.c util/misc.c util/i386/pc/getroot.c
grub_emu_LDFLAGS = -lncurses
@@ -79,7 +79,7 @@ genmoddep_SOURCES = util/genmoddep.c
# Modules.
pkgdata_MODULES = _chain.mod _linux.mod fat.mod ufs.mod ext2.mod minix.mod \
- hfs.mod normal.mod hello.mod vga.mod font.mod _multiboot.mod ls.mod \
+ hfs.mod jfs.mod normal.mod hello.mod vga.mod font.mod _multiboot.mod ls.mod \
boot.mod cmp.mod cat.mod terminal.mod
# For _chain.mod.
@@ -106,6 +106,10 @@ minix_mod_CFLAGS = $(COMMON_CFLAGS)
hfs_mod_SOURCES = fs/hfs.c
hfs_mod_CFLAGS = $(COMMON_CFLAGS)
+# For jfs.mod.
+jfs_mod_SOURCES = fs/jfs.c
+jfs_mod_CFLAGS = $(COMMON_CFLAGS)
+
# For _linux.mod.
_linux_mod_SOURCES = loader/i386/pc/linux.c
_linux_mod_CFLAGS = $(COMMON_CFLAGS)
Index: conf/powerpc-ieee1275.rmk
===================================================================
RCS file: /cvsroot/grub/grub2/conf/powerpc-ieee1275.rmk,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 powerpc-ieee1275.rmk
--- conf/powerpc-ieee1275.rmk 18 Aug 2004 09:00:01 -0000 1.6
+++ conf/powerpc-ieee1275.rmk 23 Aug 2004 12:23:55 -0000
@@ -26,7 +26,7 @@ grub_emu_SOURCES = kern/main.c kern/devi
kern/misc.c kern/loader.c kern/rescue.c kern/term.c \
disk/powerpc/ieee1275/partition.c \
util/i386/pc/biosdisk.c fs/fat.c fs/ext2.c fs/ufs.c fs/minix.c fs/hfs.c \
- normal/cmdline.c normal/command.c normal/main.c normal/menu.c \
+ fs/jfs.c normal/cmdline.c normal/command.c normal/main.c normal/menu.c \
normal/arg.c \
util/console.c util/grub-emu.c util/misc.c util/i386/pc/getroot.c \
kern/env.c commands/ls.c \
@@ -39,7 +39,7 @@ grubof_SOURCES = boot/powerpc/ieee1275/c
kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c \
kern/powerpc/ieee1275/init.c term/powerpc/ieee1275/ofconsole.c \
kern/powerpc/ieee1275/openfw.c fs/ext2.c fs/ufs.c fs/minix.c fs/hfs.c \
- normal/cmdline.c normal/command.c normal/main.c normal/menu.c \
+ fs/jfs.c normal/cmdline.c normal/command.c normal/main.c normal/menu.c \
disk/powerpc/ieee1275/ofdisk.c disk/powerpc/ieee1275/partition.c \
kern/env.c normal/arg.c loader/powerpc/ieee1275/linux.c \
loader/powerpc/ieee1275/linux_normal.c commands/boot.c
Index: fs/fat.c
===================================================================
RCS file: /cvsroot/grub/grub2/fs/fat.c,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 fat.c
--- fs/fat.c 4 Apr 2004 13:46:00 -0000 1.8
+++ fs/fat.c 23 Aug 2004 12:23:55 -0000
@@ -304,68 +304,6 @@ grub_fat_mount (grub_disk_t disk)
return 0;
}
-/* Convert UTF-16 (little endian) to UTF8. */
-static grub_uint8_t *
-grub_fat_utf16_to_utf8 (grub_uint8_t *dest, grub_uint16_t *src,
- grub_size_t size)
-{
- grub_uint32_t code_high = 0;
-
- while (size--)
- {
- grub_uint32_t code = grub_le_to_cpu16 (*src++);
-
- if (code_high)
- {
- if (code >= 0xDC00 && code <= 0xDFFF)
- {
- /* Surrogate pair. */
- code = ((code_high - 0xD800) << 12) + (code - 0xDC00) + 0x10000;
-
- *dest++ = (code >> 18) | 0xF0;
- *dest++ = ((code >> 12) & 0x3F) | 0x80;
- *dest++ = ((code >> 6) & 0x3F) | 0x80;
- *dest++ = (code & 0x3F) | 0x80;
- }
- else
- {
- /* Error... */
- *dest++ = '?';
- }
-
- code_high = 0;
- }
- else
- {
- if (code <= 0x007F)
- *dest++ = code;
- else if (code <= 0x07FF)
- {
- *dest++ = (code >> 6) | 0xC0;
- *dest++ = (code & 0x3F) | 0x80;
- }
- else if (code >= 0xD800 && code <= 0xDBFF)
- {
- code_high = code;
- continue;
- }
- else if (code >= 0xDC00 && code <= 0xDFFF)
- {
- /* Error... */
- *dest++ = '?';
- }
- else
- {
- *dest++ = (code >> 16) | 0xE0;
- *dest++ = ((code >> 12) & 0x3F) | 0x80;
- *dest++ = (code & 0x3F) | 0x80;
- }
- }
- }
-
- return dest;
-}
-
static grub_ssize_t
grub_fat_read_data (grub_disk_t disk, struct grub_fat_data *data,
void (*read_hook) (unsigned long sector,
@@ -610,7 +548,12 @@ grub_fat_find_dir (grub_disk_t disk, str
if (sum == checksum)
{
- *grub_fat_utf16_to_utf8 (filename, unibuf, slots * 13) = '\0';
+ int u;
+
+ for (u = 0; u < slots * 13; u++)
+ unibuf[u] = grub_le_to_cpu16 (unibuf[u]);
+
+ *grub_utf16_to_utf8 (filename, unibuf, slots * 13) = '\0';
if (*dirname == '\0' && call_hook)
{
Index: fs/jfs.c
===================================================================
RCS file: fs/jfs.c
diff -N fs/jfs.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ fs/jfs.c 23 Aug 2004 12:23:55 -0000
@@ -0,0 +1,892 @@
+/* jfs.c - JFS. */
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2004 Free Software Foundation, Inc.
+ *
+ * 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. */
+ struct
+ {
+ struct grub_jfs_treehead tree;
+ struct grub_jfs_tree_extent extents[16];
+ } file __attribute__ ((packed));
+ 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
+\f
+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;
+
+ if (grub_strncmp (data->sblock.magic, "JFS1", 4))
+ {
+ 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);
+ 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;
+ diro->sorted = inode->dir.header.sorted;
+ 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. */
+ *grub_utf16_to_utf8 (diro->name, filename, strpos) = '\0';
+
+ 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,
+ void (*read_hook) (unsigned long sector,
+ unsigned offset, unsigned length),
+ int pos, unsigned int len, char *buf)
+{
+ 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)
+ grub_strncpy (symlink, data->currinode.symlink.path, 128);
+ 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;
+}
+\f
+
+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
+grub_jfs_read (grub_file_t file, char *buf, grub_ssize_t len)
+{
+ 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)
+ *label = grub_strndup (data->sblock.volname, 11);
+ else
+ *label = 0;
+
+ return grub_errno;
+}
+\f
+
+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
+ };
+
+#ifdef GRUB_UTIL
+void
+grub_jfs_init (void)
+{
+ grub_fs_register (&grub_jfs_fs);
+}
+
+void
+grub_jfs_fini (void)
+{
+ grub_fs_unregister (&grub_jfs_fs);
+}
+#else /* ! GRUB_UTIL */
+GRUB_MOD_INIT
+{
+ grub_fs_register (&grub_jfs_fs);
+ my_mod = mod;
+}
+
+GRUB_MOD_FINI
+{
+ grub_fs_unregister (&grub_jfs_fs);
+}
+#endif /* ! GRUB_UTIL */
Index: include/grub/fs.h
===================================================================
RCS file: /cvsroot/grub/grub2/include/grub/fs.h,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 fs.h
--- include/grub/fs.h 24 May 2004 21:32:21 -0000 1.7
+++ include/grub/fs.h 23 Aug 2004 12:23:55 -0000
@@ -74,6 +74,10 @@ void grub_ufs_init (void);
void grub_ufs_fini (void);
void grub_minix_init (void);
void grub_minix_fini (void);
+void grub_hfs_init (void);
+void grub_hfs_fini (void);
+void grub_jfs_init (void);
+void grub_jfs_fini (void);
#endif /* GRUB_UTIL */
#endif /* ! GRUB_FS_HEADER */
Index: include/grub/misc.h
===================================================================
RCS file: /cvsroot/grub/grub2/include/grub/misc.h,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 misc.h
--- include/grub/misc.h 18 Aug 2004 09:00:01 -0000 1.9
+++ include/grub/misc.h 23 Aug 2004 12:23:56 -0000
@@ -58,6 +58,10 @@ int EXPORT_FUNC(grub_vprintf) (const cha
int EXPORT_FUNC(grub_sprintf) (char *str, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
int EXPORT_FUNC(grub_vsprintf) (char *str, const char *fmt, va_list args);
void EXPORT_FUNC(grub_stop) (void) __attribute__ ((noreturn));
+grub_uint8_t *EXPORT_FUNC(grub_utf16_to_utf8) (grub_uint8_t *dest,
+ grub_uint16_t *src,
+ grub_size_t size);
+
grub_err_t EXPORT_FUNC(grub_split_cmdline) (const char *str,
grub_err_t (* getline) (char **),
int *argc, char ***argv);
Index: kern/misc.c
===================================================================
RCS file: /cvsroot/grub/grub2/kern/misc.c,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 misc.c
--- kern/misc.c 18 Aug 2004 09:00:01 -0000 1.13
+++ kern/misc.c 23 Aug 2004 12:23:56 -0000
@@ -647,6 +647,68 @@ grub_sprintf (char *str, const char *fmt
return ret;
}
+/* Convert UTF-16 to UTF8. */
+grub_uint8_t *
+grub_utf16_to_utf8 (grub_uint8_t *dest, grub_uint16_t *src,
+ grub_size_t size)
+{
+ grub_uint32_t code_high = 0;
+
+ while (size--)
+ {
+ grub_uint32_t code = *src++;
+
+ if (code_high)
+ {
+ if (code >= 0xDC00 && code <= 0xDFFF)
+ {
+ /* Surrogate pair. */
+ code = ((code_high - 0xD800) << 12) + (code - 0xDC00) + 0x10000;
+
+ *dest++ = (code >> 18) | 0xF0;
+ *dest++ = ((code >> 12) & 0x3F) | 0x80;
+ *dest++ = ((code >> 6) & 0x3F) | 0x80;
+ *dest++ = (code & 0x3F) | 0x80;
+ }
+ else
+ {
+ /* Error... */
+ *dest++ = '?';
+ }
+
+ code_high = 0;
+ }
+ else
+ {
+ if (code <= 0x007F)
+ *dest++ = code;
+ else if (code <= 0x07FF)
+ {
+ *dest++ = (code >> 6) | 0xC0;
+ *dest++ = (code & 0x3F) | 0x80;
+ }
+ else if (code >= 0xD800 && code <= 0xDBFF)
+ {
+ code_high = code;
+ continue;
+ }
+ else if (code >= 0xDC00 && code <= 0xDFFF)
+ {
+ /* Error... */
+ *dest++ = '?';
+ }
+ else
+ {
+ *dest++ = (code >> 16) | 0xE0;
+ *dest++ = ((code >> 12) & 0x3F) | 0x80;
+ *dest++ = (code & 0x3F) | 0x80;
+ }
+ }
+ }
+
+ return dest;
+}
+
grub_err_t
grub_split_cmdline (const char *cmdline, grub_err_t (* getline) (char **), int *argc, char ***argv)
{
Index: util/grub-emu.c
===================================================================
RCS file: /cvsroot/grub/grub2/util/grub-emu.c,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 grub-emu.c
--- util/grub-emu.c 18 Aug 2004 09:00:01 -0000 1.6
+++ util/grub-emu.c 23 Aug 2004 12:23:56 -0000
@@ -161,6 +161,7 @@ main (int argc, char *argv[])
grub_ufs_init ();
grub_minix_init ();
grub_hfs_init ();
+ grub_jfs_init ();
grub_ls_init ();
grub_boot_init ();
grub_cmp_init ();
@@ -179,6 +180,7 @@ main (int argc, char *argv[])
grub_ext2_fini ();
grub_minix_fini ();
grub_hfs_fini ();
+ grub_jfs_fini ();
grub_fat_fini ();
grub_boot_fini ();
grub_cmp_fini ();
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: JFS support (PATCH) and filesystem improvements
2004-08-23 12:48 JFS support (PATCH) and filesystem improvements Marco Gerards
@ 2004-08-28 17:47 ` Marco Gerards
2004-08-29 23:00 ` Tomas Ebenlendr
2004-08-30 10:22 ` Yoshinori K. Okuji
0 siblings, 2 replies; 8+ messages in thread
From: Marco Gerards @ 2004-08-28 17:47 UTC (permalink / raw)
To: The development of GRUB 2
Marco Gerards <metgerards@student.han.nl> writes:
> Please read the code or test it and send in suggestions for
> improvements or bug reports. If I do not hear anything before Friday
> I will commit this patch Friday.
Committed.
> Before I will do that, I want to have a close look at the filesystems
> currently implemented. There are some (minor) mistakes I made because
> of a lack of experience, I want to fix those first. And there is a
> lot of code duplication for some tasks.
And here is a patch for that.
To avoid code duplication I wrote kern/fshelp.c, which has the
following two functions:
- grub_fshelp_find_file
A function that can be used to lookup nodes using a path. This code
is required in almost any filesystem. It can also handle symlinks
and check for many errors.
- grub_fshelp_read_file
This function takes a number of a offset in a file and the length to
read and read that part of the file into a buffer supplied by the
filesystem.
These two functions are helper functions for filesystems. It is used
to avoid bugs and code duplication and making my live easier :). The
filesystem has to define grub_fshelp_node which describes a single
filesystem node and a few callback functions to help the functions I
described above.
I would really appreciate it if someone takes a look at the code and
especially fshelp.c and fshelp.h to see if the interfaces are right,
etc. Of course I have tested the code and I think it is ready to be
committed, but I don't want to do that silently, so please reply...
When this patch is in I will make these changes for other filesystems
as well.
Thanks,
Marco
2004-08-28 Marco Gerards <metgerards@student.han.nl>
* conf/i386-pc.rmk (kernel_img_SOURCES): Added kern/fshelp.c.
(grub_mkimage_LDFLAGS): Likewise.
(grub_emu_SOURCES): Likewise.
(kernel_img_HEADERS): Added fshelp.h.
* fs/ext2.c: Include <grub/fshelp.h>.
(FILETYPE_REG): New macro.
(FILETYPE_INO_REG): Likewise.
(grub_ext_sblock): Renamed to `grub_ext2_sblock'.
Changed all users.
(ext2_block_group): Renamed to `grub_ext2_block_group'. Changed
all users.
(grub_fshelp_node): New struct.
(grub_ext2_data): Added member `diropen'. Changed member `inode'
to a pointer.
(grub_ext2_get_file_block): Removed function.
(grub_ext2_read_block): New function.
(grub_ext2_read_file): Replaced parameter `data' by `node'.
This function was written.
(grub_ext2_mount): Read the root inode. Create a diropen struct.
(grub_ext2_find_file): Removed function.
(grub_ext2_read_symlink): New function.
(grub_ext2_iterate_dir): Likewise.
(grub_ext2_open): Rewritten.
(grub_ext2_dir): Rewritten.
* include/grub/fshelp.h: New file.
* kern/fshelp.c: Likewise.
Index: conf/i386-pc.rmk
===================================================================
RCS file: /cvsroot/grub/grub2/conf/i386-pc.rmk,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 i386-pc.rmk
--- conf/i386-pc.rmk 28 Aug 2004 13:14:29 -0000 1.17
+++ conf/i386-pc.rmk 28 Aug 2004 17:05:00 -0000
@@ -23,7 +23,7 @@ diskboot_img_LDFLAGS = -nostdlib -Wl,-N,
# For kernel.img.
kernel_img_SOURCES = kern/i386/pc/startup.S kern/main.c kern/device.c \
- kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
+ kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c kern/fshelp.c \
kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c \
kern/i386/dl.c kern/i386/pc/init.c disk/i386/pc/partition.c \
kern/env.c disk/i386/pc/biosdisk.c \
@@ -33,7 +33,7 @@ kernel_img_HEADERS = boot.h device.h dis
file.h fs.h kernel.h loader.h misc.h mm.h net.h rescue.h symbol.h \
term.h types.h machine/biosdisk.h machine/boot.h \
machine/console.h machine/init.h machine/memory.h \
- machine/loader.h machine/partition.h machine/vga.h arg.h env.h
+ machine/loader.h machine/partition.h machine/vga.h arg.h env.h fshelp.h
kernel_img_CFLAGS = $(COMMON_CFLAGS)
kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
kernel_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,8200
@@ -61,10 +61,10 @@ grub_mkimage_LDFLAGS = -llzo
grub_setup_SOURCES = util/i386/pc/grub-setup.c util/i386/pc/biosdisk.c \
util/misc.c util/i386/pc/getroot.c kern/device.c kern/disk.c \
kern/err.c kern/misc.c disk/i386/pc/partition.c fs/fat.c fs/ext2.c \
- fs/ufs.c fs/minix.c fs/hfs.c fs/jfs.c kern/file.c kern/fs.c kern/env.c
+ fs/ufs.c fs/minix.c fs/hfs.c fs/jfs.c kern/file.c kern/fs.c kern/env.c kern/fshelp.c
# For grub
-grub_emu_SOURCES = kern/main.c kern/device.c \
+grub_emu_SOURCES = kern/main.c kern/device.c kern/fshelp.c \
kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
kern/misc.c kern/loader.c kern/rescue.c kern/term.c \
disk/i386/pc/partition.c kern/env.c commands/ls.c \
Index: fs/ext2.c
===================================================================
RCS file: /cvsroot/grub/grub2/fs/ext2.c,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 ext2.c
--- fs/ext2.c 13 Aug 2004 22:33:35 -0000 1.8
+++ fs/ext2.c 28 Aug 2004 17:05:00 -0000
@@ -29,11 +29,13 @@
/* Filetype used in directory entry. */
#define FILETYPE_UNKNOWN 0
+#define FILETYPE_REG 1
#define FILETYPE_DIRECTORY 2
#define FILETYPE_SYMLINK 7
/* Filetype information as used in inodes. */
#define FILETYPE_INO_MASK 0170000
+#define FILETYPE_INO_REG 0100000
#define FILETYPE_INO_DIRECTORY 0040000
#define FILETYPE_INO_SYMLINK 0120000
@@ -44,6 +46,7 @@
#include <grub/disk.h>
#include <grub/dl.h>
#include <grub/types.h>
+#include <grub/fshelp.h>
/* Log2 size of ext2 block in 512 blocks. */
#define LOG2_EXT2_BLOCK_SIZE(data) \
@@ -57,7 +60,7 @@
#define EXT2_BLOCK_SIZE(data) (1 << LOG2_BLOCK_SIZE(data))
/* The ext2 superblock. */
-struct grub_ext_sblock
+struct grub_ext2_sblock
{
grub_uint32_t total_inodes;
grub_uint32_t total_blocks;
@@ -97,7 +100,7 @@ struct grub_ext_sblock
};
/* The ext2 blockgroup. */
-struct ext2_block_group
+struct grub_ext2_block_group
{
grub_uint32_t block_id;
grub_uint32_t inode_id;
@@ -150,12 +153,21 @@ struct ext2_dirent
grub_uint8_t filetype;
};
+struct grub_fshelp_node
+{
+ struct grub_ext2_data *data;
+ struct grub_ext2_inode inode;
+ int ino;
+ int inode_read;
+};
+
/* Information about a "mounted" ext2 filesystem. */
struct grub_ext2_data
{
- struct grub_ext_sblock sblock;
+ struct grub_ext2_sblock sblock;
grub_disk_t disk;
- struct grub_ext2_inode inode;
+ struct grub_ext2_inode *inode;
+ struct grub_fshelp_node diropen;
};
#ifndef GRUB_UTIL
@@ -166,60 +178,59 @@ static grub_dl_t my_mod;
the mounted filesystem DATA. */
inline static grub_err_t
grub_ext2_blockgroup (struct grub_ext2_data *data, int group,
- struct ext2_block_group *blkgrp)
+ struct grub_ext2_block_group *blkgrp)
{
- return grub_disk_read (data->disk,
+ return grub_disk_read (data->disk,
((grub_le_to_cpu32 (data->sblock.first_data_block) + 1)
<< LOG2_EXT2_BLOCK_SIZE (data)),
- group * sizeof (struct ext2_block_group),
- sizeof (struct ext2_block_group), (char *) blkgrp);
+ group * sizeof (struct grub_ext2_block_group),
+ sizeof (struct grub_ext2_block_group), (char *) blkgrp);
}
-/* Return in BLOCK the on disk block number of block FILEBLOCK in the
- opened file descibed by DATA. If this block is not stored on disk
- in case of a sparse file return 0. */
-static grub_err_t
-grub_ext2_get_file_block (struct grub_ext2_data *data,
- int fileblock, int *block)
+
+static int
+grub_ext2_read_block (grub_fshelp_node_t node, int fileblock)
{
+ struct grub_ext2_data *data = node->data;
+ struct grub_ext2_inode *inode = &node->inode;
int blknr;
- struct grub_ext2_inode *inode = &data->inode;
-
+ int blksz = EXT2_BLOCK_SIZE (data);
+ int log2_blksz = LOG2_EXT2_BLOCK_SIZE (data);
+
/* Direct blocks. */
if (fileblock < INDIRECT_BLOCKS)
blknr = grub_le_to_cpu32 (inode->blocks.dir_blocks[fileblock]);
/* Indirect. */
- else if (fileblock < INDIRECT_BLOCKS + EXT2_BLOCK_SIZE (data) / 4)
+ else if (fileblock < INDIRECT_BLOCKS + blksz / 4)
{
- grub_uint32_t indir[EXT2_BLOCK_SIZE (data) / 4];
+ grub_uint32_t indir[blksz / 4];
if (grub_disk_read (data->disk,
grub_le_to_cpu32 (inode->blocks.indir_block)
- << LOG2_EXT2_BLOCK_SIZE (data),
- 0, EXT2_BLOCK_SIZE (data), (char *) indir))
+ << log2_blksz,
+ 0, blksz, (char *) indir))
return grub_errno;
blknr = grub_le_to_cpu32 (indir[fileblock - INDIRECT_BLOCKS]);
}
/* Double indirect. */
- else if (fileblock < INDIRECT_BLOCKS + EXT2_BLOCK_SIZE (data) / 4
- * (EXT2_BLOCK_SIZE (data) / 4 + 1))
+ else if (fileblock < INDIRECT_BLOCKS + blksz / 4 * (blksz / 4 + 1))
{
- unsigned int perblock = EXT2_BLOCK_SIZE (data) / 4;
+ unsigned int perblock = blksz / 4;
unsigned int rblock = fileblock - (INDIRECT_BLOCKS
- + EXT2_BLOCK_SIZE (data) / 4);
- grub_uint32_t indir[EXT2_BLOCK_SIZE (data) / 4];
+ + blksz / 4);
+ grub_uint32_t indir[blksz / 4];
if (grub_disk_read (data->disk,
grub_le_to_cpu32 (inode->blocks.double_indir_block)
- << LOG2_EXT2_BLOCK_SIZE (data),
- 0, EXT2_BLOCK_SIZE (data), (char *) indir))
+ << log2_blksz,
+ 0, blksz, (char *) indir))
return grub_errno;
if (grub_disk_read (data->disk,
grub_le_to_cpu32 (indir[rblock / perblock])
- << LOG2_EXT2_BLOCK_SIZE (data),
- 0, EXT2_BLOCK_SIZE (data), (char *) indir))
+ << log2_blksz,
+ 0, blksz, (char *) indir))
return grub_errno;
@@ -233,78 +244,23 @@ grub_ext2_get_file_block (struct grub_ex
return grub_errno;
}
- *block = blknr;
-
- return 0;
+ return blknr;
}
+
/* 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_ext2_read_file (struct grub_ext2_data *data,
+grub_ext2_read_file (grub_fshelp_node_t node,
void (*read_hook) (unsigned long sector,
unsigned offset, unsigned length),
int pos, unsigned int len, char *buf)
{
- int i;
- int blockcnt;
-
- /* Adjust len so it we can't read past the end of the file. */
- if (len > grub_le_to_cpu32 (data->inode.size))
- len = grub_le_to_cpu32 (data->inode.size);
-
- blockcnt = ((len + pos)
- + EXT2_BLOCK_SIZE (data) - 1) / EXT2_BLOCK_SIZE (data);
-
- for (i = pos / EXT2_BLOCK_SIZE (data); i < blockcnt; i++)
- {
- int blknr;
- int blockoff = pos % EXT2_BLOCK_SIZE (data);
- int blockend = EXT2_BLOCK_SIZE (data);
-
- int skipfirst = 0;
-
- grub_ext2_get_file_block (data, i, &blknr);
- if (grub_errno)
- return -1;
-
- blknr = blknr << LOG2_EXT2_BLOCK_SIZE (data);
-
- /* Last block. */
- if (i == blockcnt - 1)
- {
- blockend = (len + pos) % EXT2_BLOCK_SIZE (data);
-
- /* The last portion is exactly EXT2_BLOCK_SIZE (data). */
- if (!blockend)
- blockend = EXT2_BLOCK_SIZE (data);
- }
-
- /* First block. */
- if (i == pos / EXT2_BLOCK_SIZE (data))
- {
- skipfirst = blockoff;
- blockend -= skipfirst;
- }
-
- /* If the block number is 0 this block is not stored on disk but
- is zero filled instead. */
- if (blknr)
- {
- data->disk->read_hook = read_hook;
- grub_disk_read (data->disk, blknr, skipfirst,
- blockend, buf);
- data->disk->read_hook = 0;
- if (grub_errno)
- return -1;
- }
- else
- grub_memset (buf, EXT2_BLOCK_SIZE (data) - skipfirst, 0);
-
- buf += EXT2_BLOCK_SIZE (data) - skipfirst;
- }
-
- return len;
+ return grub_fshelp_read_file (node->data->disk, node, read_hook,
+ pos, len, buf, grub_ext2_read_block,
+ node->inode.size,
+ LOG2_EXT2_BLOCK_SIZE (node->data));
+
}
@@ -313,8 +269,8 @@ static grub_err_t
grub_ext2_read_inode (struct grub_ext2_data *data,
int ino, struct grub_ext2_inode *inode)
{
- struct ext2_block_group blkgrp;
- struct grub_ext_sblock *sblock = &data->sblock;
+ struct grub_ext2_block_group blkgrp;
+ struct grub_ext2_sblock *sblock = &data->sblock;
int inodes_per_block;
unsigned int blkno;
@@ -355,7 +311,7 @@ grub_ext2_mount (grub_disk_t disk)
return 0;
/* Read the superblock. */
- grub_disk_read (disk, 1 * 2, 0, sizeof (struct grub_ext_sblock),
+ grub_disk_read (disk, 1 * 2, 0, sizeof (struct grub_ext2_sblock),
(char *) &data->sblock);
if (grub_errno)
goto fail;
@@ -364,7 +320,17 @@ grub_ext2_mount (grub_disk_t disk)
if (grub_le_to_cpu16 (data->sblock.magic) != EXT2_MAGIC)
goto fail;
+ data->diropen.data = data;
+ data->diropen.ino = 2;
+ data->diropen.inode_read = 1;
+
+ data->inode = &data->diropen.inode;
data->disk = disk;
+
+ grub_ext2_read_inode (data, 2, data->inode);
+ if (grub_errno)
+ goto fail;
+
return data;
fail:
@@ -373,198 +339,136 @@ grub_ext2_mount (grub_disk_t disk)
return 0;
}
-/* Find the file with the pathname PATH on the filesystem described by
- DATA. Return its inode number in INO. */
-static grub_err_t
-grub_ext2_find_file (struct grub_ext2_data *data, const char *path, int *ino)
+static char *
+grub_ext2_read_symlink (grub_fshelp_node_t node)
{
- int blocksize = EXT2_BLOCK_SIZE (data)
- << grub_le_to_cpu32 (data->sblock.log2_block_size);
- struct grub_ext2_inode *inode = &data->inode;
- int currinode = 2;
- int symlinkcnt = 0;
-
- char fpath[EXT2_PATH_MAX];
- char *name = fpath;
-
- grub_strncpy (fpath, path, EXT2_PATH_MAX);
-
- if (!name || name[0] != '/')
- {
- grub_error (GRUB_ERR_BAD_FILENAME, "bad filename");
- return grub_errno;
- }
-
- /* Skip the first slash. */
- name++;
- if (!*name)
+ char *symlink;
+ struct grub_fshelp_node *diro = node;
+
+ if (!diro->inode_read)
{
- *ino = 2;
- return 0;
+ grub_ext2_read_inode (diro->data, diro->ino, &diro->inode);
+ if (grub_errno)
+ return 0;
}
-
- /* Remove trailing "/". */
- if (name[grub_strlen (name) - 1] =='/')
- name[grub_strlen (name) - 1] = '\0';
-
- while (*name)
+
+ symlink = grub_malloc (grub_le_to_cpu32 (diro->inode.size) + 1);
+ if (!symlink)
+ return 0;
+
+ /* If the filesize of the symlink is bigger than
+ 60 the symlink is stored in a separate block,
+ otherwise it is stored in the inode. */
+ if (grub_le_to_cpu32 (diro->inode.size) <= 60)
+ grub_strncpy (symlink,
+ diro->inode.symlink,
+ grub_le_to_cpu32 (diro->inode.size));
+ else
{
- unsigned int fpos = 0;
- char *next;
- int namesize;
-
- /* Extract the actual part from the pathname. */
- next = grub_strchr (name, '/');
- if (next)
+ grub_ext2_read_file (diro, 0, 0,
+ grub_le_to_cpu32 (diro->inode.size),
+ symlink);
+ if (grub_errno)
{
- next[0] = '\0';
- next++;
+ grub_free (symlink);
+ return 0;
}
+ }
+
+ symlink[grub_le_to_cpu32 (diro->inode.size)] = '\0';
+ return symlink;
+}
- namesize = grub_strlen (name);
+static int
+grub_ext2_iterate_dir (grub_fshelp_node_t dir,
+ int (*hook) (const char *filename,
+ enum grub_fshelp_filetype filetype,
+ grub_fshelp_node_t node))
+{
+ unsigned int fpos = 0;
+ struct grub_fshelp_node *diro = (struct grub_fshelp_node *) dir;
+
+ if (!diro->inode_read)
+ {
+ grub_ext2_read_inode (diro->data, diro->ino, &diro->inode);
+ if (grub_errno)
+ return 0;
+ }
+
+ /* Search the file. */
+ while (fpos < grub_le_to_cpu32 (diro->inode.size))
+ {
+ struct ext2_dirent dirent;
- /* Open the file. */
- grub_ext2_read_inode (data, currinode, inode);
+ grub_ext2_read_file (diro, 0, fpos, sizeof (struct ext2_dirent),
+ (char *) &dirent);
if (grub_errno)
- goto fail;
+ return 0;
- /* Search the file. */
- while (fpos < grub_le_to_cpu32 (inode->size))
+ if (dirent.namelen != 0)
{
- struct ext2_dirent dirent;
-
- /* Read the directory entry. */
- grub_ext2_read_file (data, 0, fpos, sizeof (struct ext2_dirent),
- (char *) &dirent);
+ char filename[dirent.namelen + 1];
+ struct grub_fshelp_node *fdiro;
+ enum grub_fshelp_filetype type = GRUB_FSHELP_UNKNOWN;
+
+ grub_ext2_read_file (diro, 0, fpos + sizeof (struct ext2_dirent),
+ dirent.namelen, filename);
if (grub_errno)
- goto fail;
+ return 0;
+
+ fdiro = grub_malloc (sizeof (struct grub_fshelp_node));
+ if (!fdiro)
+ return 0;
+
+ fdiro->data = diro->data;
+ fdiro->ino = grub_le_to_cpu32 (dirent.inode);
+
+ filename[dirent.namelen] = '\0';
- if (dirent.namelen != 0)
+ if (dirent.filetype != FILETYPE_UNKNOWN)
{
- char filename[dirent.namelen + 1];
+ fdiro->inode_read = 0;
- /* Read the filename part of this directory entry. */
- grub_ext2_read_file (data, 0, fpos
- + sizeof (struct ext2_dirent),
- dirent.namelen, filename);
+ if (dirent.filetype == FILETYPE_DIRECTORY)
+ type = GRUB_FSHELP_DIR;
+ else if (dirent.filetype == FILETYPE_SYMLINK)
+ type = GRUB_FSHELP_SYMLINK;
+ else if (dirent.filetype == FILETYPE_REG)
+ type = GRUB_FSHELP_REG;
+ }
+ else
+ {
+ /* The filetype can not be read from the dirent, read
+ the inode to get more information. */
+ grub_ext2_read_inode (diro->data, grub_le_to_cpu32 (dirent.inode),
+ &fdiro->inode);
if (grub_errno)
- goto fail;
-
- filename[dirent.namelen] = '\0';
-
- /* Check if the current directory entry described the
- file we are looking for. */
- if (dirent.namelen == namesize
- && !grub_strncmp (name, filename, namesize))
{
- /* Stat the inode. */
- grub_ext2_read_inode (data,
- grub_le_to_cpu32 (dirent.inode),
- inode);
-
- /* If this is a symlink, follow it. */
- if ((grub_le_to_cpu16 (data->inode.mode)
- & FILETYPE_INO_MASK) == FILETYPE_INO_SYMLINK)
- {
- /* XXX: Use malloc instead? */
- char symlink[blocksize];
-
- if (++symlinkcnt == EXT2_MAX_SYMLINKCNT)
- {
- grub_error (GRUB_ERR_SYMLINK_LOOP,
- "too deep nesting of symlinks");
- goto fail;
- }
-
- /* If the filesize of the symlink is bigger than
- 60 the symlink is stored in a separate block,
- otherwise it is stored in the inode. */
- if (grub_le_to_cpu32 (inode->size) <= 60)
- grub_strncpy (symlink,
- inode->symlink,
- grub_le_to_cpu32 (inode->size));
- else
- {
- grub_ext2_read_file (data, 0, 0,
- grub_le_to_cpu32 (inode->size),
- symlink);
- if (grub_errno)
- goto fail;
- }
-
- symlink[grub_le_to_cpu32 (inode->size)] = '\0';
-
- /* Check if the symlink is absolute or relative. */
- if (symlink[0] == '/')
- {
- grub_strncpy (fpath, symlink + 1, EXT2_PATH_MAX);
- name = fpath;
- currinode = 2;
- }
- else
- {
- char *bak = 0;
-
- if (next)
- {
- bak = grub_strdup (next);
- if (!bak)
- goto fail;
- }
-
- /* Relative symlink, construct the new path. */
- grub_strcpy (fpath, symlink);
- name = fpath;
-
- if (next)
- {
- grub_strcat (name, "/");
- grub_strcat (name, bak);
- grub_free (bak);
- }
- }
-
- fpos = 0;
- break;
- }
-
- if (next)
- {
- currinode = grub_le_to_cpu32 (dirent.inode);
- name = next;
-
- if ((grub_le_to_cpu16 (data->inode.mode)
- & FILETYPE_INO_MASK) != FILETYPE_INO_DIRECTORY)
- {
- grub_error (GRUB_ERR_BAD_FILE_TYPE,
- "not a directory");
- goto fail;
- }
- break;
- }
- else /* Found it! */
- {
- *ino = grub_le_to_cpu32 (dirent.inode);
- return 0;
- }
+ grub_free (fdiro);
+ return 0;
}
+
+ fdiro->inode_read = 1;
+
+ if ((grub_le_to_cpu16 (fdiro->inode.mode)
+ & FILETYPE_INO_MASK) == FILETYPE_INO_DIRECTORY)
+ type = GRUB_FSHELP_DIR;
+ else if ((grub_le_to_cpu16 (fdiro->inode.mode)
+ & FILETYPE_INO_MASK) == FILETYPE_INO_DIRECTORY)
+ type = GRUB_FSHELP_SYMLINK;
+ else if ((grub_le_to_cpu16 (fdiro->inode.mode)
+ & FILETYPE_INO_MASK) == FILETYPE_INO_DIRECTORY)
+ type = GRUB_FSHELP_REG;
}
- /* Move to next directory entry. */
- fpos += grub_le_to_cpu16 (dirent.direntlen);
+ if (hook (filename, type, fdiro))
+ return 1;
}
- /* The complete directory was read and no matching file was
- found. */
- if (fpos >= grub_le_to_cpu32 (inode->size))
- {
- grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
- goto fail;
- }
+ fpos += grub_le_to_cpu16 (dirent.direntlen);
}
-
- fail:
- return grub_errno;
+
+ return 0;
}
/* Open a file named NAME and initialize FILE. */
@@ -572,40 +476,42 @@ static grub_err_t
grub_ext2_open (struct grub_file *file, const char *name)
{
struct grub_ext2_data *data;
- int ino;
-
+ struct grub_fshelp_node *fdiro = 0;
+
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
-
+
data = grub_ext2_mount (file->device->disk);
if (!data)
goto fail;
- grub_ext2_find_file (data, name, &ino);
- if (grub_errno)
- goto fail;
-
- grub_ext2_read_inode (data, ino, &data->inode);
+ grub_fshelp_find_file (name, &data->diropen, &fdiro, grub_ext2_iterate_dir,
+ grub_ext2_read_symlink, GRUB_FSHELP_REG);
if (grub_errno)
goto fail;
-
- if (!(grub_le_to_cpu16 (data->inode.mode) & 0100000))
+
+ if (!fdiro->inode_read)
{
- grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a regular file");
- goto fail;
+ grub_ext2_read_inode (data, fdiro->ino, &fdiro->inode);
+ if (grub_errno)
+ goto fail;
}
- file->size = grub_le_to_cpu32 (data->inode.size);
+ grub_memcpy (data->inode, &fdiro->inode, sizeof (struct grub_ext2_inode));
+ grub_free (fdiro);
+
+ file->size = grub_le_to_cpu32 (data->inode->size);
file->data = data;
file->offset = 0;
return 0;
fail:
-
grub_free (data);
-
+ if (fdiro != &data->diropen)
+ grub_free (fdiro);
+
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
@@ -632,7 +538,8 @@ grub_ext2_read (grub_file_t file, char *
struct grub_ext2_data *data =
(struct grub_ext2_data *) file->data;
- return grub_ext2_read_file (data, file->read_hook, file->offset, len, buf);
+ return grub_ext2_read_file (&data->diropen, file->read_hook,
+ file->offset, len, buf);
}
@@ -641,10 +548,23 @@ grub_ext2_dir (grub_device_t device, con
int (*hook) (const char *filename, int dir))
{
struct grub_ext2_data *data = 0;;
-
- int ino;
- unsigned int fpos = 0;
+ struct grub_fshelp_node *fdiro = 0;
+ auto int iterate (const char *filename, enum grub_fshelp_filetype filetype,
+ grub_fshelp_node_t node);
+
+ int iterate (const char *filename, enum grub_fshelp_filetype filetype,
+ grub_fshelp_node_t node)
+ {
+ grub_free (node);
+ if (filetype == GRUB_FSHELP_DIR)
+ return hook (filename, 1);
+ else
+ return hook (filename, 0);
+
+ return 0;
+ }
+
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
@@ -652,61 +572,18 @@ grub_ext2_dir (grub_device_t device, con
data = grub_ext2_mount (device->disk);
if (!data)
goto fail;
-
- grub_ext2_find_file (data, (char *) path, &ino);
- if (grub_errno)
- goto fail;
-
- grub_ext2_read_inode (data, ino, &data->inode);
+
+ grub_fshelp_find_file (path, &data->diropen, &fdiro, grub_ext2_iterate_dir,
+ grub_ext2_read_symlink, GRUB_FSHELP_DIR);
if (grub_errno)
- goto fail;
-
- if ((grub_le_to_cpu16 (data->inode.mode)
- & FILETYPE_INO_MASK) != FILETYPE_INO_DIRECTORY)
- {
- grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a directory");
- goto fail;
- }
-
- /* Search the file. */
- while (fpos < grub_le_to_cpu32 (data->inode.size))
- {
- struct ext2_dirent dirent;
-
- grub_ext2_read_file (data, 0, fpos, sizeof (struct ext2_dirent),
- (char *) &dirent);
- if (grub_errno)
- goto fail;
-
- if (dirent.namelen != 0)
- {
- char filename[dirent.namelen + 1];
-
- grub_ext2_read_file (data, 0, fpos + sizeof (struct ext2_dirent),
- dirent.namelen, filename);
- if (grub_errno)
- goto fail;
-
- filename[dirent.namelen] = '\0';
-
- if (dirent.filetype != FILETYPE_UNKNOWN)
- hook (filename, dirent.filetype == FILETYPE_DIRECTORY);
- else
- {
- struct grub_ext2_inode inode;
- grub_ext2_read_inode (data, grub_le_to_cpu32 (dirent.inode), &inode);
-
- hook (filename, (grub_le_to_cpu16 (inode.mode)
- & FILETYPE_INO_MASK) == FILETYPE_INO_DIRECTORY);
- }
- }
-
- fpos += grub_le_to_cpu16 (dirent.direntlen);
- }
-
+ return grub_errno;
+
+ grub_ext2_iterate_dir (fdiro, iterate);
+
fail:
-
grub_free (data);
+ if (fdiro != &data->diropen)
+ grub_free (fdiro);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
Index: include/grub/fshelp.h
===================================================================
RCS file: include/grub/fshelp.h
diff -N include/grub/fshelp.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ include/grub/fshelp.h 28 Aug 2004 17:05:00 -0000
@@ -0,0 +1,59 @@
+/* fshelp.h -- Filesystem helper functions */
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2004 Free Software Foundation, Inc.
+ *
+ * GRUB 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 GRUB; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef GRUB_FSHELP_HEADER
+#define GRUB_FSHELP_HEADER 1
+
+#include <grub/types.h>
+#include <grub/symbol.h>
+#include <grub/err.h>
+
+typedef struct grub_fshelp_node *grub_fshelp_node_t;
+
+enum grub_fshelp_filetype
+ {
+ GRUB_FSHELP_UNKNOWN,
+ GRUB_FSHELP_REG,
+ GRUB_FSHELP_DIR,
+ GRUB_FSHELP_SYMLINK
+ };
+
+grub_err_t
+EXPORT_FUNC(grub_fshelp_find_file) (const char *path,
+ grub_fshelp_node_t rootnode,
+ grub_fshelp_node_t *foundnode,
+ int (*iterate_dir) (grub_fshelp_node_t dir,
+ int (*hook) (const char *filename,
+ enum grub_fshelp_filetype filetype,
+ grub_fshelp_node_t node)),
+ char *(*read_symlink) (grub_fshelp_node_t node),
+ enum grub_fshelp_filetype expect);
+
+grub_ssize_t
+EXPORT_FUNC(grub_fshelp_read_file) (grub_disk_t disk, grub_fshelp_node_t node,
+ void (*read_hook) (unsigned long sector,
+ unsigned offset,
+ unsigned length),
+ int pos, unsigned int len, char *buf,
+ int (*get_block) (grub_fshelp_node_t node,
+ int block),
+ unsigned int filesize, int log2blocksize);
+
+#endif /* ! GRUB_FSHELP_HEADER */
Index: kern/fshelp.c
===================================================================
RCS file: kern/fshelp.c
diff -N kern/fshelp.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kern/fshelp.c 28 Aug 2004 17:05:00 -0000
@@ -0,0 +1,286 @@
+/* fshelp.c -- Filesystem helper functions */
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2004 Free Software Foundation, Inc.
+ *
+ * GRUB 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 GRUB; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <grub/err.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/disk.h>
+#include <grub/fshelp.h>
+
+
+/* Lookup the node PATH. The node ROOTNODE describes the root of the
+ directory tree. The node found is returned in FOUNDNODE, which is
+ either a ROOTNODE or a new malloc'ed node. ITERATE_DIR is used to
+ iterate over all directory entries in the current node.
+ READ_SYMLINK is used to read the symlink if a node is a symlink.
+ EXPECTTYPE is the type node that is expected by the called, an
+ error is generated if the node is not of the expected type. */
+grub_err_t
+grub_fshelp_find_file (const char *path, grub_fshelp_node_t rootnode,
+ grub_fshelp_node_t *foundnode,
+ int (*iterate_dir) (grub_fshelp_node_t dir,
+ int (*hook)
+ (const char *filename,
+ enum grub_fshelp_filetype filetype,
+ grub_fshelp_node_t node)),
+ char *(*read_symlink) (grub_fshelp_node_t node),
+ enum grub_fshelp_filetype expecttype)
+{
+ grub_err_t err;
+ enum grub_fshelp_filetype foundtype;
+ int symlinknest = 0;
+
+ auto grub_err_t find_file (const char *currpath, grub_fshelp_node_t currroot,
+ grub_fshelp_node_t *currfound);
+
+ grub_err_t find_file (const char *currpath, grub_fshelp_node_t currroot,
+ grub_fshelp_node_t *currfound)
+ {
+ char fpath[grub_strlen (currpath) + 1];
+ char *name = fpath;
+ char *next;
+ // unsigned int pos = 0;
+ enum grub_fshelp_filetype type = GRUB_FSHELP_DIR;
+ grub_fshelp_node_t currnode = currroot;
+ grub_fshelp_node_t oldnode = currroot;
+
+ auto int iterate (const char *filename,
+ enum grub_fshelp_filetype filetype,
+ grub_fshelp_node_t node);
+
+ auto void free_node (grub_fshelp_node_t node);
+
+ void free_node (grub_fshelp_node_t node)
+ {
+ if (node != rootnode && node != currroot)
+ grub_free (node);
+ }
+
+ int iterate (const char *filename, enum grub_fshelp_filetype filetype,
+ grub_fshelp_node_t node)
+ {
+ if (type == GRUB_FSHELP_UNKNOWN || grub_strcmp (name, filename))
+ {
+ grub_free (node);
+ return 0;
+ }
+
+ /* The node is found, stop iterating over the nodes. */
+ type = filetype;
+ oldnode = currnode == rootnode ? 0 : currnode;
+ currnode = node;
+
+ return 1;
+ }
+
+ grub_strncpy (fpath, currpath, grub_strlen (currpath) + 1);
+
+ if (*name == '/')
+ name++;
+
+ /* Remove trailing "/". */
+ if (name[grub_strlen (name) - 1] == '/')
+ name[grub_strlen (name) - 1] = '\0';
+
+ if (!*name)
+ {
+ *currfound = currnode;
+ return 0;
+ }
+
+ for (;;)
+ {
+ int found;
+
+ /* Extract the actual part from the pathname. */
+ next = grub_strchr (name, '/');
+ if (next)
+ {
+ next[0] = '\0';
+ next++;
+ }
+
+ /* At this point it is expected that the current node is a
+ directory, check if this is true. */
+ if (type != GRUB_FSHELP_DIR)
+ {
+ free_node (currnode);
+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a directory");
+ }
+
+ /* Iterate over the directory. */
+ found = iterate_dir (currnode, iterate);
+ if (!found)
+ {
+ free_node (oldnode);
+ if (grub_errno)
+ return grub_errno;
+
+ break;
+ }
+
+ /* Read in the symlink and follow it. */
+ if (type == GRUB_FSHELP_SYMLINK)
+ {
+ char *symlink;
+
+ /* Test if the symlink does not loop. */
+ if (++symlinknest == 8)
+ {
+ free_node (currnode);
+ free_node (oldnode);
+ return grub_error (GRUB_ERR_SYMLINK_LOOP, "too deep nesting of symlinks");
+ }
+
+ symlink = read_symlink (currnode);
+ free_node (currnode);
+
+ if (!symlink)
+ {
+ free_node (oldnode);
+ return grub_errno;
+ }
+
+ /* The symlink is an absolute path, go back to the root inode. */
+ if (symlink[0] == '/')
+ {
+ free_node (oldnode);
+ oldnode = rootnode;
+ }
+
+ /* Lookup the node the symlink points to. */
+ find_file (symlink, oldnode, &currnode);
+ if (grub_errno)
+ {
+ free_node (oldnode);
+ return grub_errno;
+ }
+ }
+
+ free_node (oldnode);
+
+ /* Fond the node! */
+ if (!next || *next == '\0')
+ {
+ *currfound = currnode;
+ foundtype = type;
+ return 0;
+ }
+
+ name = next;
+ }
+
+ return grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
+ }
+
+ if (!path || path[0] != '/')
+ {
+ grub_error (GRUB_ERR_BAD_FILENAME, "bad filename");
+ return grub_errno;
+ }
+
+ err = find_file (path, rootnode, foundnode);
+ if (err)
+ return err;
+
+ /* Check if the node that was found was of the expected type. */
+ if (expecttype == GRUB_FSHELP_REG && foundtype != expecttype)
+ grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a regular file");
+ else if (expecttype == GRUB_FSHELP_REG && foundtype != expecttype)
+ grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a directory");
+
+ return 0;
+}
+
+
+/* Read LEN bytes from the file NODE on disk DISK into the buffer BUF,
+ beginning with the block POS. READ_HOOK should be set before
+ reading a block from the file. GET_BLOCK is used to translate file
+ blocks to disk blocks. The file is FILESIZE bytes big and the
+ blocks have a size of LOG2BLOCKSIZE (in log2). */
+grub_ssize_t
+grub_fshelp_read_file (grub_disk_t disk, grub_fshelp_node_t node,
+ void (*read_hook) (unsigned long sector,
+ unsigned offset, unsigned length),
+ int pos, unsigned int len, char *buf,
+ int (*get_block) (grub_fshelp_node_t node, int block),
+ unsigned int filesize, int log2blocksize)
+{
+ int i;
+ int blockcnt;
+ int blocksize = 1 << (log2blocksize + GRUB_DISK_SECTOR_BITS);
+
+ /* Adjust len so it we can't read past the end of the file. */
+ if (len > filesize)
+ len = filesize;
+
+ blockcnt = ((len + pos)
+ + blocksize - 1) / blocksize;
+
+ for (i = pos / blocksize; i < blockcnt; i++)
+ {
+ int blknr;
+ int blockoff = pos % blocksize;
+ int blockend = blocksize;
+
+ int skipfirst = 0;
+
+ blknr = get_block (node, i);
+ if (grub_errno)
+ return -1;
+
+ blknr = blknr << log2blocksize;
+
+ /* Last block. */
+ if (i == blockcnt - 1)
+ {
+ blockend = (len + pos) % blocksize;
+
+ /* The last portion is exactly blocksize. */
+ if (!blockend)
+ blockend = blocksize;
+ }
+
+ /* First block. */
+ if (i == pos / blocksize)
+ {
+ skipfirst = blockoff;
+ blockend -= skipfirst;
+ }
+
+ /* If the block number is 0 this block is not stored on disk but
+ is zero filled instead. */
+ if (blknr)
+ {
+ disk->read_hook = read_hook;
+ grub_disk_read (disk, blknr, skipfirst,
+ blockend, buf);
+ disk->read_hook = 0;
+ if (grub_errno)
+ return -1;
+ }
+ else
+ grub_memset (buf, blocksize - skipfirst, 0);
+
+ buf += blocksize - skipfirst;
+ }
+
+ return len;
+}
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: JFS support (PATCH) and filesystem improvements
2004-08-28 17:47 ` Marco Gerards
@ 2004-08-29 23:00 ` Tomas Ebenlendr
2004-09-09 21:02 ` Marco Gerards
2004-08-30 10:22 ` Yoshinori K. Okuji
1 sibling, 1 reply; 8+ messages in thread
From: Tomas Ebenlendr @ 2004-08-29 23:00 UTC (permalink / raw)
To: The development of GRUB 2
Only some comments of very small importance as proof that I have
read the patch.
--- slashes: ---
sub-function find_file():
> + if (*name == '/')
> + name++;
what about 'while' ? I mean if we remove first one slash, why not the
second (as in linux, a sequence of slashes acts as one slash).
> +
> + /* Remove trailing "/". */
> + if (name[grub_strlen (name) - 1] == '/')
> + name[grub_strlen (name) - 1] = '\0';
This is not need if we skip _all_ slashes ...
> + /* Extract the actual part from the pathname. */
> + next = grub_strchr (name, '/');
> + if (next)
> + {
> + next[0] = '\0';
> + next++;
> + }
... here. I propose: while (*next == '/') next++; instead of simply
incrementing.
--- :slashes end ---
> + /* The symlink is an absolute path, go back to the root inode. */
> + if (symlink[0] == '/')
> + {
> + free_node (oldnode);
> + oldnode = rootnode;
> + }
And for relative path ... :
Please write somewhere that you expect correct behavior for '..'
entry. (e.g., in fshelp.h). When someone will implement weird fs,
he must know what this function expects.
> +
> + /* Fond the node! */
Typo in comment :-).
> + /* First block. */
> + if (i == pos / blocksize)
> + {
> + skipfirst = blockoff;
> + blockend -= skipfirst;
> + }
blockend ... not a good name: blockbytes? (hmm, also not very good.)
--
Tomas 'ebi' Ebenlendr
http://get.to/ebik
PF 2004.66118890407
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: JFS support (PATCH) and filesystem improvements
2004-08-28 17:47 ` Marco Gerards
2004-08-29 23:00 ` Tomas Ebenlendr
@ 2004-08-30 10:22 ` Yoshinori K. Okuji
2004-08-30 15:49 ` Marco Gerards
1 sibling, 1 reply; 8+ messages in thread
From: Yoshinori K. Okuji @ 2004-08-30 10:22 UTC (permalink / raw)
To: The development of GRUB 2
On Saturday 28 August 2004 19:47, Marco Gerards wrote:
> Committed.
Thank you.
> And here is a patch for that.
>
> To avoid code duplication I wrote kern/fshelp.c, which has the
> following two functions:
That is a good idea, but why are the functions in the kernel? Imagine
that GRUB 2 supports TFTP and the user uses GRUB as a network-based
loader. Probably the user does not have to compile the helper
functions, because network-based filesystems are very different at the
implementation level.
So I think they should be in a module rather than the kernel. fshelp.mod
sounds good for me.
Okuji
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: JFS support (PATCH) and filesystem improvements
2004-08-30 10:22 ` Yoshinori K. Okuji
@ 2004-08-30 15:49 ` Marco Gerards
2004-08-31 15:23 ` Tomas Ebenlendr
0 siblings, 1 reply; 8+ messages in thread
From: Marco Gerards @ 2004-08-30 15:49 UTC (permalink / raw)
To: The development of GRUB 2
"Yoshinori K. Okuji" <okuji@enbug.org> writes:
>> To avoid code duplication I wrote kern/fshelp.c, which has the
>> following two functions:
>
> That is a good idea, but why are the functions in the kernel? Imagine
> that GRUB 2 supports TFTP and the user uses GRUB as a network-based
> loader. Probably the user does not have to compile the helper
> functions, because network-based filesystems are very different at the
> implementation level.
True.
> So I think they should be in a module rather than the kernel. fshelp.mod
> sounds good for me.
This is a good idea. Is it possible to do this already? How do I
make a filesystem depend on fshelp.mod? I assume by using one of its
symbols. Is the dependancy code in CVS already?
I will change this and make the changes suggested by Thomas before
committing this. I have some ideas to make things more efficient for
some kinds of filesystems, I will implemented this as well.
Thanks,
Marco
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: JFS support (PATCH) and filesystem improvements
2004-08-30 15:49 ` Marco Gerards
@ 2004-08-31 15:23 ` Tomas Ebenlendr
0 siblings, 0 replies; 8+ messages in thread
From: Tomas Ebenlendr @ 2004-08-31 15:23 UTC (permalink / raw)
To: The development of GRUB 2
> > So I think they should be in a module rather than the kernel. fshelp.mod
> > sounds good for me.
>
> This is a good idea. Is it possible to do this already? How do I
> make a filesystem depend on fshelp.mod? I assume by using one of its
> symbols. Is the dependancy code in CVS already?
Yes it is. It is there all the time since I know grub2.
--
Tomas 'ebi' Ebenlendr
http://get.to/ebik
PF 2004.66591204336
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: JFS support (PATCH) and filesystem improvements
2004-08-29 23:00 ` Tomas Ebenlendr
@ 2004-09-09 21:02 ` Marco Gerards
2004-09-10 18:06 ` Yoshinori K. Okuji
0 siblings, 1 reply; 8+ messages in thread
From: Marco Gerards @ 2004-09-09 21:02 UTC (permalink / raw)
To: The development of GRUB 2
ebik@artax.karlin.mff.cuni.cz (Tomas Ebenlendr) writes:
> Only some comments of very small importance as proof that I have
> read the patch.
>
> --- slashes: ---
[...]
> --- :slashes end ---
Done.
> Please write somewhere that you expect correct behavior for '..'
> entry. (e.g., in fshelp.h). When someone will implement weird fs,
> he must know what this function expects.
If the filesystem supports it, the iterate function should support
"..". Actually, it should support anything that is a part of a
symlink. This is just filesystem dependent, it is not a concern of
fshelp.
>> + /* First block. */
>> + if (i == pos / blocksize)
>> + {
>> + skipfirst = blockoff;
>> + blockend -= skipfirst;
>> + }
> blockend ... not a good name: blockbytes? (hmm, also not very good.)
Well, I just left it this way. It is what it commonly used.
Here is the new patch. I have moved fshelp.c to fs/. I also changed
i386-pc.rmk so it makes fshelp.mod.
Okuji, I really like how you implemented module loading. It is nice
to see grub-mkimage automatically includes fshelp.mod in the core
image when using ext2. :)
There is one nasty thing that I had to do and that is adding
`NESTED_FUNC_ATTR' to the iterate function because it is a nested
function normally. But other than that all issues should be resolved.
So I assume this patch is ok. To be sure, I will wait until Sunday
before I commit this patch.
My iso9660fs code depends on fshelp. I will send it in after fshelp
is committed.
In the meanwhile I will work a bit more on the PPC port. I want to
have a look at module loading because it is getting really important
now.
Thanks,
Marco
2004-09-09 Marco Gerards <metgerards@student.han.nl>
* conf/i386-pc.rmk (kernel_img_SOURCES): Added kern/fshelp.c.
(grub_mkimage_LDFLAGS): Likewise.
(grub_emu_SOURCES): Likewise.
(kernel_img_HEADERS): Added fshelp.h.
* fs/ext2.c: Include <grub/fshelp.h>.
(FILETYPE_REG): New macro.
(FILETYPE_INO_REG): Likewise.
(grub_ext_sblock): Renamed to `grub_ext2_sblock'.
Changed all users.
(ext2_block_group): Renamed to `grub_ext2_block_group'. Changed
all users.
(grub_fshelp_node): New struct.
(grub_ext2_data): Added member `diropen'. Changed member `inode'
to a pointer.
(grub_ext2_get_file_block): Removed function.
(grub_ext2_read_block): New function.
(grub_ext2_read_file): Replaced parameter `data' by `node'.
This function was written.
(grub_ext2_mount): Read the root inode. Create a diropen struct.
(grub_ext2_find_file): Removed function.
(grub_ext2_read_symlink): New function.
(grub_ext2_iterate_dir): Likewise.
(grub_ext2_open): Rewritten.
(grub_ext2_dir): Rewritten.
* include/grub/fshelp.h: New file.
* fs/fshelp.c: Likewise.
Index: conf/i386-pc.rmk
===================================================================
RCS file: /cvsroot/grub/grub2/conf/i386-pc.rmk,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 i386-pc.rmk
--- conf/i386-pc.rmk 28 Aug 2004 13:14:29 -0000 1.17
+++ conf/i386-pc.rmk 9 Sep 2004 20:49:36 -0000
@@ -61,10 +61,10 @@ grub_mkimage_LDFLAGS = -llzo
grub_setup_SOURCES = util/i386/pc/grub-setup.c util/i386/pc/biosdisk.c \
util/misc.c util/i386/pc/getroot.c kern/device.c kern/disk.c \
kern/err.c kern/misc.c disk/i386/pc/partition.c fs/fat.c fs/ext2.c \
- fs/ufs.c fs/minix.c fs/hfs.c fs/jfs.c kern/file.c kern/fs.c kern/env.c
+ fs/ufs.c fs/minix.c fs/hfs.c fs/jfs.c kern/file.c kern/fs.c kern/env.c fs/fshelp.c
# For grub
-grub_emu_SOURCES = kern/main.c kern/device.c \
+grub_emu_SOURCES = kern/main.c kern/device.c fs/fshelp.c \
kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
kern/misc.c kern/loader.c kern/rescue.c kern/term.c \
disk/i386/pc/partition.c kern/env.c commands/ls.c \
@@ -80,12 +80,16 @@ genmoddep_SOURCES = util/genmoddep.c
# Modules.
pkgdata_MODULES = _chain.mod _linux.mod fat.mod ufs.mod ext2.mod minix.mod \
hfs.mod jfs.mod normal.mod hello.mod vga.mod font.mod _multiboot.mod ls.mod \
- boot.mod cmp.mod cat.mod terminal.mod
+ boot.mod cmp.mod cat.mod terminal.mod fshelp.mod
# For _chain.mod.
_chain_mod_SOURCES = loader/i386/pc/chainloader.c
_chain_mod_CFLAGS = $(COMMON_CFLAGS)
+# For fshelp.mod.
+fshelp_mod_SOURCES = fs/fshelp.c
+fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
+
# For fat.mod.
fat_mod_SOURCES = fs/fat.c
fat_mod_CFLAGS = $(COMMON_CFLAGS)
Index: conf/powerpc-ieee1275.rmk
===================================================================
RCS file: /cvsroot/grub/grub2/conf/powerpc-ieee1275.rmk,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 powerpc-ieee1275.rmk
--- conf/powerpc-ieee1275.rmk 28 Aug 2004 13:14:29 -0000 1.7
+++ conf/powerpc-ieee1275.rmk 9 Sep 2004 20:49:36 -0000
@@ -24,7 +24,7 @@ noinst_UTILITIES = genmoddep
grub_emu_SOURCES = kern/main.c kern/device.c \
kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
kern/misc.c kern/loader.c kern/rescue.c kern/term.c \
- disk/powerpc/ieee1275/partition.c \
+ disk/powerpc/ieee1275/partition.c fs/fshelp.c \
util/i386/pc/biosdisk.c fs/fat.c fs/ext2.c fs/ufs.c fs/minix.c fs/hfs.c \
fs/jfs.c normal/cmdline.c normal/command.c normal/main.c normal/menu.c \
normal/arg.c \
@@ -35,7 +35,7 @@ grub_emu_LDFLAGS = -lncurses
grubof_SOURCES = boot/powerpc/ieee1275/cmain.c boot/powerpc/ieee1275/ieee1275.c \
boot/powerpc/ieee1275/crt0.S kern/main.c kern/device.c \
- kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
+ kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c fs/fshelp.c \
kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c \
kern/powerpc/ieee1275/init.c term/powerpc/ieee1275/ofconsole.c \
kern/powerpc/ieee1275/openfw.c fs/ext2.c fs/ufs.c fs/minix.c fs/hfs.c \
Index: fs/ext2.c
===================================================================
RCS file: /cvsroot/grub/grub2/fs/ext2.c,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 ext2.c
--- fs/ext2.c 13 Aug 2004 22:33:35 -0000 1.8
+++ fs/ext2.c 9 Sep 2004 20:49:36 -0000
@@ -29,11 +29,13 @@
/* Filetype used in directory entry. */
#define FILETYPE_UNKNOWN 0
+#define FILETYPE_REG 1
#define FILETYPE_DIRECTORY 2
#define FILETYPE_SYMLINK 7
/* Filetype information as used in inodes. */
#define FILETYPE_INO_MASK 0170000
+#define FILETYPE_INO_REG 0100000
#define FILETYPE_INO_DIRECTORY 0040000
#define FILETYPE_INO_SYMLINK 0120000
@@ -44,6 +46,7 @@
#include <grub/disk.h>
#include <grub/dl.h>
#include <grub/types.h>
+#include <grub/fshelp.h>
/* Log2 size of ext2 block in 512 blocks. */
#define LOG2_EXT2_BLOCK_SIZE(data) \
@@ -57,7 +60,7 @@
#define EXT2_BLOCK_SIZE(data) (1 << LOG2_BLOCK_SIZE(data))
/* The ext2 superblock. */
-struct grub_ext_sblock
+struct grub_ext2_sblock
{
grub_uint32_t total_inodes;
grub_uint32_t total_blocks;
@@ -97,7 +100,7 @@ struct grub_ext_sblock
};
/* The ext2 blockgroup. */
-struct ext2_block_group
+struct grub_ext2_block_group
{
grub_uint32_t block_id;
grub_uint32_t inode_id;
@@ -150,12 +153,21 @@ struct ext2_dirent
grub_uint8_t filetype;
};
+struct grub_fshelp_node
+{
+ struct grub_ext2_data *data;
+ struct grub_ext2_inode inode;
+ int ino;
+ int inode_read;
+};
+
/* Information about a "mounted" ext2 filesystem. */
struct grub_ext2_data
{
- struct grub_ext_sblock sblock;
+ struct grub_ext2_sblock sblock;
grub_disk_t disk;
- struct grub_ext2_inode inode;
+ struct grub_ext2_inode *inode;
+ struct grub_fshelp_node diropen;
};
#ifndef GRUB_UTIL
@@ -166,60 +178,59 @@ static grub_dl_t my_mod;
the mounted filesystem DATA. */
inline static grub_err_t
grub_ext2_blockgroup (struct grub_ext2_data *data, int group,
- struct ext2_block_group *blkgrp)
+ struct grub_ext2_block_group *blkgrp)
{
- return grub_disk_read (data->disk,
+ return grub_disk_read (data->disk,
((grub_le_to_cpu32 (data->sblock.first_data_block) + 1)
<< LOG2_EXT2_BLOCK_SIZE (data)),
- group * sizeof (struct ext2_block_group),
- sizeof (struct ext2_block_group), (char *) blkgrp);
+ group * sizeof (struct grub_ext2_block_group),
+ sizeof (struct grub_ext2_block_group), (char *) blkgrp);
}
-/* Return in BLOCK the on disk block number of block FILEBLOCK in the
- opened file descibed by DATA. If this block is not stored on disk
- in case of a sparse file return 0. */
-static grub_err_t
-grub_ext2_get_file_block (struct grub_ext2_data *data,
- int fileblock, int *block)
+
+static int
+grub_ext2_read_block (grub_fshelp_node_t node, int fileblock)
{
+ struct grub_ext2_data *data = node->data;
+ struct grub_ext2_inode *inode = &node->inode;
int blknr;
- struct grub_ext2_inode *inode = &data->inode;
-
+ int blksz = EXT2_BLOCK_SIZE (data);
+ int log2_blksz = LOG2_EXT2_BLOCK_SIZE (data);
+
/* Direct blocks. */
if (fileblock < INDIRECT_BLOCKS)
blknr = grub_le_to_cpu32 (inode->blocks.dir_blocks[fileblock]);
/* Indirect. */
- else if (fileblock < INDIRECT_BLOCKS + EXT2_BLOCK_SIZE (data) / 4)
+ else if (fileblock < INDIRECT_BLOCKS + blksz / 4)
{
- grub_uint32_t indir[EXT2_BLOCK_SIZE (data) / 4];
+ grub_uint32_t indir[blksz / 4];
if (grub_disk_read (data->disk,
grub_le_to_cpu32 (inode->blocks.indir_block)
- << LOG2_EXT2_BLOCK_SIZE (data),
- 0, EXT2_BLOCK_SIZE (data), (char *) indir))
+ << log2_blksz,
+ 0, blksz, (char *) indir))
return grub_errno;
blknr = grub_le_to_cpu32 (indir[fileblock - INDIRECT_BLOCKS]);
}
/* Double indirect. */
- else if (fileblock < INDIRECT_BLOCKS + EXT2_BLOCK_SIZE (data) / 4
- * (EXT2_BLOCK_SIZE (data) / 4 + 1))
+ else if (fileblock < INDIRECT_BLOCKS + blksz / 4 * (blksz / 4 + 1))
{
- unsigned int perblock = EXT2_BLOCK_SIZE (data) / 4;
+ unsigned int perblock = blksz / 4;
unsigned int rblock = fileblock - (INDIRECT_BLOCKS
- + EXT2_BLOCK_SIZE (data) / 4);
- grub_uint32_t indir[EXT2_BLOCK_SIZE (data) / 4];
+ + blksz / 4);
+ grub_uint32_t indir[blksz / 4];
if (grub_disk_read (data->disk,
grub_le_to_cpu32 (inode->blocks.double_indir_block)
- << LOG2_EXT2_BLOCK_SIZE (data),
- 0, EXT2_BLOCK_SIZE (data), (char *) indir))
+ << log2_blksz,
+ 0, blksz, (char *) indir))
return grub_errno;
if (grub_disk_read (data->disk,
grub_le_to_cpu32 (indir[rblock / perblock])
- << LOG2_EXT2_BLOCK_SIZE (data),
- 0, EXT2_BLOCK_SIZE (data), (char *) indir))
+ << log2_blksz,
+ 0, blksz, (char *) indir))
return grub_errno;
@@ -233,78 +244,23 @@ grub_ext2_get_file_block (struct grub_ex
return grub_errno;
}
- *block = blknr;
-
- return 0;
+ return blknr;
}
+
/* 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_ext2_read_file (struct grub_ext2_data *data,
+grub_ext2_read_file (grub_fshelp_node_t node,
void (*read_hook) (unsigned long sector,
unsigned offset, unsigned length),
int pos, unsigned int len, char *buf)
{
- int i;
- int blockcnt;
-
- /* Adjust len so it we can't read past the end of the file. */
- if (len > grub_le_to_cpu32 (data->inode.size))
- len = grub_le_to_cpu32 (data->inode.size);
-
- blockcnt = ((len + pos)
- + EXT2_BLOCK_SIZE (data) - 1) / EXT2_BLOCK_SIZE (data);
-
- for (i = pos / EXT2_BLOCK_SIZE (data); i < blockcnt; i++)
- {
- int blknr;
- int blockoff = pos % EXT2_BLOCK_SIZE (data);
- int blockend = EXT2_BLOCK_SIZE (data);
-
- int skipfirst = 0;
-
- grub_ext2_get_file_block (data, i, &blknr);
- if (grub_errno)
- return -1;
-
- blknr = blknr << LOG2_EXT2_BLOCK_SIZE (data);
-
- /* Last block. */
- if (i == blockcnt - 1)
- {
- blockend = (len + pos) % EXT2_BLOCK_SIZE (data);
-
- /* The last portion is exactly EXT2_BLOCK_SIZE (data). */
- if (!blockend)
- blockend = EXT2_BLOCK_SIZE (data);
- }
-
- /* First block. */
- if (i == pos / EXT2_BLOCK_SIZE (data))
- {
- skipfirst = blockoff;
- blockend -= skipfirst;
- }
-
- /* If the block number is 0 this block is not stored on disk but
- is zero filled instead. */
- if (blknr)
- {
- data->disk->read_hook = read_hook;
- grub_disk_read (data->disk, blknr, skipfirst,
- blockend, buf);
- data->disk->read_hook = 0;
- if (grub_errno)
- return -1;
- }
- else
- grub_memset (buf, EXT2_BLOCK_SIZE (data) - skipfirst, 0);
-
- buf += EXT2_BLOCK_SIZE (data) - skipfirst;
- }
-
- return len;
+ return grub_fshelp_read_file (node->data->disk, node, read_hook,
+ pos, len, buf, grub_ext2_read_block,
+ node->inode.size,
+ LOG2_EXT2_BLOCK_SIZE (node->data));
+
}
@@ -313,8 +269,8 @@ static grub_err_t
grub_ext2_read_inode (struct grub_ext2_data *data,
int ino, struct grub_ext2_inode *inode)
{
- struct ext2_block_group blkgrp;
- struct grub_ext_sblock *sblock = &data->sblock;
+ struct grub_ext2_block_group blkgrp;
+ struct grub_ext2_sblock *sblock = &data->sblock;
int inodes_per_block;
unsigned int blkno;
@@ -355,7 +311,7 @@ grub_ext2_mount (grub_disk_t disk)
return 0;
/* Read the superblock. */
- grub_disk_read (disk, 1 * 2, 0, sizeof (struct grub_ext_sblock),
+ grub_disk_read (disk, 1 * 2, 0, sizeof (struct grub_ext2_sblock),
(char *) &data->sblock);
if (grub_errno)
goto fail;
@@ -364,7 +320,17 @@ grub_ext2_mount (grub_disk_t disk)
if (grub_le_to_cpu16 (data->sblock.magic) != EXT2_MAGIC)
goto fail;
+ data->diropen.data = data;
+ data->diropen.ino = 2;
+ data->diropen.inode_read = 1;
+
+ data->inode = &data->diropen.inode;
data->disk = disk;
+
+ grub_ext2_read_inode (data, 2, data->inode);
+ if (grub_errno)
+ goto fail;
+
return data;
fail:
@@ -373,198 +339,137 @@ grub_ext2_mount (grub_disk_t disk)
return 0;
}
-/* Find the file with the pathname PATH on the filesystem described by
- DATA. Return its inode number in INO. */
-static grub_err_t
-grub_ext2_find_file (struct grub_ext2_data *data, const char *path, int *ino)
+static char *
+grub_ext2_read_symlink (grub_fshelp_node_t node)
{
- int blocksize = EXT2_BLOCK_SIZE (data)
- << grub_le_to_cpu32 (data->sblock.log2_block_size);
- struct grub_ext2_inode *inode = &data->inode;
- int currinode = 2;
- int symlinkcnt = 0;
-
- char fpath[EXT2_PATH_MAX];
- char *name = fpath;
-
- grub_strncpy (fpath, path, EXT2_PATH_MAX);
-
- if (!name || name[0] != '/')
- {
- grub_error (GRUB_ERR_BAD_FILENAME, "bad filename");
- return grub_errno;
- }
-
- /* Skip the first slash. */
- name++;
- if (!*name)
+ char *symlink;
+ struct grub_fshelp_node *diro = node;
+
+ if (!diro->inode_read)
{
- *ino = 2;
- return 0;
+ grub_ext2_read_inode (diro->data, diro->ino, &diro->inode);
+ if (grub_errno)
+ return 0;
}
-
- /* Remove trailing "/". */
- if (name[grub_strlen (name) - 1] =='/')
- name[grub_strlen (name) - 1] = '\0';
-
- while (*name)
+
+ symlink = grub_malloc (grub_le_to_cpu32 (diro->inode.size) + 1);
+ if (!symlink)
+ return 0;
+
+ /* If the filesize of the symlink is bigger than
+ 60 the symlink is stored in a separate block,
+ otherwise it is stored in the inode. */
+ if (grub_le_to_cpu32 (diro->inode.size) <= 60)
+ grub_strncpy (symlink,
+ diro->inode.symlink,
+ grub_le_to_cpu32 (diro->inode.size));
+ else
{
- unsigned int fpos = 0;
- char *next;
- int namesize;
-
- /* Extract the actual part from the pathname. */
- next = grub_strchr (name, '/');
- if (next)
+ grub_ext2_read_file (diro, 0, 0,
+ grub_le_to_cpu32 (diro->inode.size),
+ symlink);
+ if (grub_errno)
{
- next[0] = '\0';
- next++;
+ grub_free (symlink);
+ return 0;
}
+ }
+
+ symlink[grub_le_to_cpu32 (diro->inode.size)] = '\0';
+ return symlink;
+}
- namesize = grub_strlen (name);
+static int
+grub_ext2_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))
+{
+ unsigned int fpos = 0;
+ struct grub_fshelp_node *diro = (struct grub_fshelp_node *) dir;
+
+ if (!diro->inode_read)
+ {
+ grub_ext2_read_inode (diro->data, diro->ino, &diro->inode);
+ if (grub_errno)
+ return 0;
+ }
+
+ /* Search the file. */
+ while (fpos < grub_le_to_cpu32 (diro->inode.size))
+ {
+ struct ext2_dirent dirent;
- /* Open the file. */
- grub_ext2_read_inode (data, currinode, inode);
+ grub_ext2_read_file (diro, 0, fpos, sizeof (struct ext2_dirent),
+ (char *) &dirent);
if (grub_errno)
- goto fail;
+ return 0;
- /* Search the file. */
- while (fpos < grub_le_to_cpu32 (inode->size))
+ if (dirent.namelen != 0)
{
- struct ext2_dirent dirent;
-
- /* Read the directory entry. */
- grub_ext2_read_file (data, 0, fpos, sizeof (struct ext2_dirent),
- (char *) &dirent);
+ char filename[dirent.namelen + 1];
+ struct grub_fshelp_node *fdiro;
+ enum grub_fshelp_filetype type = GRUB_FSHELP_UNKNOWN;
+
+ grub_ext2_read_file (diro, 0, fpos + sizeof (struct ext2_dirent),
+ dirent.namelen, filename);
if (grub_errno)
- goto fail;
+ return 0;
+
+ fdiro = grub_malloc (sizeof (struct grub_fshelp_node));
+ if (!fdiro)
+ return 0;
+
+ fdiro->data = diro->data;
+ fdiro->ino = grub_le_to_cpu32 (dirent.inode);
+
+ filename[dirent.namelen] = '\0';
- if (dirent.namelen != 0)
+ if (dirent.filetype != FILETYPE_UNKNOWN)
{
- char filename[dirent.namelen + 1];
+ fdiro->inode_read = 0;
- /* Read the filename part of this directory entry. */
- grub_ext2_read_file (data, 0, fpos
- + sizeof (struct ext2_dirent),
- dirent.namelen, filename);
+ if (dirent.filetype == FILETYPE_DIRECTORY)
+ type = GRUB_FSHELP_DIR;
+ else if (dirent.filetype == FILETYPE_SYMLINK)
+ type = GRUB_FSHELP_SYMLINK;
+ else if (dirent.filetype == FILETYPE_REG)
+ type = GRUB_FSHELP_REG;
+ }
+ else
+ {
+ /* The filetype can not be read from the dirent, read
+ the inode to get more information. */
+ grub_ext2_read_inode (diro->data, grub_le_to_cpu32 (dirent.inode),
+ &fdiro->inode);
if (grub_errno)
- goto fail;
-
- filename[dirent.namelen] = '\0';
-
- /* Check if the current directory entry described the
- file we are looking for. */
- if (dirent.namelen == namesize
- && !grub_strncmp (name, filename, namesize))
{
- /* Stat the inode. */
- grub_ext2_read_inode (data,
- grub_le_to_cpu32 (dirent.inode),
- inode);
-
- /* If this is a symlink, follow it. */
- if ((grub_le_to_cpu16 (data->inode.mode)
- & FILETYPE_INO_MASK) == FILETYPE_INO_SYMLINK)
- {
- /* XXX: Use malloc instead? */
- char symlink[blocksize];
-
- if (++symlinkcnt == EXT2_MAX_SYMLINKCNT)
- {
- grub_error (GRUB_ERR_SYMLINK_LOOP,
- "too deep nesting of symlinks");
- goto fail;
- }
-
- /* If the filesize of the symlink is bigger than
- 60 the symlink is stored in a separate block,
- otherwise it is stored in the inode. */
- if (grub_le_to_cpu32 (inode->size) <= 60)
- grub_strncpy (symlink,
- inode->symlink,
- grub_le_to_cpu32 (inode->size));
- else
- {
- grub_ext2_read_file (data, 0, 0,
- grub_le_to_cpu32 (inode->size),
- symlink);
- if (grub_errno)
- goto fail;
- }
-
- symlink[grub_le_to_cpu32 (inode->size)] = '\0';
-
- /* Check if the symlink is absolute or relative. */
- if (symlink[0] == '/')
- {
- grub_strncpy (fpath, symlink + 1, EXT2_PATH_MAX);
- name = fpath;
- currinode = 2;
- }
- else
- {
- char *bak = 0;
-
- if (next)
- {
- bak = grub_strdup (next);
- if (!bak)
- goto fail;
- }
-
- /* Relative symlink, construct the new path. */
- grub_strcpy (fpath, symlink);
- name = fpath;
-
- if (next)
- {
- grub_strcat (name, "/");
- grub_strcat (name, bak);
- grub_free (bak);
- }
- }
-
- fpos = 0;
- break;
- }
-
- if (next)
- {
- currinode = grub_le_to_cpu32 (dirent.inode);
- name = next;
-
- if ((grub_le_to_cpu16 (data->inode.mode)
- & FILETYPE_INO_MASK) != FILETYPE_INO_DIRECTORY)
- {
- grub_error (GRUB_ERR_BAD_FILE_TYPE,
- "not a directory");
- goto fail;
- }
- break;
- }
- else /* Found it! */
- {
- *ino = grub_le_to_cpu32 (dirent.inode);
- return 0;
- }
+ grub_free (fdiro);
+ return 0;
}
+
+ fdiro->inode_read = 1;
+
+ if ((grub_le_to_cpu16 (diro->inode.mode)
+ & FILETYPE_INO_MASK) == FILETYPE_INO_DIRECTORY)
+ type = GRUB_FSHELP_DIR;
+ else if ((grub_le_to_cpu16 (diro->inode.mode)
+ & FILETYPE_INO_MASK) == FILETYPE_INO_DIRECTORY)
+ type = GRUB_FSHELP_SYMLINK;
+ else if ((grub_le_to_cpu16 (diro->inode.mode)
+ & FILETYPE_INO_MASK) == FILETYPE_INO_DIRECTORY)
+ type = GRUB_FSHELP_REG;
}
-
- /* Move to next directory entry. */
- fpos += grub_le_to_cpu16 (dirent.direntlen);
- }
-
- /* The complete directory was read and no matching file was
- found. */
- if (fpos >= grub_le_to_cpu32 (inode->size))
- {
- grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
- goto fail;
+
+ if (hook (filename, type, fdiro))
+ return 1;
}
+
+ fpos += grub_le_to_cpu16 (dirent.direntlen);
}
-
- fail:
- return grub_errno;
+
+ return 0;
}
/* Open a file named NAME and initialize FILE. */
@@ -572,40 +477,42 @@ static grub_err_t
grub_ext2_open (struct grub_file *file, const char *name)
{
struct grub_ext2_data *data;
- int ino;
-
+ struct grub_fshelp_node *fdiro = 0;
+
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
-
+
data = grub_ext2_mount (file->device->disk);
if (!data)
goto fail;
- grub_ext2_find_file (data, name, &ino);
- if (grub_errno)
- goto fail;
-
- grub_ext2_read_inode (data, ino, &data->inode);
+ grub_fshelp_find_file (name, &data->diropen, &fdiro, grub_ext2_iterate_dir,
+ grub_ext2_read_symlink, GRUB_FSHELP_REG);
if (grub_errno)
goto fail;
-
- if (!(grub_le_to_cpu16 (data->inode.mode) & 0100000))
+
+ if (!fdiro->inode_read)
{
- grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a regular file");
- goto fail;
+ grub_ext2_read_inode (data, fdiro->ino, &fdiro->inode);
+ if (grub_errno)
+ goto fail;
}
- file->size = grub_le_to_cpu32 (data->inode.size);
+ grub_memcpy (data->inode, &fdiro->inode, sizeof (struct grub_ext2_inode));
+ grub_free (fdiro);
+
+ file->size = grub_le_to_cpu32 (data->inode->size);
file->data = data;
file->offset = 0;
return 0;
fail:
-
grub_free (data);
-
+ if (fdiro != &data->diropen)
+ grub_free (fdiro);
+
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
@@ -632,7 +539,8 @@ grub_ext2_read (grub_file_t file, char *
struct grub_ext2_data *data =
(struct grub_ext2_data *) file->data;
- return grub_ext2_read_file (data, file->read_hook, file->offset, len, buf);
+ return grub_ext2_read_file (&data->diropen, file->read_hook,
+ file->offset, len, buf);
}
@@ -641,10 +549,26 @@ grub_ext2_dir (grub_device_t device, con
int (*hook) (const char *filename, int dir))
{
struct grub_ext2_data *data = 0;;
-
- int ino;
- unsigned int fpos = 0;
+ struct grub_fshelp_node *fdiro = 0;
+ auto int NESTED_FUNC_ATTR iterate (const char *filename,
+ enum grub_fshelp_filetype filetype,
+ grub_fshelp_node_t node);
+
+ int NESTED_FUNC_ATTR iterate (const char *filename,
+ enum grub_fshelp_filetype filetype,
+ grub_fshelp_node_t node)
+ {
+ grub_free (node);
+
+ if (filetype == GRUB_FSHELP_DIR)
+ return hook (filename, 1);
+ else
+ return hook (filename, 0);
+
+ return 0;
+ }
+
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
@@ -652,61 +576,18 @@ grub_ext2_dir (grub_device_t device, con
data = grub_ext2_mount (device->disk);
if (!data)
goto fail;
-
- grub_ext2_find_file (data, (char *) path, &ino);
- if (grub_errno)
- goto fail;
-
- grub_ext2_read_inode (data, ino, &data->inode);
+
+ grub_fshelp_find_file (path, &data->diropen, &fdiro, grub_ext2_iterate_dir,
+ grub_ext2_read_symlink, GRUB_FSHELP_DIR);
if (grub_errno)
- goto fail;
-
- if ((grub_le_to_cpu16 (data->inode.mode)
- & FILETYPE_INO_MASK) != FILETYPE_INO_DIRECTORY)
- {
- grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a directory");
- goto fail;
- }
-
- /* Search the file. */
- while (fpos < grub_le_to_cpu32 (data->inode.size))
- {
- struct ext2_dirent dirent;
-
- grub_ext2_read_file (data, 0, fpos, sizeof (struct ext2_dirent),
- (char *) &dirent);
- if (grub_errno)
- goto fail;
-
- if (dirent.namelen != 0)
- {
- char filename[dirent.namelen + 1];
-
- grub_ext2_read_file (data, 0, fpos + sizeof (struct ext2_dirent),
- dirent.namelen, filename);
- if (grub_errno)
- goto fail;
-
- filename[dirent.namelen] = '\0';
-
- if (dirent.filetype != FILETYPE_UNKNOWN)
- hook (filename, dirent.filetype == FILETYPE_DIRECTORY);
- else
- {
- struct grub_ext2_inode inode;
- grub_ext2_read_inode (data, grub_le_to_cpu32 (dirent.inode), &inode);
-
- hook (filename, (grub_le_to_cpu16 (inode.mode)
- & FILETYPE_INO_MASK) == FILETYPE_INO_DIRECTORY);
- }
- }
-
- fpos += grub_le_to_cpu16 (dirent.direntlen);
- }
-
+ return grub_errno;
+
+ grub_ext2_iterate_dir (fdiro, iterate);
+
fail:
-
grub_free (data);
+ if (fdiro != &data->diropen)
+ grub_free (fdiro);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
Index: fs/fshelp.c
===================================================================
RCS file: fs/fshelp.c
diff -N fs/fshelp.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ fs/fshelp.c 9 Sep 2004 20:49:37 -0000
@@ -0,0 +1,292 @@
+/* fshelp.c -- Filesystem helper functions */
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2004 Free Software Foundation, Inc.
+ *
+ * GRUB 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 GRUB; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <grub/err.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/disk.h>
+#include <grub/fshelp.h>
+
+
+/* Lookup the node PATH. The node ROOTNODE describes the root of the
+ directory tree. The node found is returned in FOUNDNODE, which is
+ either a ROOTNODE or a new malloc'ed node. ITERATE_DIR is used to
+ iterate over all directory entries in the current node.
+ READ_SYMLINK is used to read the symlink if a node is a symlink.
+ EXPECTTYPE is the type node that is expected by the called, an
+ error is generated if the node is not of the expected type. Make
+ sure you use the NESTED_FUNC_ATTR macro for HOOK, this is required
+ because GCC has a nasty bug when using regparm=3. */
+grub_err_t
+grub_fshelp_find_file (const char *path, grub_fshelp_node_t rootnode,
+ grub_fshelp_node_t *foundnode,
+ int (*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)),
+ char *(*read_symlink) (grub_fshelp_node_t node),
+ enum grub_fshelp_filetype expecttype)
+{
+ grub_err_t err;
+ enum grub_fshelp_filetype foundtype = GRUB_FSHELP_DIR;
+ int symlinknest = 0;
+
+ auto grub_err_t NESTED_FUNC_ATTR find_file (const char *currpath,
+ grub_fshelp_node_t currroot,
+ grub_fshelp_node_t *currfound);
+
+ grub_err_t NESTED_FUNC_ATTR find_file (const char *currpath,
+ grub_fshelp_node_t currroot,
+ grub_fshelp_node_t *currfound)
+ {
+ char fpath[grub_strlen (currpath) + 1];
+ char *name = fpath;
+ char *next;
+ // unsigned int pos = 0;
+ enum grub_fshelp_filetype type = GRUB_FSHELP_DIR;
+ grub_fshelp_node_t currnode = currroot;
+ grub_fshelp_node_t oldnode = currroot;
+
+ auto int NESTED_FUNC_ATTR iterate (const char *filename,
+ enum grub_fshelp_filetype filetype,
+ grub_fshelp_node_t node);
+
+ auto void free_node (grub_fshelp_node_t node);
+
+ void free_node (grub_fshelp_node_t node)
+ {
+ if (node != rootnode && node != currroot)
+ grub_free (node);
+ }
+
+ int NESTED_FUNC_ATTR iterate (const char *filename,
+ enum grub_fshelp_filetype filetype,
+ grub_fshelp_node_t node)
+ {
+ if (type == GRUB_FSHELP_UNKNOWN || grub_strcmp (name, filename))
+ {
+ grub_free (node);
+ return 0;
+ }
+
+ /* The node is found, stop iterating over the nodes. */
+ type = filetype;
+ oldnode = currnode == rootnode ? 0 : currnode;
+ currnode = node;
+
+ return 1;
+ }
+
+ grub_strncpy (fpath, currpath, grub_strlen (currpath) + 1);
+
+ /* Remove all leading slashes. */
+ while (*name == '/')
+ name++;
+
+ if (!*name)
+ {
+ *currfound = currnode;
+ return 0;
+ }
+
+ for (;;)
+ {
+ int found;
+
+ /* Extract the actual part from the pathname. */
+ next = grub_strchr (name, '/');
+ if (next)
+ {
+ /* Remove all leading slashes. */
+ while (*next == '/')
+ *(next++) = '\0';
+ }
+
+ /* At this point it is expected that the current node is a
+ directory, check if this is true. */
+ if (type != GRUB_FSHELP_DIR)
+ {
+ free_node (currnode);
+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a directory");
+ }
+
+ /* Iterate over the directory. */
+ found = iterate_dir (currnode, iterate);
+
+ if (!found)
+ {
+ free_node (oldnode);
+ if (grub_errno)
+ return grub_errno;
+
+ break;
+ }
+
+ /* Read in the symlink and follow it. */
+ if (type == GRUB_FSHELP_SYMLINK)
+ {
+ char *symlink;
+
+ /* Test if the symlink does not loop. */
+ if (++symlinknest == 8)
+ {
+ free_node (currnode);
+ free_node (oldnode);
+ return grub_error (GRUB_ERR_SYMLINK_LOOP, "too deep nesting of symlinks");
+ }
+
+ symlink = read_symlink (currnode);
+ free_node (currnode);
+
+ if (!symlink)
+ {
+ free_node (oldnode);
+ return grub_errno;
+ }
+
+ /* The symlink is an absolute path, go back to the root inode. */
+ if (symlink[0] == '/')
+ {
+ free_node (oldnode);
+ oldnode = rootnode;
+ }
+
+ /* Lookup the node the symlink points to. */
+ find_file (symlink, oldnode, &currnode);
+ grub_free (symlink);
+
+ if (grub_errno)
+ {
+ free_node (oldnode);
+ return grub_errno;
+ }
+ }
+
+ free_node (oldnode);
+
+ /* Found the node! */
+ if (!next || *next == '\0')
+ {
+ *currfound = currnode;
+ foundtype = type;
+ return 0;
+ }
+
+ name = next;
+ }
+
+ return grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
+ }
+
+ if (!path || path[0] != '/')
+ {
+ grub_error (GRUB_ERR_BAD_FILENAME, "bad filename");
+ return grub_errno;
+ }
+
+ err = find_file (path, rootnode, foundnode);
+ if (err)
+ return err;
+
+ /* Check if the node that was found was of the expected type. */
+ if (expecttype == GRUB_FSHELP_REG && foundtype != expecttype)
+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a regular file");
+ else if (expecttype == GRUB_FSHELP_DIR && foundtype != expecttype)
+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a directory");
+
+ return 0;
+}
+
+
+/* Read LEN bytes from the file NODE on disk DISK into the buffer BUF,
+ beginning with the block POS. READ_HOOK should be set before
+ reading a block from the file. GET_BLOCK is used to translate file
+ blocks to disk blocks. The file is FILESIZE bytes big and the
+ blocks have a size of LOG2BLOCKSIZE (in log2). */
+grub_ssize_t
+grub_fshelp_read_file (grub_disk_t disk, grub_fshelp_node_t node,
+ void (*read_hook) (unsigned long sector,
+ unsigned offset, unsigned length),
+ int pos, unsigned int len, char *buf,
+ int (*get_block) (grub_fshelp_node_t node, int block),
+ unsigned int filesize, int log2blocksize)
+{
+ int i;
+ int blockcnt;
+ int blocksize = 1 << (log2blocksize + GRUB_DISK_SECTOR_BITS);
+
+ /* Adjust len so it we can't read past the end of the file. */
+ if (len > filesize)
+ len = filesize;
+
+ blockcnt = ((len + pos)
+ + blocksize - 1) / blocksize;
+
+ for (i = pos / blocksize; i < blockcnt; i++)
+ {
+ int blknr;
+ int blockoff = pos % blocksize;
+ int blockend = blocksize;
+
+ int skipfirst = 0;
+
+ blknr = get_block (node, i);
+ if (grub_errno)
+ return -1;
+
+ blknr = blknr << log2blocksize;
+
+ /* Last block. */
+ if (i == blockcnt - 1)
+ {
+ blockend = (len + pos) % blocksize;
+
+ /* The last portion is exactly blocksize. */
+ if (!blockend)
+ blockend = blocksize;
+ }
+
+ /* First block. */
+ if (i == pos / blocksize)
+ {
+ skipfirst = blockoff;
+ blockend -= skipfirst;
+ }
+
+ /* If the block number is 0 this block is not stored on disk but
+ is zero filled instead. */
+ if (blknr)
+ {
+ disk->read_hook = read_hook;
+ grub_disk_read (disk, blknr, skipfirst,
+ blockend, buf);
+ disk->read_hook = 0;
+ if (grub_errno)
+ return -1;
+ }
+ else
+ grub_memset (buf, blocksize - skipfirst, 0);
+
+ buf += blocksize - skipfirst;
+ }
+
+ return len;
+}
Index: include/grub/fshelp.h
===================================================================
RCS file: include/grub/fshelp.h
diff -N include/grub/fshelp.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ include/grub/fshelp.h 9 Sep 2004 20:49:37 -0000
@@ -0,0 +1,75 @@
+/* fshelp.h -- Filesystem helper functions */
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2004 Free Software Foundation, Inc.
+ *
+ * GRUB 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 GRUB; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef GRUB_FSHELP_HEADER
+#define GRUB_FSHELP_HEADER 1
+
+#include <grub/types.h>
+#include <grub/symbol.h>
+#include <grub/err.h>
+
+typedef struct grub_fshelp_node *grub_fshelp_node_t;
+
+enum grub_fshelp_filetype
+ {
+ GRUB_FSHELP_UNKNOWN,
+ GRUB_FSHELP_REG,
+ GRUB_FSHELP_DIR,
+ GRUB_FSHELP_SYMLINK
+ };
+
+/* Lookup the node PATH. The node ROOTNODE describes the root of the
+ directory tree. The node found is returned in FOUNDNODE, which is
+ either a ROOTNODE or a new malloc'ed node. ITERATE_DIR is used to
+ iterate over all directory entries in the current node.
+ READ_SYMLINK is used to read the symlink if a node is a symlink.
+ EXPECTTYPE is the type node that is expected by the called, an
+ error is generated if the node is not of the expected type. Make
+ sure you use the NESTED_FUNC_ATTR macro for HOOK, this is required
+ because GCC has a nasty bug when using regparm=3. */
+grub_err_t
+EXPORT_FUNC(grub_fshelp_find_file) (const char *path,
+ grub_fshelp_node_t rootnode,
+ grub_fshelp_node_t *foundnode,
+ int (*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)),
+ char *(*read_symlink) (grub_fshelp_node_t node),
+ enum grub_fshelp_filetype expect);
+
+
+/* Read LEN bytes from the file NODE on disk DISK into the buffer BUF,
+ beginning with the block POS. READ_HOOK should be set before
+ reading a block from the file. GET_BLOCK is used to translate file
+ blocks to disk blocks. The file is FILESIZE bytes big and the
+ blocks have a size of LOG2BLOCKSIZE (in log2). */
+grub_ssize_t
+EXPORT_FUNC(grub_fshelp_read_file) (grub_disk_t disk, grub_fshelp_node_t node,
+ void (*read_hook) (unsigned long sector,
+ unsigned offset,
+ unsigned length),
+ int pos, unsigned int len, char *buf,
+ int (*get_block) (grub_fshelp_node_t node,
+ int block),
+ unsigned int filesize, int log2blocksize);
+
+#endif /* ! GRUB_FSHELP_HEADER */
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: JFS support (PATCH) and filesystem improvements
2004-09-09 21:02 ` Marco Gerards
@ 2004-09-10 18:06 ` Yoshinori K. Okuji
0 siblings, 0 replies; 8+ messages in thread
From: Yoshinori K. Okuji @ 2004-09-10 18:06 UTC (permalink / raw)
To: The development of GRUB 2
On Thursday 09 September 2004 23:02, Marco Gerards wrote:
> So I assume this patch is ok. To be sure, I will wait until Sunday
> before I commit this patch.
It looks okay to me.
Okuji
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2004-09-10 18:11 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-08-23 12:48 JFS support (PATCH) and filesystem improvements Marco Gerards
2004-08-28 17:47 ` Marco Gerards
2004-08-29 23:00 ` Tomas Ebenlendr
2004-09-09 21:02 ` Marco Gerards
2004-09-10 18:06 ` Yoshinori K. Okuji
2004-08-30 10:22 ` Yoshinori K. Okuji
2004-08-30 15:49 ` Marco Gerards
2004-08-31 15:23 ` Tomas Ebenlendr
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.