From 6f65237374fc56c71e6f9d39fee55c57b2698e52 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Sat, 19 Oct 2013 02:37:01 +0200 Subject: [PATCH] * util/grub-render-label.c: Move backend part to ... * util/render-label.c: ... here. --- Makefile.util.def | 1 + include/grub/util/install.h | 3 + util/glue-efi.c | 143 ++++++++++++++++++++++++++++++++++++ util/grub-glue-efi.c | 107 +-------------------------- 4 files changed, 151 insertions(+), 103 deletions(-) create mode 100644 util/glue-efi.c diff --git a/Makefile.util.def b/Makefile.util.def index 7400ac993..d7538c28d 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -946,6 +946,7 @@ program = { mansection = 1; common = util/grub-glue-efi.c; + common = util/glue-efi.c; common = grub-core/kern/emu/argp_common.c; common = grub-core/osdep/init.c; diff --git a/include/grub/util/install.h b/include/grub/util/install.h index 93f14eb70..7eb6141a5 100644 --- a/include/grub/util/install.h +++ b/include/grub/util/install.h @@ -79,6 +79,9 @@ grub_install_get_blocklist (grub_device_t root_dev, void grub_util_create_envblk_file (const char *name); +void +grub_util_glue_efi (const char *file32, const char *file64, const char *out); + void grub_util_render_label (const char *label_font, const char *label_bgcolor, diff --git a/util/glue-efi.c b/util/glue-efi.c new file mode 100644 index 000000000..c75f4759d --- /dev/null +++ b/util/glue-efi.c @@ -0,0 +1,143 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2010,2012,2013 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 . + */ + +#include + +#include +#include +#include +#include + +#define _GNU_SOURCE 1 + +#include +#include +#include +#include +#include +#include + +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); +} + +void +grub_util_glue_efi (const char *file32, const char *file64, const char *outname) +{ + FILE *in32, *in64, *out; + + in32 = grub_util_fopen (file32, "r"); + + if (!in32) + grub_util_error (_("cannot open `%s': %s"), file32, + strerror (errno)); + + in64 = grub_util_fopen (file64, "r"); + if (!in64) + grub_util_error (_("cannot open `%s': %s"), file64, + strerror (errno)); + + if (outname) + out = grub_util_fopen (outname, "wb"); + else + out = stdout; + + if (!out) + { + grub_util_error (_("cannot open `%s': %s"), outname ? : "stdout", + strerror (errno)); + } + + write_fat (in32, in64, out, outname, + file32, file64); + + fclose (in32); + fclose (in64); + + if (out != stdout) + fclose (out); +} + diff --git a/util/grub-glue-efi.c b/util/grub-glue-efi.c index dcd2808aa..bd8240ca1 100644 --- a/util/grub-glue-efi.c +++ b/util/grub-glue-efi.c @@ -22,6 +22,7 @@ #include #include #include +#include #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; }