Hi,
I have added a buffer length parameter to grub_buffile_open:
grub_file_t grub_buffile_open (const char *name, int size);
size < 0: Load the whole file.
size = 0: Use default buffer size (8192 bytes)
size > 0: Custom buffer size = size
The upper limit is 1m, if size > 1m, we set it to 1m.
2008-07-28 Bean <[EMAIL PROTECTED]>
* conf/common.rmk (pkglib_MODULES): Add bufio.mod.
(bufio_mod_SOURCES): New macro.
(bufio_mod_CFLAGS): Likewise.
(bufio_mod_LDFLAGS): Likewise.
* include/grub/bufio.h: New file.
* io/bufio.c: Likewise.
* video/png.c (grub_video_reader_png): Use grub_buffile_open to open
file.
* video/jpeg.c (grub_video_reader_jpeg): Likewise.
* video/tga.c (grub_video_reader_tga): Likewise.
* font/manager.c (add_font): Likewise.
--
Bean
diff --git a/conf/common.rmk b/conf/common.rmk
index 7db0b2a..3d3cd8a 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -382,7 +382,7 @@ crc_mod_CFLAGS = $(COMMON_CFLAGS)
crc_mod_LDFLAGS = $(COMMON_LDFLAGS)
# Misc.
-pkglib_MODULES += gzio.mod elf.mod
+pkglib_MODULES += gzio.mod bufio.mod elf.mod
# For elf.mod.
elf_mod_SOURCES = kern/elf.c
@@ -393,3 +393,8 @@ elf_mod_LDFLAGS = $(COMMON_LDFLAGS)
gzio_mod_SOURCES = io/gzio.c
gzio_mod_CFLAGS = $(COMMON_CFLAGS)
gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For bufio.mod.
+bufio_mod_SOURCES = io/bufio.c
+bufio_mod_CFLAGS = $(COMMON_CFLAGS)
+bufio_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/font/manager.c b/font/manager.c
index 80d8d07..887a4a3 100644
--- a/font/manager.c
+++ b/font/manager.c
@@ -23,6 +23,7 @@
#include <grub/types.h>
#include <grub/mm.h>
#include <grub/font.h>
+#include <grub/bufio.h>
struct entry
{
@@ -69,7 +70,7 @@ add_font (const char *filename)
grub_uint32_t num, i;
struct font *font = 0;
- file = grub_file_open (filename);
+ file = grub_buffile_open (filename, 0);
if (! file)
goto fail;
diff --git a/include/grub/bufio.h b/include/grub/bufio.h
new file mode 100644
index 0000000..9a2294c
--- /dev/null
+++ b/include/grub/bufio.h
@@ -0,0 +1,28 @@
+/* bufio.h - prototypes for bufio */
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2008 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GRUB 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_BUFIO_H
+#define GRUB_BUFIO_H 1
+
+#include <grub/file.h>
+
+grub_file_t grub_bufio_open (grub_file_t io, int size);
+grub_file_t grub_buffile_open (const char *name, int size);
+
+#endif /* ! GRUB_BUFIO_H */
diff --git a/io/bufio.c b/io/bufio.c
new file mode 100644
index 0000000..40ed89b
--- /dev/null
+++ b/io/bufio.c
@@ -0,0 +1,205 @@
+/* bufio.c - buffered io access */
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2008 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GRUB 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/err.h>
+#include <grub/types.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/fs.h>
+#include <grub/bufio.h>
+
+#define GRUB_BUFIO_DEF_SIZE 8192
+#define GRUB_BUFIO_MAX_SIZE 1048576
+
+struct grub_bufio
+{
+ grub_file_t file;
+ grub_size_t block_size;
+ grub_size_t buffer_len;
+ char buffer[0];
+};
+typedef struct grub_bufio *grub_bufio_t;
+
+static struct grub_fs grub_bufio_fs;
+
+grub_file_t
+grub_bufio_open (grub_file_t io, int size)
+{
+ grub_file_t file;
+ grub_bufio_t bufio = 0;
+
+ file = (grub_file_t) grub_malloc (sizeof (*file));
+ if (! file)
+ return 0;
+
+ if (size == 0)
+ size = GRUB_BUFIO_DEF_SIZE;
+ else if (size > GRUB_BUFIO_MAX_SIZE)
+ size = GRUB_BUFIO_MAX_SIZE;
+
+ if ((size < 0) || ((unsigned) size > io->size))
+ size = ((io->size > GRUB_BUFIO_MAX_SIZE) ? GRUB_BUFIO_MAX_SIZE :
+ io->size);
+
+ bufio = grub_malloc (sizeof (struct grub_bufio) + size);
+ if (! bufio)
+ {
+ grub_free (file);
+ return 0;
+ }
+
+ bufio->file = io;
+ bufio->block_size = size;
+ bufio->buffer_len = 0;
+
+ file->device = io->device;
+ file->offset = 0;
+ file->size = io->size;
+ file->data = bufio;
+ file->read_hook = 0;
+ file->fs = &grub_bufio_fs;
+
+ return file;
+}
+
+grub_file_t
+grub_buffile_open (const char *name, int size)
+{
+ grub_file_t io, file;
+
+ io = grub_file_open (name);
+ if (! io)
+ return 0;
+
+ file = grub_bufio_open (io, size);
+ if (! file)
+ {
+ grub_file_close (io);
+ return 0;
+ }
+
+ return file;
+}
+
+static grub_ssize_t
+grub_bufio_read (grub_file_t file, char *buf, grub_size_t len)
+{
+ grub_size_t res = len;
+ grub_bufio_t bufio = file->data;
+ grub_uint32_t pos;
+
+ if ((file->offset >= bufio->file->offset) &&
+ (file->offset < bufio->file->offset + bufio->buffer_len))
+ {
+ grub_size_t n;
+
+ pos = file->offset - bufio->file->offset;
+ n = bufio->buffer_len - pos;
+ if (n > len)
+ n = len;
+
+ grub_memcpy (buf, &bufio->buffer[pos], n);
+ len -= n;
+ if (! len)
+ return res;
+
+ buf += n;
+ bufio->file->offset += bufio->buffer_len;
+ pos = 0;
+ }
+ else
+ {
+ bufio->file->offset = grub_divmod64 (file->offset, bufio->block_size,
+ &pos);
+ bufio->file->offset *= bufio->block_size;
+ }
+
+ if (pos + len >= bufio->block_size)
+ {
+ if (pos)
+ {
+ grub_size_t n;
+
+ bufio->file->fs->read (bufio->file, bufio->buffer,
+ bufio->block_size);
+ if (grub_errno)
+ return -1;
+
+ n = bufio->block_size - pos;
+ grub_memcpy (buf, &bufio->buffer[pos], n);
+ len -= n;
+ buf += n;
+ bufio->file->offset += bufio->block_size;
+ pos = 0;
+ }
+
+ while (len >= bufio->block_size)
+ {
+ bufio->file->fs->read (bufio->file, buf, bufio->block_size);
+ if (grub_errno)
+ return -1;
+
+ len -= bufio->block_size;
+ buf += bufio->block_size;
+ bufio->file->offset += bufio->block_size;
+ }
+
+ if (! len)
+ {
+ bufio->buffer_len = 0;
+ return res;
+ }
+ }
+
+ bufio->buffer_len = bufio->file->size - bufio->file->offset;
+ if (bufio->buffer_len > bufio->block_size)
+ bufio->buffer_len = bufio->block_size;
+
+ bufio->file->fs->read (bufio->file, bufio->buffer, bufio->buffer_len);
+ if (grub_errno)
+ return -1;
+
+ grub_memcpy (buf, &bufio->buffer[pos], len);
+
+ return res;
+}
+
+static grub_err_t
+grub_bufio_close (grub_file_t file)
+{
+ grub_bufio_t bufio = file->data;
+
+ grub_file_close (bufio->file);
+ grub_free (bufio);
+
+ file->device = 0;
+
+ return grub_errno;
+}
+
+static struct grub_fs grub_bufio_fs =
+ {
+ .name = "bufio",
+ .dir = 0,
+ .open = 0,
+ .read = grub_bufio_read,
+ .close = grub_bufio_close,
+ .label = 0,
+ .next = 0
+ };
diff --git a/video/readers/jpeg.c b/video/readers/jpeg.c
index 8a4f803..03f3a94 100644
--- a/video/readers/jpeg.c
+++ b/video/readers/jpeg.c
@@ -23,7 +23,7 @@
#include <grub/mm.h>
#include <grub/misc.h>
#include <grub/arg.h>
-#include <grub/file.h>
+#include <grub/bufio.h>
/* Uncomment following define to enable JPEG debug. */
//#define JPEG_DEBUG
@@ -664,7 +664,7 @@ grub_video_reader_jpeg (struct grub_video_bitmap **bitmap,
grub_file_t file;
struct grub_jpeg_data *data;
- file = grub_file_open (filename);
+ file = grub_buffile_open (filename, 0);
if (!file)
return grub_errno;
diff --git a/video/readers/png.c b/video/readers/png.c
index 9dac4b6..ceb77e7 100644
--- a/video/readers/png.c
+++ b/video/readers/png.c
@@ -23,7 +23,7 @@
#include <grub/mm.h>
#include <grub/misc.h>
#include <grub/arg.h>
-#include <grub/file.h>
+#include <grub/bufio.h>
/* Uncomment following define to enable PNG debug. */
//#define PNG_DEBUG
@@ -840,7 +840,7 @@ grub_video_reader_png (struct grub_video_bitmap **bitmap,
grub_file_t file;
struct grub_png_data *data;
- file = grub_file_open (filename);
+ file = grub_buffile_open (filename, 0);
if (!file)
return grub_errno;
diff --git a/video/readers/tga.c b/video/readers/tga.c
index 7b944b0..e5f3834 100644
--- a/video/readers/tga.c
+++ b/video/readers/tga.c
@@ -23,7 +23,7 @@
#include <grub/mm.h>
#include <grub/misc.h>
#include <grub/arg.h>
-#include <grub/file.h>
+#include <grub/bufio.h>
/* Uncomment following define to enable TGA debug. */
//#define TGA_DEBUG
@@ -319,7 +319,7 @@ grub_video_reader_tga (struct grub_video_bitmap **bitmap,
struct grub_tga_header header;
int has_alpha;
- file = grub_file_open (filename);
+ file = grub_buffile_open (filename, 0);
if (! file)
return grub_errno;
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
