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

Add a wrapper for fopen. On unix-like systems just pass-through. On

Browse source 
windows use unicode version.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-13 20:36:28 +02:00
parent ae5540d3d4
commit bb338aaf24
27 changed files with 97 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-10-13 Vladimir Serbinenko <phcoder@gmail.com>
Add a wrapper for fopen. On unix-like systems just pass-through. On
windows use unicode version.
2013-10-13 Vladimir Serbinenko <phcoder@gmail.com>
Move set_program_name and init_nls to host_init. On windows

2
grub-core/commands/acpihalt.c
View file

@ -295,7 +295,7 @@ main (int argc, char **argv)
unsigned char *buf;
if (argc < 2)
printf ("Usage: %s FILE\n", argv[0]);
f = fopen (argv[1], "rb");
f = grub_util_fopen (argv[1], "rb");
if (!f)
{
printf ("Couldn't open file\n");

2
grub-core/kern/emu/hostdisk.c
View file

@ -435,7 +435,7 @@ read_device_map (const char *dev_map)
return;
}
fp = fopen (dev_map, "r");
fp = grub_util_fopen (dev_map, "r");
if (! fp)
{
grub_util_info (_("cannot open `%s': %s"), dev_map, strerror (errno));

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

@ -109,7 +109,7 @@ grub_hostfs_open (struct grub_file *file, const char *name)
FILE *f;
struct grub_hostfs_data *data;
f = fopen (name, "rb");
f = grub_util_fopen (name, "rb");
if (! f)
return grub_error (GRUB_ERR_BAD_FILENAME,
N_("can't open `%s': %s"), name,

10
grub-core/lib/reed_solomon.c
View file

@ -425,7 +425,7 @@ main (int argc, char **argv)
#endif
#ifndef STANDALONE
in = fopen ("tst.bin", "rb");
in = grub_util_fopen ("tst.bin", "rb");
if (!in)
return 1;
fseek (in, 0, SEEK_END);
@ -438,11 +438,11 @@ main (int argc, char **argv)
grub_reed_solomon_add_redundancy (buf, s, rs);
out = fopen ("tst_rs.bin", "wb");
out = grub_util_fopen ("tst_rs.bin", "wb");
fwrite (buf, 1, s + rs, out);
fclose (out);
#else
out = fopen ("tst_rs.bin", "rb");
out = grub_util_fopen ("tst_rs.bin", "rb");
fseek (out, 0, SEEK_END);
s = ftell (out);
fseek (out, 0, SEEK_SET);
@ -457,12 +457,12 @@ main (int argc, char **argv)
grub_memset (buf + 512 * 15, 0, 512);
#endif
out = fopen ("tst_dam.bin", "wb");
out = grub_util_fopen ("tst_dam.bin", "wb");
fwrite (buf, 1, s + rs, out);
fclose (out);
grub_reed_solomon_recover (buf, s, rs);
out = fopen ("tst_rec.bin", "wb");
out = grub_util_fopen ("tst_rec.bin", "wb");
fwrite (buf, 1, s, out);
fclose (out);

6
grub-core/osdep/aros/hostdisk.c
View file

@ -499,3 +499,9 @@ grub_util_fd_strerror (void)
return buf + 1;
return buf;
}
FILE *
grub_util_fopen (const char *path, const char *mode)
{
return fopen (path, mode);
}

2
grub-core/osdep/linux/getroot.c
View file

@ -239,7 +239,7 @@ grub_find_root_devices_from_mountinfo (const char *dir, char **relroot)
if (relroot)
*relroot = NULL;
fp = fopen ("/proc/self/mountinfo", "r");
fp = grub_util_fopen ("/proc/self/mountinfo", "r");
if (! fp)
return NULL; /* fall through to other methods */

2
grub-core/osdep/unix/getroot.c
View file

@ -721,7 +721,7 @@ grub_find_zpool_from_dir (const char *dir, char **poolname, char **poolfs)
if (stat (dir, &st) != 0)
return;
FILE *mnttab = fopen ("/etc/mnttab", "r");
FILE *mnttab = grub_util_fopen ("/etc/mnttab", "r");
if (! mnttab)
return;

6
grub-core/osdep/unix/hostdisk.c
View file

@ -211,4 +211,10 @@ canonicalize_file_name (const char *path)
#endif
}
FILE *
grub_util_fopen (const char *path, const char *mode)
{
return fopen (path, mode);
}
#endif

2
grub-core/osdep/unix/random.c
View file

@ -36,7 +36,7 @@ grub_get_random (void *out, grub_size_t len)
FILE *f;
size_t rd;
f = fopen ("/dev/urandom", "rb");
f = grub_util_fopen ("/dev/urandom", "rb");
if (!f)
return 1;
rd = fread (out, 1, len, f);

26
grub-core/osdep/windows/hostdisk.c
View file

@ -291,9 +291,35 @@ canonicalize_file_name (const char *path)
#ifdef __MINGW32__
FILE *
grub_util_fopen (const char *path, const char *mode)
{
LPTSTR tpath;
FILE *ret;
tpath = grub_util_get_windows_path (path);
#if SIZEOF_TCHAR == 1
ret = fopen (tpath, tmode);
#else
LPTSTR tmode;
tmode = grub_util_utf8_to_tchar (mode);
ret = _wfopen (tpath, tmode);
free (tmode);
#endif
free (tpath);
return ret;
}
int fsync (int fno __attribute__ ((unused)))
{
return 0;
}
#else
FILE *
grub_util_fopen (const char *path, const char *mode)
{
return fopen (path, mode);
}
#endif

9
include/grub/emu/misc.h
View file

@ -22,6 +22,8 @@
#include <config.h>
#include <stdarg.h>
#include <stdio.h>
#include <grub/symbol.h>
#include <grub/types.h>
@ -54,4 +56,11 @@ extern char * canonicalize_file_name (const char *path);
int grub_device_mapper_supported (void);
#endif
#ifdef GRUB_BUILD
#define grub_util_fopen fopen
#else
FILE *
grub_util_fopen (const char *path, const char *mode);
#endif
#endif /* GRUB_EMU_MISC_H */

8
util/grub-editenv.c
View file

@ -119,7 +119,7 @@ create_envblk_file (const char *name)
buf = xmalloc (DEFAULT_ENVBLK_SIZE);
namenew = xasprintf ("%s.new", name);
fp = fopen (namenew, "wb");
fp = grub_util_fopen (namenew, "wb");
if (! fp)
grub_util_error (_("cannot open `%s': %s"), namenew,
strerror (errno));
@ -149,12 +149,12 @@ open_envblk_file (const char *name)
size_t size;
grub_envblk_t envblk;
fp = fopen (name, "rb");
fp = grub_util_fopen (name, "rb");
if (! fp)
{
/* Create the file implicitly. */
create_envblk_file (name);
fp = fopen (name, "rb");
fp = grub_util_fopen (name, "rb");
if (! fp)
grub_util_error (_("cannot open `%s': %s"), name,
strerror (errno));
@ -208,7 +208,7 @@ write_envblk (const char *name, grub_envblk_t envblk)
{
FILE *fp;
fp = fopen (name, "wb");
fp = grub_util_fopen (name, "wb");
if (! fp)
grub_util_error (_("cannot open `%s': %s"), name,
strerror (errno));

6
util/grub-fstest.c
View file

@ -200,7 +200,7 @@ cmd_cp (char *src, const char *dest)
.dest = dest
};
ctx.ff = fopen (dest, "wb");
ctx.ff = grub_util_fopen (dest, "wb");
if (ctx.ff == NULL)
{
grub_util_error (_("cannot open OS file `%s': %s"), dest,
@ -310,7 +310,7 @@ cmd_cmp (char *src, char *dest)
return;
}
ff = fopen (dest, "rb");
ff = grub_util_fopen (dest, "rb");
if (ff == NULL)
{
grub_util_error (_("OS file %s open error: %s"), dest,
@ -562,7 +562,7 @@ argp_parser (int key, char *arg, struct argp_state *state)
FILE *f;
ssize_t real_size;
grub_uint8_t buf[1024];
f = fopen (arg, "rb");
f = grub_util_fopen (arg, "rb");
if (!f)
{
printf (_("%s: error:"), program_name);

6
util/grub-glue-efi.c
View file

@ -184,19 +184,19 @@ main (int argc, char *argv[])
exit(1);
}
in32 = fopen (arguments.input32, "r");
in32 = grub_util_fopen (arguments.input32, "r");
if (!in32)
grub_util_error (_("cannot open `%s': %s"), arguments.input32,
strerror (errno));
in64 = fopen (arguments.input64, "r");
in64 = grub_util_fopen (arguments.input64, "r");
if (!in64)
grub_util_error (_("cannot open `%s': %s"), arguments.input64,
strerror (errno));
if (arguments.output)
out = fopen (arguments.output, "wb");
out = grub_util_fopen (arguments.output, "wb");
else
out = stdout;

4
util/grub-macho2img.c
View file

@ -52,13 +52,13 @@ main (int argc, char **argv)
"Convert Mach-O into raw image\n", argv[0]);
return 0;
}
in = fopen (argv[1 + do_bss], "rb");
in = grub_util_fopen (argv[1 + do_bss], "rb");
if (! in)
{
printf ("Couldn't open %s\n", argv[1 + do_bss]);
return 1;
}
out = fopen (argv[2 + do_bss], "wb");
out = grub_util_fopen (argv[2 + do_bss], "wb");
if (! out)
{
fclose (in);

4
util/grub-menulst2cfg.c
View file

@ -47,7 +47,7 @@ main (int argc, char **argv)
if (argc >= 2)
{
in = fopen (argv[1], "r");
in = grub_util_fopen (argv[1], "r");
if (!in)
{
fprintf (stderr, _("cannot open `%s': %s"),
@ -60,7 +60,7 @@ main (int argc, char **argv)
if (argc >= 3)
{
out = fopen (argv[2], "w");
out = grub_util_fopen (argv[2], "w");
if (!out)
{
if (in != stdin)

6
util/grub-mkfont.c
View file

@ -55,6 +55,10 @@
#include "progname.h"
#endif
#ifdef GRUB_BUILD
#define grub_util_fopen fopen
#endif
#define GRUB_FONT_DEFAULT_SIZE 16
#define GRUB_FONT_RANGE_BLOCK 1024
@ -785,7 +789,7 @@ write_font_pf2 (struct grub_font_info *font_info, char *output_file)
int offset;
struct grub_glyph_info *cur;
file = fopen (output_file, "wb");
file = grub_util_fopen (output_file, "wb");
if (! file)
grub_util_error (_("cannot write to `%s': %s"), output_file,
strerror (errno));

2
util/grub-mkimage.c
View file

@ -2052,7 +2052,7 @@ main (int argc, char *argv[])
if (arguments.output)
{
fp = fopen (arguments.output, "wb");
fp = grub_util_fopen (arguments.output, "wb");
if (! fp)
grub_util_error (_("cannot open `%s': %s"), arguments.output,
strerror (errno));

4
util/grub-mklayout.c
View file

@ -482,7 +482,7 @@ main (int argc, char *argv[])
}
if (arguments.input)
in = fopen (arguments.input, "r");
in = grub_util_fopen (arguments.input, "r");
else
in = stdin;
@ -491,7 +491,7 @@ main (int argc, char *argv[])
strerror (errno));
if (arguments.output)
out = fopen (arguments.output, "wb");
out = grub_util_fopen (arguments.output, "wb");
else
out = stdout;

2
util/grub-mount.c
View file

@ -474,7 +474,7 @@ argp_parser (int key, char *arg, struct argp_state *state)
FILE *f;
ssize_t real_size;
grub_uint8_t buf[1024];
f = fopen (arg, "rb");
f = grub_util_fopen (arg, "rb");
if (!f)
{
printf (_("%s: error:"), program_name);

2
util/grub-pe2elf.c
View file

@ -478,7 +478,7 @@ main (int argc, char *argv[])
out = in;
image = grub_util_read_image (in);
fp = fopen (out, "wb");
fp = grub_util_fopen (out, "wb");
if (! fp)
grub_util_error ("cannot open %s", out);

4
util/grub-render-label.c
View file

@ -236,7 +236,7 @@ main (int argc, char *argv[])
text = arguments.text;
else
{
FILE *in = fopen (arguments.input, "r");
FILE *in = grub_util_fopen (arguments.input, "r");
size_t s;
if (!in)
grub_util_error (_("cannot open `%s': %s"), arguments.input,
@ -253,7 +253,7 @@ main (int argc, char *argv[])
}
if (arguments.output)
out = fopen (arguments.output, "wb");
out = grub_util_fopen (arguments.output, "wb");
else
out = stdout;
if (!out)

2
util/grub-script-check.c
View file

@ -164,7 +164,7 @@ main (int argc, char *argv[])
}
else
{
ctx.file = fopen (ctx.arguments.filename, "r");
ctx.file = grub_util_fopen (ctx.arguments.filename, "r");
if (! ctx.file)
{
char *program = xstrdup(program_name);

8
util/grub-setup.c
View file

@ -662,14 +662,14 @@ unable_to_embed:
FILE *dump;
FILE *dump2;
dump = fopen ("dump.img", "wb");
dump = grub_util_fopen ("dump.img", "wb");
if (dump)
{
fwrite (tmp_img, 1, core_size, dump);
fclose (dump);
}
dump2 = fopen ("dump2.img", "wb");
dump2 = grub_util_fopen ("dump2.img", "wb");
if (dump2)
{
fwrite (core_img, 1, core_size, dump2);
@ -731,7 +731,7 @@ unable_to_embed:
/* Write the first two sectors of the core image onto the disk. */
grub_util_info ("opening the core image `%s'", core_path);
fp = fopen (core_path, "rb");
fp = grub_util_fopen (core_path, "rb");
if (! fp)
grub_util_error (_("cannot open `%s': %s"), core_path,
strerror (errno));
@ -893,7 +893,7 @@ unable_to_embed:
/* Write the first two sectors of the core image onto the disk. */
grub_util_info ("opening the core image `%s'", core_path);
fp = fopen (core_path, "r+b");
fp = grub_util_fopen (core_path, "r+b");
if (! fp)
grub_util_error (_("cannot open `%s': %s"), core_path,
strerror (errno));

4
util/misc.c
View file

@ -101,7 +101,7 @@ grub_util_read_image (const char *path)
size = grub_util_get_image_size (path);
img = (char *) xmalloc (size);
fp = fopen (path, "rb");
fp = grub_util_fopen (path, "rb");
if (! fp)
grub_util_error (_("cannot open `%s': %s"), path,
strerror (errno));
@ -125,7 +125,7 @@ grub_util_load_image (const char *path, char *buf)
size = grub_util_get_image_size (path);
fp = fopen (path, "rb");
fp = grub_util_fopen (path, "rb");
if (! fp)
grub_util_error (_("cannot open `%s': %s"), path,
strerror (errno));

2
util/resolve.c
View file

@ -241,7 +241,7 @@ grub_util_resolve_dependencies (const char *prefix,
struct grub_util_path_list *path_list = 0;
path = grub_util_get_path (prefix, dep_list_file);
fp = fopen (path, "r");
fp = grub_util_fopen (path, "r");
if (! fp)
grub_util_error (_("cannot open `%s': %s"), path, strerror (errno));