search for: find_label

The following changes since commit 8c576f1fe03e34879921311f46613a35c6530000: Merge remote-tracking branch 'mfleming/for-hpa/elflink/fix-compiler-warnings' into elflink (2011-03-16 12:53:58 -0700) are available in the git repository at: git://git.zytor.com/users/mfleming/syslinux.git for-hpa/elflink/ldlinux Matt Fleming (1): ldlinux: Perform auto-boot if NOESCAPE set in config

...} +void print_labels(const char *prefix, size_t len) +{ + struct menu_entry *me; + + printf("\n"); + for (me = all_entries; me; me = me->next ) { + if (!strncmp(prefix, me->label, len)) + printf(" %s\n", me->label); + } +} + static struct menu_entry *find_label(const char *str) { const char *p; @@ -606,6 +618,78 @@ static char *is_message_name(char *cmdstr, enum message_number *msgnr) return NULL; } +static int cat_file(const char *filename) +{ + FILE *f; + char line[2048]; + + f = fopen(filename, "r"); + if (!f) + return -1; + +...

...xtern short nohalt; //idle.inc extern const char *default_cmd; //"default" command line extern const char *onerror; //"onerror" command line +extern const char *ontimeout; //"ontimeout" command line extern void cat_help_file(int key); extern struct menu_entry *find_label(const char *str); diff --git a/com32/elflink/ldlinux/ldlinux.c b/com32/elflink/ldlinux/ldlinux.c index da93c54..f11a65c 100644 --- a/com32/elflink/ldlinux/ldlinux.c +++ b/com32/elflink/ldlinux/ldlinux.c @@ -124,7 +124,7 @@ static const char *apply_extension(const char *kernel, const char *ext) /*...

...70 100644 --- a/com32/elflink/ldlinux/config.h +++ b/com32/elflink/ldlinux/config.h @@ -37,7 +37,11 @@ extern const char *default_cmd; //"default" command line extern const char *onerror; //"onerror" command line extern void cat_help_file(int key); +extern struct menu_entry *find_label(const char *str); +extern void print_labels(const char *prefix, size_t len); extern void eprintf(const char *filename, ...); +extern int new_linux_kernel(char *okernel, char *ocmdline); + #endif /* __CONFIG_H__ */ diff --git a/com32/elflink/ldlinux/eprintf.c b/com32/elflink/ldlinux/eprintf.c...

From: Matt Fleming <matt.fleming at intel.com> The following patch series is available at, git://git.zytor.com/users/mfleming/syslinux.git elflink All patches are against the 'elflink' branch. This series fixes a few serious bugs and some behavioural incompatibilities with the 4.x series. Matt Fleming (19): ldlinux: Initialise 'p' before using it. ldlinux: Parse

...2/elflink/ldlinux/ldlinux.c @@ -7,6 +7,7 @@ #include "com32.h" #include "menu.h" #include "config.h" +#include "syslinux/adv.h" #include <sys/module.h> @@ -27,8 +28,13 @@ static void load_kernel(const char *kernel) /* Virtual kernel? */ me = find_label(kernel); if (me) { - /* XXX we don't handle LOCALBOOT yet */ - execute(me->cmdline, KT_KERNEL); + enum kernel_type type = KT_KERNEL; + + /* cmdline contains type specifier */ + if (me->cmdline[0] == '.') + type = KT_NONE; + + execute(me->cmdline, type); /* We shoul...

From: Matt Fleming <matt.fleming at intel.com> Since we can't use __intcall() for EFI, and since we can now have the ELF module code resolve all our symbols at runtime, we should delete as many references to __intcall() as possible and just access the symbols directly. The most interesting patch is the support for weak symbols. We need to be able to reference derivative-specific

...kernel(const char *command_line) { struct menu_entry *me; - enum kernel_type type; const char *cmdline; const char *kernel; + uint32_t type; kernel = strdup(command_line); if (!kernel) @@ -150,11 +152,7 @@ static void load_kernel(const char *command_line) /* Virtual kernel? */ me = find_label(kernel); if (me) { - type = parse_kernel_type(me->cmdline); - - /* cmdline contains type specifier */ - if (me->cmdline[0] == '.') - type = KT_NONE; + type = parse_image_type(me->cmdline); execute(me->cmdline, type); /* We shouldn't return */ @@ -170,8 +168,8...

From: Matt Fleming <matt.fleming at linux.intel.com> This is a series of patches that, * shrink the core by moving things into an ldlinux ELF module * begin wiring up some of the C versions of various functions The core now only contains essential code and loads the ldlinux module to do everything else, like providing a command line interface and loading kernels. The config file parsing

From: Matt Fleming <matt.fleming at linux.intel.com> This series fixes some bugs and switches the elflink branch to be entirely ELF modules. It applies on top of, http://syslinux.zytor.com/archives/2011-April/016369.html The deletions in the diff stat below are mainly from deleting com32/elflink/modules (finally!). Now there should be no duplicate code because we don't need COM32 and