search for: enter_cmdline

This is a small set of patches for elflink branch based on feng's elflink branch. hpa, It seems that I can't log on terminus by ssh at home. So I can't push these patches on my git tree. Liu Aleaxander (4): elflink: Cleanup some warnings elflink: Fix the wrong malloc size in enter_cmdline elflink: Do clear screen even if we have no pDraw_Menu method elflink: Add Ctrl-p + Ctrl-n key binds core/elflink/cli.c | 10 +++++----- core/elflink/execute.c | 3 +++ core/elflink/get_key.c | 2 ++ core/elflink/getadv.c | 2 +- core/elflink/load_env32.c | 11 ++...

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

...b40af963feb773ddca2589d74: ldlinux: Parse and store the "onerror" command line (2011-03-09 14:32:36 +0000) are available in the git repository at: git://git.zytor.com/users/mfleming/syslinux.git for-hpa/elflink/cmdline Liu Aleaxander (6): elflink: Fix the wrong malloc size in enter_cmdline elflink: Do clear screen even if we have no pDraw_Menu method elflink: Add Ctrl-p + Ctrl-n key binds elflink: use 'input' as the prompt of the CLI elflink: Add ctrl-R key bind support elflink: handle the NULL return of edit_cmdline com32/elflink/ldlinux/cli.c...

...oto bad_implicit; + /* Insert a null character to ignore any user-specified options */ + if (!allowoptions) { + char *p = (char *)find_command(kernel); + *p = '\0'; + } + type = parse_kernel_type(kernel); if (type == KT_KERNEL) { const char *ext; @@ -209,16 +215,12 @@ static void enter_cmdline(void) /* Enter endless command line prompt, should support "exit" */ while (1) { cmdline = edit_cmdline("syslinux$", 1, NULL, cat_help_file); - if (!cmdline) - continue; - - /* return if user only press enter */ - if (cmdline[0] == '\0') { - printf("\n...

Hi, This is a another small set of fixes about CLI on elflink branch. Liu Aleaxander (3): elflink: use 'input' as the prompt of the CLI elflink: Add ctrl-R key bind support elflink: handle the NULL return of edit_cmdline core/elflink/cli.c | 88 +++++++++++++++++++++++++++++++++++++++++--- core/elflink/load_env32.c | 4 ++- 2 files changed, 85 insertions(+), 7

From: Matt Fleming <matt.fleming at linux.intel.com> These patches are based on the elflink branch. This set of patches is my attempt at moving the command-line interface functionality out of the core and into an ELF module to reduce the size of the core. The most interesting patch is [PATCH 4/4] which moves the cli code out of core/elflink and into com32/elflink/modules. [PATCH 4/4] is

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

...inux/com32/elflink/ldlinux/execute.c:50 #1 0x07fafe38 in load_kernel (command_line=<optimized out>) at /home/celelibi/code/syslinux/com32/elflink/ldlinux/ldlinux.c:179 #2 0x07fb0002 in ldlinux_auto_boot () at /home/celelibi/code/syslinux/com32/elflink/ldlinux/ldlinux.c:249 #3 0x07fb0080 in enter_cmdline () at /home/celelibi/code/syslinux/com32/elflink/ldlinux/ldlinux.c:273 #4 0x07fb016c in ldlinux_enter_command () at /home/celelibi/code/syslinux/com32/elflink/ldlinux/ldlinux.c:281 The execute() function gets ultimately called from ldlinux_enter_command(). And execute(), when it runs a COM32 modu...

...ot; command line +extern void cat_help_file(int key); + #endif /* __CONFIG_H__ */ diff --git a/com32/elflink/ldlinux/ldlinux.c b/com32/elflink/ldlinux/ldlinux.c index 85066b1..1177ef5 100644 --- a/com32/elflink/ldlinux/ldlinux.c +++ b/com32/elflink/ldlinux/ldlinux.c @@ -17,7 +17,7 @@ static void enter_cmdline(void) /* Enter endless command line prompt, should support "exit" */ while (1) { - cmdline = edit_cmdline("syslinux$", 1, NULL, NULL); + cmdline = edit_cmdline("syslinux$", 1, NULL, cat_help_file); if (!cmdline) continue; /* feng: give up the aux chec...

From: Matt Fleming <matt.fleming at intel.com> Here are the patches that I've got queued up based on the very helpful feedback I received from people testing Syslinux 5.00-pre9. Unless anyone has any concerns these will make it into Syslinux 5.00-pre10. Matt Fleming (9): pxe: Don't call open_config() from the pxe core ldlinux: Print a warning if no config file is found

...ldlinux.c +++ b/com32/elflink/ldlinux/ldlinux.c @@ -1,6 +1,7 @@ #include <linux/list.h> #include <sys/times.h> #include <stdbool.h> +#include <core.h> #include <core-elf.h> #include "cli.h" #include "console.h" @@ -12,8 +13,7 @@ static void enter_cmdline(void) { - struct cli_command *aux; - char *cmdline; + const char *cmdline; /* Enter endless command line prompt, should support "exit" */ while (1) { diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c index 898ee19..e13d6d4 100644 --- a/com32/elfl...

...earchdir(str); + f = findpath(str); free(str); - if (fd >= 0) + if (f) { + fclose(f); return ext->name; + } } return NULL; @@ -136,12 +138,12 @@ static const char *apply_extension(const char *kernel, const char *ext) * the the kernel. If we return the caller should call enter_cmdline() * so that the user can help us out. */ -static void load_kernel(const char *command_line) +void load_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 (!ke...

...ion */ + memcpy(k + len, ext, elen); + + /* Copy the rest of the command line */ + strcpy(k + len + elen, p); + + k[len + elen] = '\0'; + + return k; } /* @@ -54,11 +136,16 @@ static enum kernel_type parse_kernel_type(char *kernel) * the the kernel. If we return the caller should call enter_cmdline() * so that the user can help us out. */ -static void load_kernel(const char *kernel) +static void load_kernel(const char *command_line) { struct menu_entry *me; enum kernel_type type; const char *cmdline; + const char *kernel; + + kernel = strdup(command_line); + if (!kernel) + goto ba...

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

...ute(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 shouldn't return */ goto bad_kernel; } @@ -98,11 +104,43 @@ static void enter_cmdline(void) int main(int argc, char **argv) { + com32sys_t ireg, oreg; + uint8_t *adv; + int count = 0; + openconsole(&dev_rawcon_r, &dev_ansiserial_w); parse_configs(NULL); - /* TODO: ADV */ + __syslinux_init(); + adv = syslinux_getadv(ADV_BOOTONCE, &count); + if (adv &&...

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

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