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

* util/grub-render-label.c: Move backend part to ...

Browse source 
* util/render-label.c: ... here.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-19 02:37:01 +02:00
parent 44d1c20a13
commit 6f65237374
4 changed files with 151 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@
#include <grub/i18n.h>
#include <grub/term.h>
#include <grub/macho.h>
#include <grub/util/install.h>
#define _GNU_SOURCE 1
@ -90,82 +91,9 @@ static struct argp argp = {
NULL, NULL, NULL
};
static void
write_fat (FILE *in32, FILE *in64, FILE *out, const char *out_filename,
const char *name32, const char *name64)
{
struct grub_macho_fat_header head;
struct grub_macho_fat_arch arch32, arch64;
grub_uint32_t size32, size64;
char *buf;
fseek (in32, 0, SEEK_END);
size32 = ftell (in32);
fseek (in32, 0, SEEK_SET);
fseek (in64, 0, SEEK_END);
size64 = ftell (in64);
fseek (in64, 0, SEEK_SET);
head.magic = grub_cpu_to_le32_compile_time (GRUB_MACHO_FAT_EFI_MAGIC);
head.nfat_arch = grub_cpu_to_le32_compile_time (2);
arch32.cputype = grub_cpu_to_le32_compile_time (GRUB_MACHO_CPUTYPE_IA32);
arch32.cpusubtype = grub_cpu_to_le32_compile_time (3);
arch32.offset = grub_cpu_to_le32_compile_time (sizeof (head)
+ sizeof (arch32)
+ sizeof (arch64));
arch32.size = grub_cpu_to_le32 (size32);
arch32.align = 0;
arch64.cputype = grub_cpu_to_le32_compile_time (GRUB_MACHO_CPUTYPE_AMD64);
arch64.cpusubtype = grub_cpu_to_le32_compile_time (3);
arch64.offset = grub_cpu_to_le32 (sizeof (head) + sizeof (arch32)
+ sizeof (arch64) + size32);
arch64.size = grub_cpu_to_le32 (size64);
arch64.align = 0;
if (fwrite (&head, 1, sizeof (head), out) != sizeof (head)
|| fwrite (&arch32, 1, sizeof (arch32), out) != sizeof (arch32)
|| fwrite (&arch64, 1, sizeof (arch64), out) != sizeof (arch64))
{
if (out_filename)
grub_util_error ("cannot write to `%s': %s",
out_filename, strerror (errno));
else
grub_util_error ("cannot write to the stdout: %s", strerror (errno));
}
buf = xmalloc (size32);
if (fread (buf, 1, size32, in32) != size32)
grub_util_error (_("cannot read `%s': %s"), name32,
strerror (errno));
if (fwrite (buf, 1, size32, out) != size32)
{
if (out_filename)
grub_util_error ("cannot write to `%s': %s",
out_filename, strerror (errno));
else
grub_util_error ("cannot write to the stdout: %s", strerror (errno));
}
free (buf);
buf = xmalloc (size64);
if (fread (buf, 1, size64, in64) != size64)
grub_util_error (_("cannot read `%s': %s"), name64,
strerror (errno));
if (fwrite (buf, 1, size64, out) != size64)
{
if (out_filename)
grub_util_error ("cannot write to `%s': %s",
out_filename, strerror (errno));
else
grub_util_error ("cannot write to the stdout: %s", strerror (errno));
}
free (buf);
}
int
main (int argc, char *argv[])
{
FILE *in32, *in64, *out;
struct arguments arguments;
grub_util_host_init (&argc, &argv);
@ -184,36 +112,9 @@ main (int argc, char *argv[])
exit(1);
}
in32 = grub_util_fopen (arguments.input32, "r");
if (!in32)
grub_util_error (_("cannot open `%s': %s"), arguments.input32,
strerror (errno));
in64 = grub_util_fopen (arguments.input64, "r");
if (!in64)
grub_util_error (_("cannot open `%s': %s"), arguments.input64,
strerror (errno));
if (arguments.output)
out = grub_util_fopen (arguments.output, "wb");
else
out = stdout;
if (!out)
{
grub_util_error (_("cannot open `%s': %s"), arguments.output ? : "stdout",
strerror (errno));
}
write_fat (in32, in64, out, arguments.output,
arguments.input32, arguments.input64);
fclose (in32);
fclose (in64);
if (out != stdout)
fclose (out);
grub_util_glue_efi (arguments.input32,
arguments.input64,
arguments.output);
return 0;
}