From 72e9659899f1bd87f6599b470136fc2b2a8c89d1 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Fri, 29 May 2009 15:10:27 -0700 Subject: [PATCH] Run Nindent on com32/mboot/mboot.c Automatically reformat com32/mboot/mboot.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin --- com32/mboot/mboot.c | 335 ++++++++++++++++++++++++++-------------------------- 1 file changed, 168 insertions(+), 167 deletions(-) diff --git a/com32/mboot/mboot.c b/com32/mboot/mboot.c index 7103b3a..e7bb8db 100644 --- a/com32/mboot/mboot.c +++ b/com32/mboot/mboot.c @@ -39,191 +39,192 @@ struct syslinux_pm_regs regs; struct my_options opt; struct module_data { - void *data; - size_t len; - const char *cmdline; + void *data; + size_t len; + const char *cmdline; }; static int map_modules(struct module_data *modules, int nmodules) { - struct mod_list *mod_list; - addr_t map_list = 0; - size_t list_size = nmodules * sizeof *mod_list; - int i; - - mod_list = malloc(list_size); - if (!mod_list) { - printf("Failed to allocate module list\n"); - return -1; - } - - map_list = map_data(mod_list, list_size, 16, 0); - if (!map_list) { - printf("Cannot map module list\n"); - return -1; - } - - for (i = 0; i < nmodules; i++) { - addr_t mod_map = 0; - addr_t cmd_map = 0; - - dprintf("Module %d cmdline: \"%s\"\n", i, modules[i].cmdline); - - cmd_map = map_string(modules[i].cmdline); - - mod_map = map_data(modules[i].data, modules[i].len, 4096, MAP_HIGH); - if (!mod_map) { - printf("Failed to map module (memory fragmentation issue?)\n"); - return -1; + struct mod_list *mod_list; + addr_t map_list = 0; + size_t list_size = nmodules * sizeof *mod_list; + int i; + + mod_list = malloc(list_size); + if (!mod_list) { + printf("Failed to allocate module list\n"); + return -1; } - mod_list[i].mod_start = mod_map; - mod_list[i].mod_end = mod_map + modules[i].len; - mod_list[i].cmdline = cmd_map; - mod_list[i].pad = 0; - } - - mbinfo.flags |= MB_INFO_MODS; - mbinfo.mods_count = nmodules; - mbinfo.mods_addr = map_list; - return 0; + + map_list = map_data(mod_list, list_size, 16, 0); + if (!map_list) { + printf("Cannot map module list\n"); + return -1; + } + + for (i = 0; i < nmodules; i++) { + addr_t mod_map = 0; + addr_t cmd_map = 0; + + dprintf("Module %d cmdline: \"%s\"\n", i, modules[i].cmdline); + + cmd_map = map_string(modules[i].cmdline); + + mod_map = map_data(modules[i].data, modules[i].len, 4096, MAP_HIGH); + if (!mod_map) { + printf("Failed to map module (memory fragmentation issue?)\n"); + return -1; + } + mod_list[i].mod_start = mod_map; + mod_list[i].mod_end = mod_map + modules[i].len; + mod_list[i].cmdline = cmd_map; + mod_list[i].pad = 0; + } + + mbinfo.flags |= MB_INFO_MODS; + mbinfo.mods_count = nmodules; + mbinfo.mods_addr = map_list; + return 0; } static int get_modules(char **argv, struct module_data **mdp) { - char **argp, **argx; - struct module_data *mp; - int rv; - int module_count = 1; - int arglen; - const char module_separator[] = "---"; - - for (argp = argv; *argp; argp++) { - if (!strcmp(*argp, module_separator)) - module_count++; - } - - *mdp = mp = malloc(module_count * sizeof(struct module_data)); - if (!mp) { - error("Out of memory!\n"); - return -1; - } - - argp = argv; - while (*argp) { - /* Note: it seems Grub transparently decompresses all compressed files, - not just the primary kernel. */ - printf("Loading %s... ", *argp); - rv = zloadfile(*argp, &mp->data, &mp->len); - - if (rv) { - printf("failed!\n"); - return -1; + char **argp, **argx; + struct module_data *mp; + int rv; + int module_count = 1; + int arglen; + const char module_separator[] = "---"; + + for (argp = argv; *argp; argp++) { + if (!strcmp(*argp, module_separator)) + module_count++; } - printf("ok\n"); - /* - * Note: Grub includes the kernel filename in the command line, so we - * want to match that behavior. - */ - arglen = 0; - for (argx = argp; *argx && strcmp(*argx, module_separator); argx++) - arglen += strlen(*argx)+1; - - if (arglen == 0) { - mp->cmdline = strdup(""); - } else { - char *p; - mp->cmdline = p = malloc(arglen); - for ( ; *argp && strcmp(*argp, module_separator); argp++) { - p = strpcpy(p, *argp); - *p++ = ' '; - } - *--p = '\0'; + *mdp = mp = malloc(module_count * sizeof(struct module_data)); + if (!mp) { + error("Out of memory!\n"); + return -1; + } + + argp = argv; + while (*argp) { + /* Note: it seems Grub transparently decompresses all compressed files, + not just the primary kernel. */ + printf("Loading %s... ", *argp); + rv = zloadfile(*argp, &mp->data, &mp->len); + + if (rv) { + printf("failed!\n"); + return -1; + } + printf("ok\n"); + + /* + * Note: Grub includes the kernel filename in the command line, so we + * want to match that behavior. + */ + arglen = 0; + for (argx = argp; *argx && strcmp(*argx, module_separator); argx++) + arglen += strlen(*argx) + 1; + + if (arglen == 0) { + mp->cmdline = strdup(""); + } else { + char *p; + mp->cmdline = p = malloc(arglen); + for (; *argp && strcmp(*argp, module_separator); argp++) { + p = strpcpy(p, *argp); + *p++ = ' '; + } + *--p = '\0'; + } + mp++; + if (*argp) + argp++; /* Advance past module_separator */ } - mp++; - if (*argp) - argp++; /* Advance past module_separator */ - } - return module_count; + return module_count; } int main(int argc, char *argv[]) { - int nmodules; - struct module_data *modules; - bool keeppxe = false; - - openconsole(&dev_null_r, &dev_stdcon_w); - - (void)argc; /* Unused */ - argv++; - - while (*argv) { - if (!strcmp(*argv, "-solaris")) - opt.solaris = true; - else if (!strcmp(*argv, "-aout")) - opt.aout = true; - else - break; + int nmodules; + struct module_data *modules; + bool keeppxe = false; + + openconsole(&dev_null_r, &dev_stdcon_w); + + (void)argc; /* Unused */ argv++; - } - - if (!*argv) { - error("Usage: mboot.c32 [opts] mboot_file args... [--- module args...]...\n" - "Options:\n" - " -solaris Enable Solaris DHCP information passing\n" - " -aout Use the \"a.out kludge\" if enabled, even for ELF\n" - " This matches the Multiboot spec, but differs from Grub\n"); - return 1; - } - - /* Load the files */ - nmodules = get_modules(argv, &modules); - if (nmodules < 1) { - error("No files found!\n"); - return 1; /* Failure */ - } - - if (init_map()) - return 1; /* Failed to allocate intitial map */ - - /* - * Map the primary image. This should be done before mapping anything - * else, since it will have fixed address requirements. - */ - if (map_image(modules[0].data, modules[0].len)) - return 1; - /* Map the mbinfo structure */ - regs.ebx = map_data(&mbinfo, sizeof mbinfo, 4, 0); - if (!regs.ebx) { - error("Failed to map Multiboot info structure!\n"); + while (*argv) { + if (!strcmp(*argv, "-solaris")) + opt.solaris = true; + else if (!strcmp(*argv, "-aout")) + opt.aout = true; + else + break; + argv++; + } + + if (!*argv) { + error + ("Usage: mboot.c32 [opts] mboot_file args... [--- module args...]...\n" + "Options:\n" + " -solaris Enable Solaris DHCP information passing\n" + " -aout Use the \"a.out kludge\" if enabled, even for ELF\n" + " This matches the Multiboot spec, but differs from Grub\n"); + return 1; + } + + /* Load the files */ + nmodules = get_modules(argv, &modules); + if (nmodules < 1) { + error("No files found!\n"); + return 1; /* Failure */ + } + + if (init_map()) + return 1; /* Failed to allocate intitial map */ + + /* + * Map the primary image. This should be done before mapping anything + * else, since it will have fixed address requirements. + */ + if (map_image(modules[0].data, modules[0].len)) + return 1; + + /* Map the mbinfo structure */ + regs.ebx = map_data(&mbinfo, sizeof mbinfo, 4, 0); + if (!regs.ebx) { + error("Failed to map Multiboot info structure!\n"); + return 1; + } + + /* Map the primary command line */ + if (modules[0].cmdline) { + mbinfo.cmdline = map_string(modules[0].cmdline); + dprintf("Main cmdline: \"%s\"\n", modules[0].cmdline); + if (mbinfo.cmdline) + mbinfo.flags |= MB_INFO_CMDLINE; + } + + /* Map auxilliary images */ + if (nmodules > 1) { + if (map_modules(modules + 1, nmodules - 1)) + return 1; + } + + /* Add auxilliary information */ + mboot_make_memmap(); + mboot_apm(); + if (opt.solaris) + mboot_solaris_dhcp_hack(); + + /* Run it */ + mboot_run(keeppxe ? 3 : 0); + error("mboot.c32: boot failed\n"); return 1; - } - - /* Map the primary command line */ - if (modules[0].cmdline) { - mbinfo.cmdline = map_string(modules[0].cmdline); - dprintf("Main cmdline: \"%s\"\n", modules[0].cmdline); - if (mbinfo.cmdline) - mbinfo.flags |= MB_INFO_CMDLINE; - } - - /* Map auxilliary images */ - if (nmodules > 1) { - if (map_modules(modules+1, nmodules-1)) - return 1; - } - - /* Add auxilliary information */ - mboot_make_memmap(); - mboot_apm(); - if (opt.solaris) - mboot_solaris_dhcp_hack(); - - /* Run it */ - mboot_run(keeppxe ? 3 : 0); - error("mboot.c32: boot failed\n"); - return 1; } -- 2.7.4