vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add wrappers around rename, unlink, mkdir, opendir, readdir and

Browse source 
closedir to handle filename charset translation.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-15 14:11:34 +02:00
parent d7750b324f
commit f6a81f0aaf
6 changed files with 237 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

44
grub-core/kern/emu/hostfs.c
View file

@ -34,8 +34,6 @@
#include <stdio.h>
#include <errno.h>
/* dirent.d_type is a BSD extension, not part of POSIX */
#include <sys/stat.h>
#include <string.h>
@ -63,32 +61,32 @@ is_dir (const char *path, const char *name)
struct grub_hostfs_data
{
char *filename;
FILE *f;
grub_util_fd_t f;
};
static grub_err_t
grub_hostfs_dir (grub_device_t device, const char *path,
grub_fs_dir_hook_t hook, void *hook_data)
{
DIR *dir;
grub_util_fd_dir_t dir;
/* Check if the disk is our dummy disk. */
if (grub_strcmp (device->disk->name, "host"))
return grub_error (GRUB_ERR_BAD_FS, "not a hostfs");
dir = opendir (path);
dir = grub_util_fd_opendir (path);
if (! dir)
return grub_error (GRUB_ERR_BAD_FILENAME,
N_("can't open `%s': %s"), path,
strerror (errno));
grub_util_fd_strerror ());
while (1)
{
struct dirent *de;
grub_util_fd_dirent_t de;
struct grub_dirhook_info info;
grub_memset (&info, 0, sizeof (info));
de = readdir (dir);
de = grub_util_fd_readdir (dir);
if (! de)
break;
@ -97,7 +95,7 @@ grub_hostfs_dir (grub_device_t device, const char *path,
}
closedir (dir);
grub_util_fd_closedir (dir);
return GRUB_ERR_NONE;
}
@ -106,25 +104,25 @@ grub_hostfs_dir (grub_device_t device, const char *path,
static grub_err_t
grub_hostfs_open (struct grub_file *file, const char *name)
{
FILE *f;
grub_util_fd_t f;
struct grub_hostfs_data *data;
f = grub_util_fopen (name, "rb");
if (! f)
f = grub_util_fd_open (name, GRUB_UTIL_FD_O_RDONLY);
if (! GRUB_UTIL_FD_IS_VALID (f))
return grub_error (GRUB_ERR_BAD_FILENAME,
N_("can't open `%s': %s"), name,
strerror (errno));
data = grub_malloc (sizeof (*data));
if (!data)
{
fclose (f);
grub_util_fd_close (f);
return grub_errno;
}
data->filename = grub_strdup (name);
if (!data->filename)
{
grub_free (data);
fclose (f);
grub_util_fd_close (f);
return grub_errno;
}
@ -132,13 +130,7 @@ grub_hostfs_open (struct grub_file *file, const char *name)
file->data = data;
#if defined (__CYGWIN__) || defined (__MINGW32__) || defined (__AROS__)
fseek (f, 0, SEEK_END);
file->size = ftello (f);
fseek (f, 0, SEEK_SET);
#else
file->size = grub_util_get_fd_size (fileno (f), name, NULL);
#endif
file->size = grub_util_get_fd_size (f, name, NULL);
return GRUB_ERR_NONE;
}
@ -149,17 +141,17 @@ grub_hostfs_read (grub_file_t file, char *buf, grub_size_t len)
struct grub_hostfs_data *data;
data = file->data;
if (fseeko (data->f, file->offset, SEEK_SET) != 0)
if (grub_util_fd_seek (data->f, file->offset) != 0)
{
grub_error (GRUB_ERR_OUT_OF_RANGE, N_("cannot seek `%s': %s"),
data->filename, strerror (errno));
data->filename, grub_util_fd_strerror ());
return -1;
}
unsigned int s = fread (buf, 1, len, data->f);
unsigned int s = grub_util_fd_read (data->f, buf, len);
if (s != len)
grub_error (GRUB_ERR_FILE_READ_ERROR, N_("cannot read `%s': %s"),
data->filename, strerror (errno));
data->filename, grub_util_fd_strerror ());
return (signed) s;
}
@ -170,7 +162,7 @@ grub_hostfs_close (grub_file_t file)
struct grub_hostfs_data *data;
data = file->data;
fclose (data->f);
grub_util_fd_close (data->f);
grub_free (data->filename);
grub_free (data);